update

modules/ration_glj/facade/glj_calculate_facade.js

@@ -145,13 +145,13 @@ function generateRationName(ration,gljList) {
             adjustMatch!=""?replaceList.push(adjustMatch):replaceList.push(notAdjust);
         }
         for(let r of replaceList){
-            caption =  caption.replace('%s',r);
+            caption =  caption.replace(/%s/i,r);
         }
     }
     // 更新定额名称中显示的稳定土配合比
     const proportionStr = gljList.filter(glj => glj.rationProportion).map(glj => glj.adjustProportion || 0).join(':');
     if (proportionStr) {
-        caption = caption.replace('%p', proportionStr);
+        caption = caption.replace(/%p/i, proportionStr);
     }
     let reNameList = [];
     for(let g of gljList){
@@ -401,23 +401,23 @@ function getContent(coes) {
 }
 
 function prepareAss(assList) {//处理辅助定额，支持多个辅助定额的情况
-    for(let a of assList){
-        if(a.groupList && a.groupList.length > 1){//组里有多个定额的情况
-            let newList = _.sortByAll(a.groupList,[function(item){
-               return parseFloat(item.param)
-            }]);//先按参数排序
-            let pre = 0;
-            for(let n of newList){
-                if(a.actualValue > pre && a.actualValue <= parseFloat(n.param)){//落在中间，则用组里的这条定额
-                    a._doc.param = n.param;
-                    a._doc.paramName = n.paramName;
-                    a._doc.assistCode = n.assistCode;
-                    break;
-                }
-                pre = parseFloat(n.param);
-            }
-        }
-    }
+  for(let a of assList){
+      if(a.groupList && a.groupList.length > 1){//组里有多个定额的情况
+          let newList = _.sortByAll(a.groupList,[function(item){
+              return parseFloat(item.param)
+          }]);//先按参数排序
+          let pre = 0;
+          for(let n of newList){
+              if(a.actualValue > pre && a.actualValue <= parseFloat(n.param)){//落在中间，则用组里的这条定额
+                  a._doc.param = n.param;
+                  a._doc.paramName = n.paramName;
+                  a._doc.assistCode = n.assistCode;
+                  break;
+              }
+              pre = parseFloat(n.param);
+          }
+      }
+  }
 }
 
 function calculateTimes(ass){

web/building_saas/main/js/models/ration_glj.js

@@ -555,7 +555,7 @@ let ration_glj = {
                 cb(data);
             })
         };
-        ration_glj.prototype.insertGLJAsRation = function (GLJSelection, selected, callback) {
+        ration_glj.prototype.insertGLJAsRation = function (GLJSelection, selected,insertType, callback) {
             let gljList = [];
             let allGLJ = gljOprObj.AllRecode;
             let billsItemID = null, serialNo = 0,selectedSerialNo = null,nextNodeID = null, parentNodeID = null, billNode = null;
@@ -611,10 +611,11 @@ let ration_glj = {
                         repositoryId: glj.repositoryId
                     };
                     if(pEngineer) new_glj.programID = pEngineer;
-                    let belongFlag = cbTools.getBelongFlag(selected);
+                    if(insertType=="insertEquipment")  new_glj.programID = projectObj.project.calcProgram.compiledTemplateMaps['设备购置'];
+                    /* let belongFlag = cbTools.getBelongFlag(selected); 原来是在设备购置清单下插入设备才要取设备勾置费的，现在改成插入设备直接取
                     if (belongFlag && belongFlag === fixedFlag.EQUIPMENT_ACQUISITION_FEE) {
                         new_glj.programID = projectObj.project.calcProgram.compiledTemplateMaps['设备购置'];
-                    }
+                    } */
                     if (glj.hasOwnProperty("compilationId")) {
                         new_glj.from = "cpt";
                         if (glj.code.indexOf('-') != -1) {//这条工料机是用户通过修改名称、规格、型号等保存到补充工料机库的

web/building_saas/main/js/views/glj_view.js

@@ -1119,7 +1119,7 @@ var gljOprObj = {
         });
         return distTypeTree;
     },
-    doInsertGLJ: function () {
+    doInsertGLJ: function (insertType) {
         var me = this;
         var selected = projectObj.project.mainTree.selected;
         var project = projectObj.project;
@@ -1127,7 +1127,7 @@ var gljOprObj = {
             return;
         }
         $.bootstrapLoading.start();
-        project.ration_glj.insertGLJAsRation(me.GLJSelection, selected, function (parentNodeID,nextNodeID,data) {
+        project.ration_glj.insertGLJAsRation(me.GLJSelection, selected,insertType ,function (parentNodeID,nextNodeID,data) {
             let newNode=null;
             for (let r_glj of data) {
                 r_glj.quantity = r_glj.quantity + "";
@@ -1660,7 +1660,7 @@ $(function () {
             return;
         }
         if (['insert', 'insertEquipment'].includes($('#actionType').val())) {  //造价书页面中插入定额类型的工料机
-            gljOprObj.doInsertGLJ();
+            gljOprObj.doInsertGLJ($('#actionType').val());
         } else if ($('#actionType').val() == 'add') { //添加工料机
             gljOprObj.doAddGLJ();
         } else if ($('#actionType').val() == 'replace') {//替换工料机