Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

modules/all_models/evaluate_list.js

@@ -0,0 +1,25 @@
+/**
+ * Created by zhang on 2019/9/6.
+ */
+/**
+ * Created by zhang on 2019/3/18.
+ */
+import mongoose from "mongoose";
+
+let Schema = mongoose.Schema;
+let evaluateSchema = {
+    ID:String,
+    projectID: {type:Number,index: true},
+    projectGLJID:Number,//关联工料机ID
+    seq:String,//序号
+    code:String,
+    name:String,
+    specs:String,
+    unit:String,
+    market_price:String,
+    locked:{type: Number, default: 0},//锁定，1锁，0不锁
+    remark:String,
+    originPlace:String,//产地
+    vender:String //厂家
+};
+mongoose.model("evaluate_list", new Schema(evaluateSchema, {versionKey: false, collection: "evaluate_list"}));

modules/glj/models/glj_list_model.js

@@ -242,15 +242,27 @@ class GLJListModel extends BaseModel {
             if (Object.keys(data).length <= 0) {
                 throw '新增数据为空';
             }
+            //if(data.specs==undefined||data.specs==null||data.specs=="") data.specs = null;
             let condition={
                 code: data.code,
                 project_id: data.project_id,
                 name:data.name,
-                specs:data.specs,
                 type:data.type,
                 unit:data.unit
             };
-            let projectGljData = await this.findDataByCondition(condition);
+            let projectGljData = null;
+            let  projectGLJList = await this.findDataByCondition(condition,null,false);
+            if(projectGLJList.length > 0){//specs有可能为空或"",所以这里做这样处理
+                let p = data.specs;
+                if(p==undefined||p==null||p=="") p = null;
+                for(let g of projectGLJList){
+                    let t = g.specs;
+                    if(t==undefined||t==null||t=="") t = null;
+                    if(p == t) projectGljData = g;
+                }
+            }
+
+          //  let projectGljData = await this.findDataByCondition(condition);
             let isAddProjectGLJ = false;
 
             // 获取标段对应的单价文件id

modules/main/facade/project_facade.js

@@ -431,14 +431,16 @@ function getEngineerInfoData(engineerInfos) {
 
 function getEngineerFeaturesDatas(engineerFeatures) {
     let datas = [];
-    for(let f of engineerFeatures){
-        let tem = {
-            ID:f.ID,
-            name:f.name,
-            value:f.value,
-            ParentID:f.ParentID
+    if (engineerFeatures !== null && engineerFeatures !== undefined) {
+        for(let f of engineerFeatures){
+            let tem = {
+                ID:f.ID,
+                name:f.name,
+                value:f.value,
+                ParentID:f.ParentID
+            }
+            datas.push(tem);
         }
-        datas.push(tem);
     }
     return datas;
 }

test/unit/reports/test_tpl_project_fields.js

@@ -29,7 +29,7 @@ let pm_facade = require('../../../modules/pm/facade/pm_facade');
 
 let demoPrjId = - 1;
 // let demoRptId = 1006; //qa 重庆2018 A03
-let demoRptId = 1007; //qa 重庆2018 A01
+let demoRptId = 1005; //qa 重庆2018 A01
 let pagesize = "A4";
 
 
@@ -37,7 +37,7 @@ let pagesize = "A4";
 let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
 let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
-demoPrjId = 8522; //
+demoPrjId = 9279; //
 //*/
 let userId_Dft = userId_Leng;
 // let userId_Dft = "5a025c4c15074d134c2b9689";