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

feature/1.0_check_web_dev_50312

See merge request !86

abweb/js/pickup/pickup.js

@@ -600,15 +600,15 @@ PICKUP.initWarningReportWithInspectType = function (report) {
  * @param {*} reportTypeMsg
  * @returns
  */
-PICKUP.initWarningReportWithAnswerReportType = function (report, reportTypeMsg) {
+PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, reportTypeMsg) {
     let ele = $(
         "<li class='card mb-2'>" +
             '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
             report.operationId +
             "'," +
             PICKUP.REPORT_TYPE.WITHREPLY +
-            ',null, null,null,' +
-            report.replyNo +
+            ',\'' + report.taskKey +"', null,null," +
+            reportType +
             ");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
             "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>" +
             "<span class='questionary'></span></div></div><div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" +
@@ -712,9 +712,9 @@ PICKUP.createReportWithWarningList = function (operationListOld) {
                 break;
             case PICKUP.REPORT_TYPE.WITHREPLY: // report answer
                 if (operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT) {
-                    operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelReport);
+                    operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], PICKUP.REPLYREPORT_TASK_TYPE.REPORT, msgLevelReport);
                 } else {
-                    operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelAnswer);
+                    operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i],PICKUP.REPLYREPORT_TASK_TYPE.ANSWER, msgLevelAnswer);
                 }
                 break;
             case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork
@@ -781,24 +781,24 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
  * @param {*} replyNo
  */
 PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
-    //Transition to the report form or operation list screen
+    //Transaction to the report form or operation list screen
     sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
     sessionStorage.setItem('operationId', operationId);
     let url = 'reportForm.html?operationId=' + operationId;
     switch (reportType) {
         case PICKUP.REPORT_TYPE.REPORTONLY:
-            url += '&taskKey' + taskKey;
+            url += '&taskKey=' + taskKey;
             break;
         case PICKUP.REPORT_TYPE.INSPECT:
-            url += '&taskKey' + taskKey;
+            url += '&taskKey=' + taskKey;
             break;
         case PICKUP.REPORT_TYPE.WITHREPLY:
-            url += '&taskKey' + taskKey;
-            url += '&replyNO' + replyNo;
+            url += '&taskKey=' + taskKey;
+            url += '&replyNo=' + replyNo;
             break;
         case PICKUP.REPORT_TYPE.WORKFLOW:
-            url += '&processKey' + processKey;
-            url += '&phaseNo' + phaseNo;
+            url += '&processKey=' + processKey;
+            url += '&phaseNo=' + phaseNo;
             break;
     }