zhangweicheng 7 gadi atpakaļ
vecāks
revīzija
795a0a5962
1 mainītis faili ar 8 papildinājumiem un 3 dzēšanām
  1. 8 3
      modules/ration_glj/facade/glj_calculate_facade.js

+ 8 - 3
modules/ration_glj/facade/glj_calculate_facade.js

@@ -90,14 +90,19 @@ function generateRationName(ration,gljList) {
             caption =  caption.replace('%s',ass.actualValue);
         }
     }
-
+    let reNameList = [];
     for(let g of gljList){
         //glj._doc.createType=='replace'&&glj.rcode!=glj.code
         if(g.createType=='replace'&&g.rcode!=g.code){ //是替换工料机
-            caption = caption + ' '+g.name;
-            if(!_.isEmpty(g.specs)) caption = caption + ' '+g.specs
+            let reName = g.name;
+            if(!_.isEmpty(g.specs)) reName = reName + ' '+g.specs;
+            reNameList.push(reName);
         }
     }
+    if(reNameList.length > 0){
+        let reNameString = reNameList.join(" ");
+        caption = caption + " 换为【"+ reNameString + "】";
+    }
     return caption;
 }