Browse Source

默认给出公式。

chenshilong 7 years ago
parent
commit
eb69dc6508

+ 2 - 2
modules/pm/models/templates/bills_template_model.js

@@ -25,7 +25,7 @@ class BillsTemplateModel extends BaseModel {
      */
      */
     async getTemplateData (valuationId, engineering) {
     async getTemplateData (valuationId, engineering) {
         // 筛选字段
         // 筛选字段
-        let field = {_id: 1, valuationId: 1, ID: 1, ParentID: 1, NextSiblingID: 1, code: 1, name: 1, unit: 1, flags: 1};
+        let field = {_id: 1, valuationId: 1, ID: 1, ParentID: 1, NextSiblingID: 1, code: 1, name: 1, unit: 1, flags: 1, calcBase: 1};
         let data = await this.findDataByCondition({valuationId: valuationId, engineering: engineering}, field, false);
         let data = await this.findDataByCondition({valuationId: valuationId, engineering: engineering}, field, false);
 
 
         return data === null ? [] : data;
         return data === null ? [] : data;
@@ -39,7 +39,7 @@ class BillsTemplateModel extends BaseModel {
      */
      */
     async getTemplateDataForNewProj (valuationId, engineering) {
     async getTemplateDataForNewProj (valuationId, engineering) {
         // 筛选字段
         // 筛选字段
-        let field = {_id: 0, ID: 1, ParentID: 1, NextSiblingID: 1, code: 1, name: 1, unit: 1, flags: 1,type:1};
+        let field = {_id: 0, ID: 1, ParentID: 1, NextSiblingID: 1, code: 1, name: 1, unit: 1, flags: 1,type:1, calcBase: 1};
         let data = await this.findDataByCondition({valuationId: valuationId, engineering: engineering}, field, false);
         let data = await this.findDataByCondition({valuationId: valuationId, engineering: engineering}, field, false);
 
 
         return data === null ? [] : data;
         return data === null ? [] : data;

+ 2 - 1
modules/pm/models/templates/schemas/bills_template.js

@@ -31,7 +31,8 @@ let BillsTemplateSchema = {
     valuationId: String,
     valuationId: String,
     // 工程专业
     // 工程专业
     engineering: Number,
     engineering: Number,
-    type:Number
+    type:Number,
+    calcBase: String
 };
 };
 
 
 let model = mongoose.model(collectionName, new Schema(BillsTemplateSchema, {versionKey: false, collection: collectionName}));
 let model = mongoose.model(collectionName, new Schema(BillsTemplateSchema, {versionKey: false, collection: collectionName}));