Skip to content

C
check
Commit 1dbc8433 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web' 

Feature/1.0 check web dev

See merge request !122
parents 787c07d3 cd3ff48f
Showing with 7 additions and 5 deletions
abweb/js/reportForm/reportForm.js
...@@ -143,17 +143,19 @@ RF.backPage = function () { ...@@ -143,17 +143,19 @@ RF.backPage = function () {
// need to save Data // need to save Data
setTimeout(function () { setTimeout(function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) { if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS);
} else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.PICKUP_WARNING);
} else { } else {
COMMON.avwScreenMove('pickup.html'); COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.REPORT_LIST);
} }
} else { } else {
const reportType = sessionStorage.getItem('reportType'); const reportType = sessionStorage.getItem('reportType');
if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) { if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.REPORT_LIST);
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove(CONSTANT.URL_TREE_NAME.OPERATION_LIST);
} }
} }
}, 750); }, 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