bugs.

web/building_saas/main/html/main.html

@@ -634,7 +634,7 @@
                                 <!--<li class="nav-item"><a class="nav-link active" data-toggle="pill" href="#poj-settings-basicInfo" role="tab" id="tab_poj-settings-basicInfo">建设项目基本信息</a></li>-->
                                 <li class="nav-item"><a class="nav-link active" data-toggle="pill" href="#poj-settings-projFeature" id="tab_poj-settings-projFeature" role="tab">工程特征</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-indicativeInfo" id="tab_poj-settings-indicativeInfo" role="tab">指标信息</a></li>
-                               <!-- <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" id="about-calc" role="tab">关于计算</a></li>-->
+                                <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" id="about-calc" role="tab">关于计算</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-billsQuanDecimal" id="tab_poj-settings-bqDecimal" role="tab">清单工程量精度</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-decimal" role="tab" id="tab_poj-settings-decimal">小数位数</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-6" role="tab" id="tab_poj-settings-6">人工单价调整</a></li>
@@ -662,9 +662,9 @@
                                 <!--关于计算-->
                                 <div class="tab-pane fade" id="poj-settings-4" role="tabpanel">
                                     <div class="modal-auto-height">
-                                        <fieldset class="form-group">
+                                        <fieldset class="form-group" style="display:none">
                                             <h5>取费方式</h5>
-                                            <div class="form-check" style="display:none">
+                                            <div class="form-check">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="rationContent" value="0" type="radio">
                                                     子目含量取费
@@ -677,12 +677,12 @@
                                                 </label>
                                             </div>
                                             <div class="form-check">
-                                                <label class="form-check-label">
+                                                <label class="form-check-label" >
                                                     <input class="form-check-input" name="calcFlag" id="rationPrice" value="2" type="radio">
                                                     子目单价取费（正算）：清单综合合价=∑子目综合合价
                                                 </label>
                                             </div>
-                                            <div class="form-check" style="display:none">
+                                            <div class="form-check">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="billsPrice" value="3" type="radio">
                                                     清单单价取费

web/building_saas/main/js/main.js

@@ -6,8 +6,12 @@ $(function () {
 
     $("#header-menu").removeAttr('style');
 
-    if (projectInfoObj.projectInfo.property.valuationType == 'bill')
+    if (projectInfoObj.projectInfo.property.valuationType == 'bill'){
         $("#tab_tender_price").css('display', 'none');
+    }
+    else{
+        $("#about-calc").css('display', 'none');
+    };
 
     $('#tab_baobiao').on('shown.bs.tab', function (e) {
         $(e.relatedTarget.hash).removeClass('active');

web/building_saas/main/js/models/calc_program.js

@@ -1733,6 +1733,7 @@ class CalcProgram {
             if (treeNode.data.feesIndex && treeNode.data.feesIndex.common){
                 let uf, tf;
                 let ftObj = {fieldName: 'common'};
+                if (!treeNode.modifyFlag) return;    // 没有改过单价、数量、金额，则不计算，保留上次的计算结果。
 
                 if (treeNode.modifyFlag == 2){    // 修改了清单单价：以单价为准，算金额
                     uf = parseFloatPlus(treeNode.data.feesIndex.common.unitFee);

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

@@ -486,7 +486,7 @@ var projectObj = {
                         return
                     };
 
-                    if (value) {
+                    // if (value) {
                         if(fieldName === 'feesIndex.common.unitFee') {
                             value = parseFloat(value).toDecimal(decimalObj.decimal("unitPrice", node));
 
@@ -502,7 +502,7 @@ var projectObj = {
                             value = scMathUtil.roundForObj(value, getDecimal("totalPrice", node));
                             node.modifyFlag = 3;
                         }
-                    }
+                    // }
                 }
                 else if (fieldName === 'calcBase') {
                     //zhong