Sfoglia il codice sorgente

中间计量相关

MaiXinRong 5 anni fa
parent
commit
f081b284d1
3 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 2 2
      app/lib/stage_im.js
  2. 2 2
      app/public/js/stage.js
  3. 2 2
      app/public/js/stage_im.js

+ 2 - 2
app/lib/stage_im.js

@@ -529,8 +529,8 @@ class StageIm {
                         }
                     }
 
-                    if (pp.drawing_code instanceof Array) im.drawing_code.push(pp.drawing_code);
-                    if (pp.position instanceof Array) im.position.push(pp.position);
+                    if (pp.drawing_code && im.drawing_code instanceof Array) im.drawing_code.push(pp.drawing_code);
+                    if (pp.position && im.position instanceof Array) im.position.push(pp.position);
                 }
             } else {
                 for (const c of changes) {

+ 2 - 2
app/public/js/stage.js

@@ -1969,7 +1969,7 @@ $(document).ready(() => {
                 $('#type-title-contract').text('本期合同计量数量');
                 $('#type-title-qc').text('本期变更计量数量');
             }
-            if (stage.im_type === imType.bb.value) {
+            if (stage.im_type === imType.bb.value || stage.im_type === imType.bw.value) {
                 $('#show-jldy').parent().show();
                 $('#jldy').parent().show();
                 $('#show-xm-name').parent().hide();
@@ -2053,7 +2053,7 @@ $(document).ready(() => {
                         $('#type-title-contract').text('本期合同计量数量');
                         $('#type-title-qc').text('本期变更计量数量');
                     }
-                    if (stage.im_type === imType.bb.value) {
+                    if (stage.im_type === imType.bb.value || stage.im_type === imType.bw.value) {
                         $('#show-jldy').parent().show();
                         $('#jldy').parent().show();
                         $('#show-xm-name').parent().hide();

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

@@ -528,9 +528,9 @@ const stageIm = (function () {
                             jl: pp.gather_qty, contract_jl: pp.contract_qty, qc_jl: pp.qc_qty
                         });
 
-                        if (pp.drawing_code instanceof Array)
+                        if (pp.drawing_code && im.drawing_code instanceof Array)
                             im.drawing_code.push(pp.drawing_code);
-                        if (pp.position instanceof Array)
+                        if (pp.position && im.position instanceof Array)
                             im.position.push(pp.position);
                     }
                 } else {