|
@@ -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 () {
|