bug

modules/pm/models/project_model.js

@@ -172,7 +172,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
 
                     //呈现选项
                     data.updateData.property.displaySetting = displaySetting;
-                    let defaultCalcMode = (data.updateData.property.valuationType == 'bill') ? 1 : 2;
+                    let defaultCalcMode = (data.updateData.property.valuationType == 'bill') ? 2 : 1;
                     data.updateData.property.billsCalcMode = defaultCalcMode;
                     data.updateData.property.zanguCalcMode = 0;
                     //计算选项

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

@@ -2342,11 +2342,13 @@ $('#poj-set').on('show.bs.modal', function () {
     }
     if (projectObj.project) {
         //江西重定义了leafBillGetFeeType的内容
+        // 预算：bill, 正算，rationPrice: 2,
+        // 清单：ration, 反算，rationPriceConverse: 1,
         let defaultCalcMode = (projectObj.project.property.valuationType == 'bill') ? leafBillGetFeeType.rationPrice : leafBillGetFeeType.rationPriceConverse;
         let ft = (projectObj.project.property.billsCalcMode !== undefined && projectObj.project.property.billsCalcMode !== null) ?
             projectObj.project.property.billsCalcMode : defaultCalcMode;
 
-        let zg = projectObj.project.property.zanguCalcMode !== undefined &&
+        let zg = projectObj.project.property.zanguCalcMode !== undefined &&``
                  projectObj.project.property.zanguCalcMode !== null ? projectObj.project.property.zanguCalcMode : zanguCalcType.common;
         setCalcFlag($('#rationContent'), leafBillGetFeeType.rationContent, ft);
         setCalcFlag($('#rationPriceConverse'), leafBillGetFeeType.rationPriceConverse, ft);