|
@@ -537,23 +537,23 @@ const rptCustomObj = (function () {
|
|
|
return x.id === rptId;
|
|
|
});
|
|
|
if (gather_select && gather_select.custom_define && gather_select.custom_define[sGatherSelect].enable) {
|
|
|
- const data = {};
|
|
|
if (rptId === currentRptId) {
|
|
|
+ const data = {};
|
|
|
data[sGatherSelect] = gather_select[sGatherSelect];
|
|
|
+ params.customSelect.push(data);
|
|
|
} else {
|
|
|
const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
|
|
|
- data[sGatherSelect] = await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select);
|
|
|
+ params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select));
|
|
|
}
|
|
|
- params.customSelect.push(data);
|
|
|
} else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
|
|
|
- const data = {};
|
|
|
if (rptId === currentRptId) {
|
|
|
+ const data = {};
|
|
|
data[sStageSelect] = stage_select[sStageSelect];
|
|
|
+ params.customSelect.push(data);
|
|
|
} else {
|
|
|
const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
|
|
|
- data[sStageSelect] = await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select);
|
|
|
+ params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select));
|
|
|
}
|
|
|
- params.customSelect.push(data);
|
|
|
} else {
|
|
|
params.customSelect.push(null);
|
|
|
}
|