|
@@ -275,7 +275,10 @@ const rptCustomObj = (function () {
|
|
|
}
|
|
|
|
|
|
$('#gather-select-ok').unbind('click');
|
|
|
- $('#gather-select-ok').bind('click', () => {rptCustomObj.resetGatherSelect(resolve);});
|
|
|
+ $('#gather-select-ok').bind('click', () => {
|
|
|
+ rptCustomObj.resetGatherSelect(resolve);
|
|
|
+ $("#gather-select").modal('hide');
|
|
|
+ });
|
|
|
};
|
|
|
const initStageSelect = function (gsSetting, gsSelect, rptName, resolve = null) {
|
|
|
const setting = JSON.parse(gsSetting);
|
|
@@ -298,7 +301,10 @@ const rptCustomObj = (function () {
|
|
|
}
|
|
|
|
|
|
$('#stage-select-ok').unbind('click');
|
|
|
- $('#stage-select-ok').bind('click', () => {rptCustomObj.resetStageSelect(resolve);});
|
|
|
+ $('#stage-select-ok').bind('click', () => {
|
|
|
+ rptCustomObj.resetStageSelect(resolve);
|
|
|
+ $("#stage-select").modal('hide');
|
|
|
+ });
|
|
|
};
|
|
|
const init = function (cDefine, sfData, cSelect, rptName, resolve = null) {
|
|
|
stageFlow = sfData;
|
|
@@ -722,8 +728,8 @@ const rptCustomObj = (function () {
|
|
|
} else {
|
|
|
const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
|
|
|
params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select));
|
|
|
+ // $('#gather-select').modal('hide');
|
|
|
}
|
|
|
- $('#gather-select').modal('hide');
|
|
|
} else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
|
|
|
if (rptId === currentRptId) {
|
|
|
const data = {};
|
|
@@ -732,8 +738,8 @@ const rptCustomObj = (function () {
|
|
|
} else {
|
|
|
const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
|
|
|
params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select));
|
|
|
+ // $('#stage-select').modal('hide');
|
|
|
}
|
|
|
- $('#stage-select').modal('hide');
|
|
|
} else {
|
|
|
params.customSelect.push(null);
|
|
|
}
|