ピックアップの画面遷移修正

abweb/js/pickup/pickup.js

@@ -135,7 +135,7 @@ PICKUP.init = function () {
     //Check if user is logged in
     //Check if user is logged in
     COMMON.checkAuth(false);
     COMMON.checkAuth(false);
     console.log('PICKUP.init');
     console.log('PICKUP.init');
-    sessionStorage.removeItem("pickUpType");
+    sessionStorage.removeItem('pickUpType');
     // sessionStorage.pickUpType = null;
     // sessionStorage.pickUpType = null;
     sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
     sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
     TEMPLATE.loadHeader('#includedHeader');
     TEMPLATE.loadHeader('#includedHeader');
@@ -155,7 +155,6 @@ PICKUP.init = function () {
     COMMON.closeLoading();
     COMMON.closeLoading();
 };
 };
 
 
-
 /**
 /**
  * Setting pickup data
  * Setting pickup data
  */
  */
@@ -750,7 +749,8 @@ PICKUP.getInspectDate = function (dateString) {
  */
  */
 PICKUP.sendReportFormFromNewReport = function (operationId) {
 PICKUP.sendReportFormFromNewReport = function (operationId) {
     //Transition to the report form or operation list screen
     //Transition to the report form or operation list screen
-    sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.NEW_REPORT);
+    sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.NEW_REPORT);
+    sessionStorage.setItem('operationId', operationId);
     const url = 'reportForm.html?operationId=' + operationId;
     const url = 'reportForm.html?operationId=' + operationId;
     COMMON.avwScreenMove(url);
     COMMON.avwScreenMove(url);
 };
 };
@@ -764,7 +764,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
  */
  */
 PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
 PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
     //Transition to the report form or operation list screen
     //Transition to the report form or operation list screen
-    sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK);
+    sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK);
+    sessionStorage.setItem('operationId', operationId);
     const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
     const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
     COMMON.avwScreenMove(url);
     COMMON.avwScreenMove(url);
 };
 };
@@ -780,7 +781,8 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
  */
  */
 PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
 PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
     //Transition to the report form or operation list screen
     //Transition to the report form or operation list screen
-    sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
+    sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
+    sessionStorage.setItem('operationId', operationId);
     let url = 'reportForm.html?operationId=' + operationId;
     let url = 'reportForm.html?operationId=' + operationId;
     switch (reportType) {
     switch (reportType) {
         case PICKUP.REPORT_TYPE.REPORTONLY:
         case PICKUP.REPORT_TYPE.REPORTONLY: