调价三种计算方式结构调整

web/building_saas/main/html/tender_price.html

@@ -1,26 +1,48 @@
 
 <div class="toolsbar px-1">
     <div class="btn-toolbar py-1">
+        <!--<div class="input-group input-group-sm mr-2" style="margin-left:10px; margin-top:4px;">-->
         <div class="input-group input-group-sm mr-2">
             <select class="form-control form-control-sm" style="width: auto; font-size: .875rem" id="calcPriceOption">
                 <option value="coeBase">按调价系数计算</option>
-                <option value="priceBase" >按目标价计算</option>
+                <option value="priceBase_RCJ" >按目标价调整人材机消耗</option>
+                <option value="priceBase_ZM" >按目标价调整子目工程量</option>
             </select>
+<!--            <div class="form-check">
+                <label class="form-check-label">
+                    <input class="form-check-input" name="tenderCalcType" id="tenderCalcByXS" value="0" type="radio">
+                    按调价系数正算　
+                </label>
+            </div>
+            <div class="form-check">
+                <label class="form-check-label">
+                    <input class="form-check-input" name="tenderCalcType" id="tenderCalcByTargetRCJ" value="1" type="radio">
+                    按目标价反算人材机消耗　
+                </label>
+            </div>
+            <div class="form-check">
+                <label class="form-check-label">
+                    <input class="form-check-input" name="tenderCalcType" id="tenderCalcByTargetZM" value="2" type="radio">
+                    按目标价反算子目工程量　
+                </label>
+            </div>-->
         </div>
-        <div class="input-group input-group-sm mr-2" style="width:240px">
+        <div class="input-group input-group-sm mr-2" style="width:200px">
             <div class="input-group-prepend">
                 <span class="input-group-text" id="inputGroup-sizing-sm">人材机单价调整系数</span>
             </div>
             <input id = 'gljPriceTenderCoe' type="number" step="0.1" class="form-control" placeholder="请输入系数" value="1">
         </div>
-        <div class="btn-group mr-2">
-            <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderGLJQuantity">调整人材机消耗</button>
-            <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderRationQuantity">调整子目工程量</button>
-           <!-- <button type="button" class="btn btn-outline-primary btn-sm">反调单价</button>-->
-            <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderPrice">调价计算</button>
-        </div>
+        <!--<div class="btn-group mr-2">-->
+            <!--<button type="button" class="btn btn-outline-primary btn-sm" id = "tenderGLJQuantity">调整人材机消耗</button>-->
+            <!--<button type="button" class="btn btn-outline-primary btn-sm" id = "tenderRationQuantity">调整子目工程量</button>-->
+           <!--&lt;!&ndash; <button type="button" class="btn btn-outline-primary btn-sm">反调单价</button>&ndash;&gt;-->
+            <!--<button type="button" class="btn btn-outline-primary btn-sm" id = "tenderPrice">调价计算2</button>-->
+        <!--</div>-->
+        <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderPrice">调价计算</button>
+        <span>&nbsp</span>
         <button type="button" class="btn btn-outline-danger btn-sm" id = "cleanTender">清空调价</button>
-        <div class="form-check" style="margin-left:40px; margin-top:5px;">
+        <div class="form-check" style="margin-left:40px; margin-top:4px;">
             <label class="form-check-label">
                 <input class="form-check-input" name="cbShowTenderFields" id="cbShowTenderFields" value="true" type="checkbox">
                 <span data-toggle="tooltip" data-original-title="造价书界面定额人材机的调价、人材机汇总界面的调价">显示调价后数据</span>

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

@@ -3412,7 +3412,7 @@ function disableTools(){
     $('#gljPriceTenderCoe').prop('disabled', 'disabled');
     $('#tenderGLJQuantity').prop('disabled', 'disabled');
     $('#tenderRationQuantity').prop('disabled', 'disabled');
-    $('#tenderPrice').prop('disabled', 'disabled');
+    // $('#tenderPrice').prop('disabled', 'disabled');
     $('#cleanTender').prop('disabled', 'disabled');
 }
 //项目只读，表格只读

web/building_saas/main/js/views/tender_price_view.js

