Browse Source

中间计量,计量单元-清单,图册号、位置问题

MaiXinRong 5 years ago
parent
commit
3dba5efc78
2 changed files with 8 additions and 4 deletions
  1. 4 2
      app/lib/stage_im.js
  2. 4 2
      app/public/js/stage_im.js

+ 4 - 2
app/lib/stage_im.js

@@ -609,8 +609,10 @@ class StageIm {
         }
         for (const im of nodeImData) {
             this._calculateBwBillsIm(im);
-            im.drawing_code = this.ctx.helper._.uniq(im.drawing_code).join(mergeChar);
-            im.position = this.ctx.helper._.uniq(im.position).join(mergeChar);
+            im.drawing_code = im.drawing_code instanceof Array
+                ? this.ctx.helper._.uniq(im.drawing_code).join(mergeChar) : im.drawing_code;
+            im.position = im.position instanceof Array
+                ? this.ctx.helper._.uniq(im.position).join(mergeChar): im.position;
             im.id = this.ImData.length + 1;
             this.ImData.push(im);
         }

+ 4 - 2
app/public/js/stage_im.js

@@ -559,8 +559,10 @@ const stageIm = (function () {
             }
             for (const im of nodeImData) {
                 calculateBwBillsIm(im);
-                im.drawing_code = _.uniq(im.drawing_code).join(mergeChar);
-                im.position = _.uniq(im.position).join(mergeChar);
+                im.drawing_code = im.drawing_code instanceof Array
+                    ? _.uniq(im.drawing_code).join(mergeChar) : im.drawing_code;
+                im.position = im.position instanceof Array
+                    ?_.uniq(im.position).join(mergeChar) : im.position;
                 ImData.push(im);
             }
         }