bug fixed

modules/all_models/user.js

@@ -55,6 +55,10 @@ let schema = {
         type: Number,
         default: -1
     },
-    create_time: Number
+    create_time: Number,
+    user_type:{
+        type:String,
+        default:'normal'//  normal : 普通用户，test:测试用户
+    }
 };
 mongoose.model(collectionName, new Schema(schema, {versionKey: false}));

web/building_saas/main/js/views/glj_col.js

@@ -39,7 +39,7 @@ let gljCol = {
             {headerName: "是否暂估", headerWidth: 60, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
             {headerName: "主要材料", headerWidth: 60, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
             {headerName: "供货方式", headerWidth: 80, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
-            {headerName: "甲供数量", headerWidth: 100, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "甲供数量", headerWidth: 100, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity'},
             {headerName: "三材类别", headerWidth: 80, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},
             {headerName: "三材系数", headerWidth: 100, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'material'
             {headerName: "交货方式", headerWidth: 90, dataCode: "delivery", hAlign: "left", dataType: "String"},

web/building_saas/main/js/views/project_glj_view.js

@@ -380,7 +380,7 @@ projectGljObject={
             if(recode[c.dataCode] == c.value){
                 continue;
             }
-            me.getUpdateData(recode.id,c.value,c.dataCode,c.quantity,updateMap);
+            me.getUpdateData(recode.id,c.value,c.dataCode,recode.quantity,updateMap);
         }
         if(_.isEmpty(updateMap)){
             callback?callback():'';