bug

web/building_saas/main/html/tender_price.html

@@ -3,23 +3,28 @@
     <div class="btn-toolbar py-1">
         <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="coeBase">按调价系数计算</option>
+                <option value="priceBase_RCJ" >按目标价调整人材机消耗</option>
+                <option value="priceBase_ZM" >按目标价调整子目工程量</option>
             </select>
         </div>
-        <div class="input-group input-group-sm mr-2" style="width:240px">
+
+        <div class="input-group input-group-sm mr-2" style="width:230px">
             <div class="input-group-prepend">
-                <span class="input-group-text" id="inputGroup-sizing-sm">工料机单价调整系数</span>
+                <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>
+
+        <button type="button" class="btn btn-outline-primary btn-sm" id = "calcTender">调价计算</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: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>
+            </label>
+        </div>
     </div>
 </div>
 <div class="container-fluid">

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

@@ -1983,13 +1983,15 @@ class CalcProgram {
                 if (calcItem.feeRate != undefined)
                     feeRate = parseFloat(calcItem.feeRate).toDecimal(decimalObj.feeRate);
 
-                let tf = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.process);
+                let expr = calcItem.compiledExpr;
+                let tf = (eval(expr) * feeRate * 0.01).toDecimal(decimalObj.process);
                 calcItem.totalFee = tf.toDecimal(decimalObj.decimal('totalPrice', treeNode));
                 calcItem.unitFee = (tf / nQ).toDecimal(decimalObj.decimal('unitPrice', treeNode));
 
                 let tExpr = analyzer.getCompiledTenderExpr(calcItem.compiledExpr);
-                calcItem.tenderUnitFee = (eval(tExpr) * feeRate * 0.01).toDecimal(decimalObj.decimal('unitPrice', treeNode));
-                calcItem.tenderTotalFee = (calcItem.tenderUnitFee * nTQ).toDecimal(decimalObj.decimal('totalPrice', treeNode));
+                let ttf = (eval(tExpr) * feeRate * 0.01).toDecimal(decimalObj.process);
+                calcItem.tenderTotalFee = ttf.toDecimal(decimalObj.decimal('totalPrice', treeNode));
+                calcItem.tenderUnitFee = (ttf / nTQ).toDecimal(decimalObj.decimal('unitPrice', treeNode));
 
                 if (calcItem.fieldName) {
                     fnArr.push(calcItem.fieldName);