Ver código fonte

调价方式选项顺序调整

chenshilong 5 anos atrás
pai
commit
6a12e4edc0

+ 1 - 1
modules/pm/models/project_property_template.js

@@ -22,7 +22,7 @@ const displaySetting = {
 
 const tenderSetting = {
     gljPriceTenderCoe:1, //工料机单价调整系数
-    calcPriceOption:'coeBase'//根据调整系数计算报价
+    calcPriceOption:'priceBase_RCJ'//根据调整系数计算报价
 };
 
 const calcOptions={

+ 1 - 1
web/building_saas/main/html/tender_price.html

@@ -3,8 +3,8 @@
     <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="priceBase_RCJ" >按目标价调整工料机消耗</option>
                 <option value="coeBase">按调价系数计算</option>
-                <option value="priceBase_RCJ" >按目标价调整人材机消耗</option>
                 <option value="priceBase_ZM" >按目标价调整子目工程量</option>
             </select>
         </div>

+ 1 - 1
web/building_saas/main/js/models/calc_program.js

@@ -1055,7 +1055,7 @@
 
    getTenderCalcType: function () {
      let tenderSetting = projectObj.project.property.tenderSetting;
-     let ct = tenderSetting && tenderSetting.calcPriceOption ? tenderSetting.calcPriceOption : "coeBase";
+     let ct = tenderSetting && tenderSetting.calcPriceOption ? tenderSetting.calcPriceOption : "priceBase_RCJ";
      if (ct == 'priceBase') ct = 'priceBase_RCJ'; // 兼容旧项目
      return ct;
    }