Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/pm/models/project_property_template.js

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

web/building_saas/main/html/tender_price.html

@@ -3,15 +3,15 @@
     <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>
 
         <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>
@@ -22,7 +22,7 @@
         <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>
+                <span data-toggle="tooltip" data-original-title="造价书界面定额工料机的调价、工料机汇总界面的调价">显示调价后数据</span>
             </label>
         </div>
     </div>

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;
    }