Commit d2c14b10 by Takumi Imai

#50922 表領域がある報告済の作業がある報告で「報告追加」ボタンをクリックしても、処理待ち状態のままになる場合がある

parent adc38c55
......@@ -122,12 +122,17 @@ RF.initFormView = function () {
if (reportStartDate) params.reportStartDate = reportStartDate;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () {
initPageLoad();
COMMON.closeLoading();
$('#report-form').load(url, params, function (data, status) {
if (status === 'success') {
initPageLoad();
COMMON.closeLoading();
} else {
RF.backPage();
COMMON.closeLoading();
}
});
} else {
COMMON.avwScreenMove('index.html');
COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.OPERATION_LIST);
}
};
......@@ -137,21 +142,19 @@ RF.initFormView = function () {
RF.backPage = function () {
// need to save Data
setTimeout(function () {
RF.initFormView();
}, 750);
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) {
COMMON.avwScreenMove('reportList.html');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('pickup.html');
}
} else {
COMMON.avwScreenMove('pickup.html');
const reportType = sessionStorage.getItem('reportType');
if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('index.html');
}
}
} else {
const reportType = sessionStorage.getItem('reportType');
if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('index.html');
}
}
}, 750);
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment