Skip to content

C
check
Commit e5665c62 by NGO THI HONG
Options

send data to checkForm of event click operation

parent 54a4a651
Showing with 71 additions and 23 deletions
abweb/html/pickup.html
......@@ -31,8 +31,8 @@
<script src="/abweb/common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script src="/abweb/js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script type="text/javascript" src="/abweb/js/topPage/topPage.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script>
<script type="text/javascript" src="../js/pickup/pickup.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
abweb/js/pickup/pickup.js
......@@ -308,15 +308,8 @@ PICKUP.createNewReportList = function(operationListOld) {
break;
}
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
let ahrefRequiredFlg = $("<a href=\"javascript:OL.sendOperation('"
+ operationList[i].operationId
+"', '"
+operationList[i].operationType
+"', '"
+operationList[i].reportType
+"', '"
+operationList[i].enableAddReport
+"');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
let ahrefRequiredFlg = $("<a href=\"javascript:PICKUP.sendReportFormFromNewReport ('"
+ operationList[i].operationId +"');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
+ "<div class='type-icon'>"
+ "<span class='" + classIcon + "'></span>"
......@@ -436,8 +429,8 @@ PICKUP.createContinousWorkList = function(operationListOld) {
}
else
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + directKey + "','" + operationList[i].phaseNo + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
ahrefRequiredFlg = $("<a href=\"javascript:PICKUP.sendReportFormFromContinuousWork ('"
+ operationList[i].operationId +"','" + operationList[i].taskKey + "','" + operationList[i].processKey + "'," + operationList[i].phaseNo + ");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
}
let divProccess = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'><span class='proccess'></span></div></div>");
......@@ -532,8 +525,8 @@ PICKUP.sortWarningList = function(operationList) {
*/
PICKUP.initWarningReportWithReportOnlyType = function(report) {
let ele = $("<li class='card mb-2'>"
+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('"
+ report.operationId +"'," + PICKUP.REPORT_TYPE.REPORTONLY + ",'" + report.taskKey + "', null,null,null);\" 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='report'></span></div></div>"
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
......@@ -547,8 +540,8 @@ PICKUP.initWarningReportWithReportOnlyType = function(report) {
PICKUP.initWarningReportWithInspectType = function(report) {
let ele = $("<li class='card mb-2'>"
+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('"
+ report.operationId +"'," + PICKUP.REPORT_TYPE.INSPECT + ",'" + report.taskKey + "', null,null,null);\" 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='inspection'></span></div></div>"
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
......@@ -567,8 +560,8 @@ PICKUP.initWarningReportWithInspectType = function(report) {
*/
PICKUP.initWarningReportWithAnswerReportType = function(report, reportTypeMsg) {
let ele = $("<li class='card mb-2'>"
+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "','" + report.taskType + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('"
+ report.operationId +"'," + PICKUP.REPORT_TYPE.WITHREPLY + ",null, null,null," + report.replyNo +");\" 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'>"
+ "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + reportTypeMsg + "</div>"
......@@ -600,8 +593,8 @@ PICKUP.initWarningReportWithContinuousReportType = function(report) {
}
}
let ele = $("<li class='card mb-2'>"
+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + directKey + "','" + report.phaseNo + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('"
+ report.operationId +"'," + PICKUP.REPORT_TYPE.WORKFLOW + ",null,'" + report.processKey +"' ,'"+ report.phaseNo +"',null);\" 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='proccess'></span></div></div>"
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
......@@ -681,4 +674,60 @@ PICKUP.createReportWithWarningList = function(operationListOld) {
PICKUP.getInspectDate = function(dateString) {
let date = new Date(dateString)
return date.getFullYear() + "/" + ("0" + (date.getMonth() + 1)).slice(-2) + "/" + ("0" + date.getDate()).slice(-2) ;
}
\ No newline at end of file
}
/**
* send data to open report form from New report pickup
* @returns
*/
PICKUP.sendReportFormFromNewReport = function(operationId) {
//Transition to the report form or operation list screen
let params = {};
params.sid = COMMON.getSid();
params.operationId = operationId;
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
COMMON.postCommunication(url, params);
}
/**
* send data to open report form of event click continuous work operation report
* @returns
*/
PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, processKey,phaseNo) {
//Transition to the report form or operation list screen
let params = {};
params.sid = COMMON.getSid();
params.operationId = operationId;
params.processKey = processKey;
params.phaseNo = phaseNo;
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
COMMON.postCommunication(url, params);
}
/**
* send data to open report form of event click warning operation report
* @returns
*/
PICKUP.sendReportFormFromWarningReport = function(operationId,reportType, taskKey, processKey,phaseNo, replyNo) {
//Transition to the report form or operation list screen
let params = {};
params.sid = COMMON.getSid();
params.operationId = operationId;
switch(reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY:
params.taskKey = taskKey;
break;
case PICKUP.REPORT_TYPE.INSPECT:
params.taskKey = taskKey;
break;
case PICKUP.REPORT_TYPE.WITHREPLY:
params.replyNo = replyNo;
break;
case PICKUP.REPORT_TYPE.WORKFLOW:
params.processKey = processKey;
params.phaseNo = phaseNo;
break;
}
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
COMMON.postCommunication(url, params);
}
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