bugs.

modules/main/models/proj_setting_model.js

@@ -20,8 +20,8 @@ class projSettingModel extends baseModel {
 /*                if (!data.billsCalcMode) {
                     data.billsCalcMode = settingConst.billsCalcMode.rationContent;
                 }
-                if (!data.zanguCalcMode) {
-                    data.zanguCalcMode = settingConst.zanguCalcMode.common;
+                if (!data.zanguCalcType) {
+                    data.zanguCalcType = settingConst.zanguCalcType.common;
                 }
                 data.settingConst = settingConst;*/
                 callback(0, collectionName, data);

modules/main/models/schemas/proj_setting.js

@@ -9,7 +9,7 @@ let collectionName = 'proj_setting';
     billsCalcMode: {
         rationContent: 0, rationPriceConverse: 1, rationPrice: 2, billsPrice: 3
     },
-    zanguCalcMode: {
+    zanguCalcType: {
         common: 0, gatherMaterial: 1
     }
 }*/
@@ -27,9 +27,9 @@ let projSettingSchema = {
         type: Number,
         default: settingConst.billsCalcMode.rationContent
     },
-    zanguCalcMode: {
+    zanguCalcType: {
         type: Number,
-        default: settingConst.zanguCalcMode.common
+        default: settingConst.zanguCalcType.common
     }*/
 };
 let model = mongoose.model(collectionName, new Schema(projSettingSchema, {versionKey: false, collection: collectionName}));

web/building_saas/main/js/models/main_consts.js

@@ -121,7 +121,7 @@ const leafBillGetFeeType = {
     billsPrice: 3
 };
 
-const zanguCalcMode = {
+const zanguCalcType = {
     common: 0,
     gatherMaterial: 1
 };

web/building_saas/main/js/views/project_view.js

@@ -649,10 +649,10 @@ $('#poj-set').on('show.bs.modal', function () {
         setCalcFlag($('#rationPrice'), leafBillGetFeeType.rationPrice, mode);
         setCalcFlag($('#billsPrice'), leafBillGetFeeType.billsPrice, mode);
 
-        // mode = projectObj.project.projSetting.zanguCalcMode;
-        mode = projectObj.project.property.zanguCalcMode ? projectObj.project.property.zanguCalcMode : zanguCalcMode.common;
-        setCalcFlag($('#zangu_common'), zanguCalcMode.common, mode);
-        setCalcFlag($('#zangu_gatherMatherial'), zanguCalcMode.gatherMaterial, mode);
+        // mode = projectObj.project.projSetting.zanguCalcType;
+        mode = projectObj.project.property.zanguCalcMode ? projectObj.project.property.zanguCalcMode : zanguCalcType.common;
+        setCalcFlag($('#zangu_common'), zanguCalcType.common, mode);
+        setCalcFlag($('#zangu_gatherMaterial'), zanguCalcType.gatherMaterial, mode);
     }
 });
 $('#property_ok').click(function () {
@@ -680,10 +680,6 @@ $('#property_ok').click(function () {
     }
 
     if (reCalc) {
-/*        project.pushNow('', [project.projSetting.moduleName], [{
-            projectID: project.ID(),
-            billsCalcMode: project.property.billsCalcMode
-        }]);*/
         project.calcProgram.calcAllNodes(calcAllType.catBills);
     }
     //基本信息