bugs

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>人材机库编辑-纵横公路养护云版</title>
+    <title>工料机库编辑-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" type="text/css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css" type="text/css">

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -133,7 +133,7 @@
                                 <!-- 标签 -->
                                 <ul class="nav nav-tabs" role="tablist">
                                     <li class="nav-item">
-                                        <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">人材机</a>
+                                        <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">工料机</a>
                                     </li>
                                     <li class="nav-item">
                                         <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
@@ -511,7 +511,7 @@
     <div class="modal-dialog modal-lg" role="document" id="modalCon">
         <div class="modal-content" >
             <div class="modal-header">
-                <h5 class="modal-title">选择人材机</h5>
+                <h5 class="modal-title">选择工料机</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>

web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -74,7 +74,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">添加人材机</h5>
+                  <h5 class="modal-title">添加工料机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -120,7 +120,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">编辑人材机</h5>
+                  <h5 class="modal-title">编辑工料机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>

web/building_saas/complementary_ration_lib/js/ration_glj.js

@@ -132,7 +132,7 @@ var rationGLJOprObj = {
                     return {
                         callback: function(){},
                         items: {
-                            "add": {name: "添加人材机", disabled: addDis, icon: "fa-plus", callback: function (key, opt) {
+                            "add": {name: "添加工料机", disabled: addDis, icon: "fa-plus", callback: function (key, opt) {
                                 //默认radio所有工料机
                                 gljSelOprObj.initRadio();
                                 gljSelOprObj.gljCurTypeId = null;
@@ -140,7 +140,7 @@ var rationGLJOprObj = {
                                 //弹出窗口
                                 $('#selGlj').modal('show');
                             }},
-                            "delete": {name: "删除人材机", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
+                            "delete": {name: "删除工料机", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
                                 rationGlj.splice(target.row, 1);
                                 me.updateRationItem(function(){
                                     me.sheet.getParent().focus();

web/building_saas/glj/js/project_glj_spread.js

@@ -154,7 +154,7 @@ ProjectGLJSpread.prototype.init = function () {
         // 如果类型为混凝土、砂浆、配合比、机械，则提示
         if (field === 'unit_price.market_price' && canNotChangeTypeId.indexOf(type) >= 0) {
             if(ratioData&&ratioData.length>0){
-                alert('当前人材机的市场单价由组成物计算得出，不可直接修改');
+                alert('当前工料机的市场单价由组成物计算得出，不可直接修改');
             }
         }
     });

web/building_saas/main/html/main.html

@@ -993,7 +993,7 @@
         <div class="modal-dialog modal-lg" role="document" id="modalCon">
             <div class="modal-content" style="width: 1020px; left:50%; transform: translate(-50%,0%);">
                 <div class="modal-header">
-                    <h5 class="modal-title">请选择人材机</h5>
+                    <h5 class="modal-title">请选择工料机</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>

web/building_saas/main/html/tender_price.html

@@ -9,12 +9,12 @@
         </div>
         <div class="input-group input-group-sm mr-2" style="width:240px">
             <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 = "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>

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

@@ -554,7 +554,7 @@ var feeRateObject={
             subRateObject.initSubRateSpread(me.mainFeeRateData[row]);
         }
     },
-    setRateFromSub:function (subRate,value,subList) {
+    setRateFromSub:function (subRate,value,subList,editText) {//editText  下拉框选择的值，对于如“19.00”这样下拉选择项，value会变成19，所以在valueMap里找的时候要用editText去查找
          let me = feeRateObject,feeRate =  projectObj.project.FeeRate;
          let rates = feeRate.getActivateFeeRate().rates;
          let updateDatas = [];
@@ -575,7 +575,7 @@ var feeRateObject={
                          if(match == true) {//匹配上了，改对应的selected 为 true
                              if(o.name == value){
                                  o.selected = true;
-                                 valueArray.push(value);
+                                 valueArray.push(editText);//这里要用字符串去匹配而不是转换成数值的value
                                  setValue = true;
                              }else {
                                  o.selected = false;

web/building_saas/main/js/views/main_tree_col.js

@@ -222,7 +222,7 @@ let MainTreeCol = {
             if(node.sourceType === projectObj.project.Bills.getSourceType()){
                 //如果是预算项目的，所有清单的数量1、数量2不做输入限制。
                 if(projectInfoObj.projectInfo.property && projectInfoObj.projectInfo.property.valuationType == "bill")  return false;
-                if(node.data.type==billType.FB||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行，工程量只读。
+                if(node.data.type==billType.DXFY||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、清单父项行，工程量只读。
                     return true;
                 }
             }else if(MainTreeCol.readOnly.glj(node)){

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

@@ -1356,7 +1356,7 @@ var projectObj = {
                     callback: function (key, opt) {
                         let selected = project.mainTree.selected;
                         if(selected.data.calcBase&&selected.data.calcBase!=""){
-                            alert("当前有基数计算，不能插入定额/量价/人材机。");
+                            alert("当前有基数计算，不能插入定额/量价/工料机。");
                             return;
                         }
                         getGLJData('insertEquipment');// ProjectController.addRation(project, controller, rationType.volumePrice);

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -152,7 +152,7 @@ var subRateObject={
                 t.value = value
             }
         }
-        feeRateObject.setRateFromSub(subRate,value,subList);
+        feeRateObject.setRateFromSub(subRate,value,subList,info.newValue);
     },
 
     destorySpreadView:function () {