소스 검색

多期汇总,调整

MaiXinRong 4 년 전
부모
커밋
44ac1c7486
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      app/public/report/js/rpt_custom.js

+ 3 - 3
app/public/report/js/rpt_custom.js

@@ -468,7 +468,7 @@ const rptCustomObj = (function () {
                     return x.id === zTreeOprObj.currentNode.refId;
                 });
                 if (stage_select) {
-                    stage_select.gather_select = data[sStageSelect];
+                    stage_select.stage_select = data[sStageSelect];
                 }
                 $('#stage-select-count').html(data[sStageSelect].stages.length);
                 $('#stage-select').modal('hide');
@@ -545,6 +545,7 @@ const rptCustomObj = (function () {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select));
                 }
+                $('#gather-select').modal('hide');
             } else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
                 if (rptId === currentRptId) {
                     const data = {};
@@ -554,12 +555,11 @@ const rptCustomObj = (function () {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select));
                 }
+                $('#stage-select').modal('hide');
             } else {
                 params.customSelect.push(null);
             }
         }
-        $('#gather-select').modal('hide');
-        $('#stage-select').modal('hide');
     };
 
     const showMaterialSelect = function () {