Skip to content

C
check
Commit 2ce157d0 by Takumi Imai
Options

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
parents e15b1f6e a73a012a
Showing with 12 additions and 12 deletions
abweb/js/pickup/pickup.js
...@@ -600,15 +600,15 @@ PICKUP.initWarningReportWithInspectType = function (report) { ...@@ -600,15 +600,15 @@ PICKUP.initWarningReportWithInspectType = function (report) {
* @param {*} reportTypeMsg * @param {*} reportTypeMsg
* @returns * @returns
*/ */
PICKUP.initWarningReportWithAnswerReportType = function (report, reportTypeMsg) { PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, reportTypeMsg) {
let ele = $( let ele = $(
"<li class='card mb-2'>" + "<li class='card mb-2'>" +
'<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' + '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
report.operationId + report.operationId +
"'," + "'," +
PICKUP.REPORT_TYPE.WITHREPLY + PICKUP.REPORT_TYPE.WITHREPLY +
',null, null,null,' + ',\'' + report.taskKey +"', null,null," +
report.replyNo + reportType +
");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + ");\" 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'>" + "<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'>" + "<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) { ...@@ -712,9 +712,9 @@ PICKUP.createReportWithWarningList = function (operationListOld) {
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: // report answer case PICKUP.REPORT_TYPE.WITHREPLY: // report answer
if (operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT) { 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 { } else {
operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelAnswer); operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i],PICKUP.REPLYREPORT_TASK_TYPE.ANSWER, msgLevelAnswer);
} }
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork
...@@ -781,24 +781,24 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces ...@@ -781,24 +781,24 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
* @param {*} replyNo * @param {*} replyNo
*/ */
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 //Transaction 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); 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:
url += '&taskKey' + taskKey; url += '&taskKey=' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.INSPECT: case PICKUP.REPORT_TYPE.INSPECT:
url += '&taskKey' + taskKey; url += '&taskKey=' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: case PICKUP.REPORT_TYPE.WITHREPLY:
url += '&taskKey' + taskKey; url += '&taskKey=' + taskKey;
url += '&replyNO' + replyNo; url += '&replyNo=' + replyNo;
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: case PICKUP.REPORT_TYPE.WORKFLOW:
url += '&processKey' + processKey; url += '&processKey=' + processKey;
url += '&phaseNo' + phaseNo; url += '&phaseNo=' + phaseNo;
break; break;
} }
......
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