费率bugs

public/gljUtil.js

@@ -16,7 +16,8 @@ module.exports = {
     getMarketPrice:getMarketPrice,
     getBasePrice:getBasePrice,
     getAdjustPrice:getAdjustPrice,
-    getMainType:getMainType
+    getMainType:getMainType,
+    isConcreteType:isConcreteType
 };
 
 function calcProjectGLJQuantity(projectGLJDatas,rationGLJDatas,rationDatas,billsDatas,q_decimal) {
@@ -45,4 +46,8 @@ function calcPriceDiff(glj,calcOptions) {
 
 function getMainType() {
     return gljNodeUtil.getMainType();
+}
+
+function isConcreteType(type) {
+    return gljNodeUtil.isConcreteType(type);
 }

web/building_saas/main/html/main.html

@@ -193,7 +193,7 @@
                                       <a class="nav-link sub-item" id="linkQDJL" data-toggle="tab" href="#subSpread" role="tab">清单精灵</a>
                                   </li>
                                   <li class="nav-item" id="GLJ_div">
-                                      <a class="nav-link sub-item active" id="linkGLJ" data-toggle="tab" href="#subSpread" role="tab">人材机</a>
+                                      <a class="nav-link sub-item active" id="linkGLJ" data-toggle="tab" href="#subSpread" role="tab">工料机</a>
                                   </li>
                               <!--    <li class="nav-item">
                                       <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#subSpread" role="tab">附注条件</a>
@@ -481,7 +481,7 @@
                                               </div>
                                               <div class="form-check form-check-inline">
                                                   <input class="form-check-input" type="radio" name="content_type" id="raion_glj" value="ration_glj">
-                                                  <label class="form-check-label" for="raion_glj">人材机</label>
+                                                  <label class="form-check-label" for="raion_glj">工料机</label>
                                               </div>
                                               <!--<div class="form-check form-check-inline">
                                                   <input class="form-check-input" type="radio" name="inlineRadioOptions" id="bookmark" value="option4">
@@ -912,7 +912,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <h5 class="mt-3">人材机</h5>
+                                            <h5 class="mt-3">工料机</h5>
                                             <div class="row m-0">
                                                 <div class="col-sm-3">
                                                     <div class="input-group input-group-sm mb-2">
@@ -1265,7 +1265,7 @@
                                             <a id="cb_QTXM" href="javascript:void(0)">其他项目</a>
                                         </li>
                                         <li class="py-1">
-                                            <a id="cb_RCJ" href="javascript:void(0)">人材机</a>
+                                            <a id="cb_RCJ" href="javascript:void(0)">工料机</a>
                                         </li>
                                         <li class="py-1">
                                             <a id="cb_FBF" href="javascript:void(0)">分包费</a>

web/building_saas/main/js/models/fee_rate.js

@@ -217,10 +217,12 @@ var FeeRate = {
         FeeRate.prototype.onFeeRatesChange = function (infos) {//{rateID:'AAAA',value:23}
             let node = project.mainTree.selected;
             let me = this;
+            let rateMap = {};
             for(let i of infos){
-                this.refreshCalProgramByRateID(i.rateID,i.value);
+                rateMap[i.rateID] = i.value;
                 this.refreshBillsByRateID(i.rateID,i.value);
             }
+            this.refreshCalProgramByRateID(rateMap);
             if(node){
                 if (node.sourceType==='ration' && calcProgramObj.sheet) {
                     calcProgramObj.refreshCalcProgram(node, 3);
@@ -304,12 +306,12 @@ var FeeRate = {
             project.calcProgram.compileAllTemps();
             calcProgramManage.refreshDetailSheet();
         }
-        FeeRate.prototype.refreshCalProgramByRateID=function (rateID,value) {
+        FeeRate.prototype.refreshCalProgramByRateID=function (rateMap) {
             var templates = project.calcProgram.datas.templates;
             for(var i =0;i<templates.length;i++){
                 _.forEach(templates[i].calcItems,function (item) {
-                    if(item.feeRateID==rateID){
-                        item.feeRate = value;
+                    if(rateMap[item.feeRateID]){
+                        item.feeRate = rateMap[item.feeRateID];
                     }
                 })
             }

web/building_saas/main/js/views/fee_rate_view.js

@@ -591,9 +591,9 @@ var feeRateObject={
                          let lastRate = null;
                          temP.value = scMathUtil.roundForObj(value,getDecimal("feeRate")) ;
                          for(let v of valueMaps){
-                            if(parseFloat(v.value)<parseFloat(value)){
+                            if(parseFloat(v.ID)<parseFloat(value)){
                                 ltRate = v;
-                            }else if(parseFloat(v.value)>parseFloat(value)){
+                            }else if( gtRate==null && parseFloat(v.ID)>parseFloat(value)){
                                 gtRate = v;
                             }
                             lastRate = v;