TASK #3062 农村公路养护(2020)，预算项目中，计算方式应默认为反算

modules/pm/models/project_model.js

@@ -199,7 +199,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                     }
                     //呈现选项
                     data.updateData.property.displaySetting = displaySetting;
-                    let defaultCalcMode = (data.updateData.property.valuationType == 'bill') ? 2 : 1;
+                    let defaultCalcMode = overWrite && overWrite.defaultCalcMode || ((data.updateData.property.valuationType == 'bill') ? 2 : 1);
                     data.updateData.property.billsCalcMode = defaultCalcMode;
                     data.updateData.property.zanguCalcMode = 0;
                     //计算选项
@@ -826,18 +826,18 @@ ProjectsDAO.prototype.defaultSettings = async function (userID, compilation, pro
         return false;
     }
     let cloneProperty = _.cloneDeep(project.property);
+    let overWrite;
+    if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
+        overWrite = require("../../.."+compilation.overWriteUrl);
+    }
     //关于计算
-    let defaultCalcMode = (project.property.valuationType == 'bill') ? 2 : 1;
+    let defaultCalcMode = overWrite && overWrite.defaultCalcMode || ((project.property.valuationType == 'bill') ? 2 : 1);
     cloneProperty.billsCalcMode = defaultCalcMode;
     cloneProperty.zanguCalcMode = 0;
     cloneProperty.calcOptions = calcOptions;
     //清单工程量精度
     cloneProperty.billsQuantityDecimal = billsQuantityDecimal;
     //小数位数
-    let overWrite;
-    if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
-        overWrite = require("../../.."+compilation.overWriteUrl);
-    }
     cloneProperty.decimal = overWrite && overWrite.defaultDecimal || defaultDecimal;
     //呈现选项
     cloneProperty.displaySetting = displaySetting;

web/over_write/js/nongcun_2020.js

@@ -129,9 +129,13 @@ if (typeof module !== 'undefined') {
         process: 6
     };
 
+    // 农村公路养护(2020)，预算项目中，计算方式应默认为反算。（其他省份保持不变）
+    const defaultCalcMode = 1;
+
     module.exports = {
         progression: [],
         deficiency: {},
-        defaultDecimal
+        defaultDecimal,
+        defaultCalcMode
     };
 }