Commit 6d01bc08 by Takumi Imai

課題59 定期点検 削除後戻らない問題

parent 68955d68
...@@ -170,14 +170,15 @@ RF.initFormView = function () { ...@@ -170,14 +170,15 @@ RF.initFormView = function () {
* back page url * back page url
*/ */
RF.backPage = function () { RF.backPage = function () {
const reportType = sessionStorage.getItem('reportType');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (addReportFlg == 1) { if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
} else { } else {
COMMON.avwScreenMove('pickup.html'); COMMON.avwScreenMove('pickup.html');
} }
} else { } else {
if (addReportFlg == 1) { if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
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