bugs

modules/pm/models/project_model.js

@@ -172,8 +172,8 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
 
                     //呈现选项
                     data.updateData.property.displaySetting = displaySetting;
-
-                    data.updateData.property.billsCalcMode = 0;
+                    let defaultCalcMode = (data.updateData.property.valuationType == 'bill') ? 1 : 2;
+                    data.updateData.property.billsCalcMode = defaultCalcMode;
                     data.updateData.property.zanguCalcMode = 0;
                     //计算选项
                     data.updateData.property.calcOptions = calcOptions;
@@ -796,7 +796,8 @@ ProjectsDAO.prototype.defaultSettings = async function (userID, compilationId, p
     }
     let cloneProperty = _.cloneDeep(project.property);
     //关于计算
-    cloneProperty.billsCalcMode = 0;
+    let defaultCalcMode = (project.property.valuationType == 'bill') ? 2 : 1;
+    cloneProperty.billsCalcMode = defaultCalcMode;
     cloneProperty.zanguCalcMode = 0;
     cloneProperty.calcOptions = calcOptions;
     //清单工程量精度

web/building_saas/main/html/main.html

@@ -794,7 +794,7 @@
                                     <div class="modal-auto-height">
                                         <fieldset class="form-group">
                                             <h5>取费方式</h5>
-                                            <div class="form-check">
+                                            <div class="form-check" style="display:none">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="rationContent" value="0" type="radio">
                                                     子目含量取费
@@ -812,14 +812,14 @@
                                                     子目单价取费（正算）：清单综合合价=∑子目综合合价
                                                 </label>
                                             </div>
-                                            <div class="form-check">
+                                            <div class="form-check" style="display:none">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="billsPrice" value="3" type="radio">
                                                     清单单价取费
                                                 </label>
                                             </div>
                                         </fieldset>
-                                        <fieldset class="form-group">
+                                        <fieldset class="form-group" style="display:none">
                                             <h5>暂估合价计算方式</h5>
                                             <div class="form-check">
                                                 <label class="form-check-label">
@@ -834,7 +834,7 @@
                                                 </label>
                                             </div>
                                         </fieldset>
-                                        <fieldset class="form-group">
+                                        <fieldset class="form-group"  style="display:none">
                                             <h5>计算选项</h5>
                                             <div class="form-check">
                                                 <label class="form-check-label">

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

@@ -2342,8 +2342,10 @@ $('#poj-set').on('show.bs.modal', function () {
     }
     if (projectObj.project) {
         //江西重定义了leafBillGetFeeType的内容
-        let ft = projectObj.project.property.billsCalcMode !== undefined &&
-                 projectObj.project.property.billsCalcMode !== null ? projectObj.project.property.billsCalcMode : leafBillGetFeeType.rationContent;
+        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 &&
                  projectObj.project.property.zanguCalcMode !== null ? projectObj.project.property.zanguCalcMode : zanguCalcType.common;
         setCalcFlag($('#rationContent'), leafBillGetFeeType.rationContent, ft);