@@ -272,7 +272,7 @@ let tender_obj={
             let tem_updateData = {type:node.sourceType,data:{}};
             if(option == 'coeBase') {                           // 正向：当值为“根据调整系数计算报价”时，清空目标报价。
                 me.cleanTargetPrice(tem_updateData,node);
-            }else if(option == 'priceBase'){                    // 反向：当值为“根据报价计算调整系数”时，清空调整系数。
+            }else if(option == 'priceBase_RCJ' || option == 'priceBase_ZM'){                    // 反向：当值为“根据报价计算调整系数”时，清空调整系数。
                 me.cleanTenderCoe(tem_updateData,node);
             }
             if(!_.isEmpty(tem_updateData.data)){//如果需要更新
@@ -384,7 +384,7 @@ let tender_obj={
             }
         }
         if(dataCode.indexOf('Coe') != -1){//如果是调整系数列
-            if($('#calcPriceOption').val() =='priceBase'){//下拉按钮显示为“根据报价计算调整系数”时，只读。
+            if($('#calcPriceOption').val() =='priceBase_RCJ' || $('#calcPriceOption').val() =='priceBase_ZM'){//下拉按钮显示为“根据报价计算调整系数”时，只读。
                 return false;
             }else if(me.tenderTree.items[row].data.is_adjust_price === 1){//打勾了不调价，只读。
                 return false;
@@ -410,30 +410,9 @@ let tender_obj={
             $('#gljPriceTenderCoe').attr("disabled",true);
             $('#tenderGLJQuantity').removeAttr("disabled");
             $('#tenderRationQuantity').removeAttr("disabled");
-            $('#tenderPrice').attr("disabled",true);
+            // $('#tenderPrice').attr("disabled",true);
         };
         $('#cbShowTenderFields').prop("checked", showTenderFields);
-    },
-    doTenderCalc: function(tender){
-        let callback = function () {
-            // projectObj.project.saveProperty('hasTender', true);  // 一定调价，这个属性已失去意义
-            if (projectObj.project.property.needRestoreGgljPriceTenderCoe){         // 入库存储，清理标记，刷新UI显示
-                projectObj.project.saveProperty('tenderSetting.gljPriceTenderCoe', 1);
-                delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
-                $('#gljPriceTenderCoe').val(1);
-            }
-
-            tender_obj.showTenderData();
-            projectObj.project.projectGLJ.calcQuantity();
-        };
-
-        if (tender == tenderTypes.ttReverseGLJ || tender == tenderTypes.ttReverseRation){
-            projectObj.project.calcProgram.initReverseTenderDatas();
-            projectObj.project.calcProgram.prepareForDistribute(tender_obj.tenderTree.roots[0]);
-            projectObj.project.calcProgram.distributeTargetTotalFee(tender_obj.tenderTree.roots[0]);
-        };
-
-        projectObj.project.calcProgram.calcAllNodesAndSave(calcAllType.catAll, callback, tender);
     }
 };
 
@@ -498,17 +477,45 @@ $(function () {
     });
 
     $('#tenderPrice').on('click', function () {
-        tender_obj.doTenderCalc(tenderTypes.ttCalc);
-    });
 
-    $('#tenderGLJQuantity').on('click', function () {
-        tender_obj.doTenderCalc(tenderTypes.ttReverseGLJ);
-    });
+        // tender_obj.doTenderCalc(tenderTypes.ttCalc);
+        let callback = function () {
+            // projectObj.project.saveProperty('hasTender', true);  // 一定调价，这个属性已失去意义
+            if (projectObj.project.property.needRestoreGgljPriceTenderCoe){         // 入库存储，清理标记，刷新UI显示
+                projectObj.project.saveProperty('tenderSetting.gljPriceTenderCoe', 1);
+                delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
+                $('#gljPriceTenderCoe').val(1);
+            }
 
-    $('#tenderRationQuantity').on('click', function () {
-        tender_obj.doTenderCalc(tenderTypes.ttReverseRation);
+            tender_obj.showTenderData();
+            projectObj.project.projectGLJ.calcQuantity();
+        };
+
+        let tender;
+        if ($('#calcPriceOption').val() =='coeBase')
+            tender = tenderTypes.ttCalc
+        else if ($('#calcPriceOption').val() =='priceBase_RCJ')
+            tender = tenderTypes.ttReverseGLJ
+        else if ($('#calcPriceOption').val() =='priceBase_ZM')
+            tender = tenderTypes.ttReverseRation;
+
+        if (tender == tenderTypes.ttReverseGLJ || tender == tenderTypes.ttReverseRation){
+            projectObj.project.calcProgram.initReverseTenderDatas();
+            projectObj.project.calcProgram.prepareForDistribute(tender_obj.tenderTree.roots[0]);
+            projectObj.project.calcProgram.distributeTargetTotalFee(tender_obj.tenderTree.roots[0]);
+        };
+
+        projectObj.project.calcProgram.calcAllNodesAndSave(calcAllType.catAll, callback, tender);
     });
 
+    // $('#tenderGLJQuantity').on('click', function () {
+    //     tender_obj.doTenderCalc(tenderTypes.ttReverseGLJ);
+    // });
+    //
+    // $('#tenderRationQuantity').on('click', function () {
+    //     tender_obj.doTenderCalc(tenderTypes.ttReverseRation);
+    // });
+
     $('#cbShowTenderFields').on('click', function () {
         let showFields = $('#cbShowTenderFields').prop("checked");
         projectObj.project.saveProperty('tenderSetting.showTenderFields', showFields);