Prechádzať zdrojové kódy

中间计量,图册号取值调整

MaiXinRong 5 rokov pred
rodič
commit
aa26b9bcc0
2 zmenil súbory, kde vykonal 6 pridanie a 3 odobranie
  1. 3 1
      app/lib/stage_im.js
  2. 3 2
      app/public/js/stage_im.js

+ 3 - 1
app/lib/stage_im.js

@@ -453,16 +453,18 @@ class StageIm {
                     id: this.ImData.length + 1,
                     lid: node.id, pid: '', code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price,
                     jl: 0, contract_jl: 0, qc_jl: 0,
-                    peg: peg ? this._getPegStr(peg.name) : '', drawing_code: this._getDrawingCode(p),
+                    peg: peg ? this._getPegStr(peg.name) : ''
                 };
                 if (this.ctx.stage.im_gather && node.check) {
                     im.check = true;
                     im.bw = this._getZlGatherBw(node, peg);
                     im.xm = '';
+                    im.drawing_code = this._getDrawingCode(node);
                 } else {
                     im.check = false;
                     im.bw = this._getZlNormalBw(node, peg);
                     im.xm = node.name;
+                    im.drawing_code = this._getDrawingCode(p);
                 }
                 nodeImData.push(im);
                 this._checkCustomDetail(im);

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

@@ -508,15 +508,16 @@ const stageIm = (function () {
                 im = {
                     lid: node.id, pid: '', code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price,
                     jl: 0, contract_jl: 0, qc_jl: 0,
-                    //im_code: getNewImCode(),
-                    peg: peg ? getPegStr(peg.name) : '', drawing_code: getDrawingCode(p),
+                    peg: peg ? getPegStr(peg.name) : ''
                 };
                 if (stage.im_gather && node.check) {
                     im.bw = getZlGatherBw(node, peg);
                     im.xm = '';
+                    im.drawing_code = getDrawingCode(node);
                 } else {
                     im.bw = getZlNormalBw(node, peg);
                     im.xm = node.name;
+                    im.drawing_code = getDrawingCode(p);
                 }
                 nodeImData.push(im);
                 checkCustomDetail(im);