Skip to content

D
design
Commit a2cd83c2 by NGUYEN HOANG SON
Options

Merge commit '16e6a9f0' into feature/1.4.3_dev 

* commit '16e6a9f0':
  #19120 update continous work list
parents 87c28c57 16e6a9f0
Showing with 34 additions and 28 deletions
app/script/check_pu.js
......@@ -201,33 +201,39 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) {
if (!operationList[i].processList || operationList[i].processList.length == 0) continue;
//TODO aタグlist.html 転移処理
for (var j = 0; j < operationList[i].processList.length; j++) {
var messageli = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].processList[j].processKey + "'></li>") ;
var ahrefRequiredFlg ;
if (operationList[i].permitCodeRequiredFlg == 1)
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
}
else
for( var g = 0; g < operationList[i].processList[j].phaseList.length; g++)
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + operationList[i].processList[j].processKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
if(operationList[i].processList[j].phaseList[g].phaseStatus != 999)
{
var messageli = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].processList[j].processKey + "'></li>") ;
var ahrefRequiredFlg ;
if (operationList[i].permitCodeRequiredFlg == 1)
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
}
else
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + operationList[i].processList[j].processKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
}
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var divSubTitleWrap = $("<div class='sub-title-wrap'> </div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12''></i>");
var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[j].phaseList[g].phaseName + "</div>");
var divCode = $(" <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].processList[j].phaseList[g].taskCode + "</div></div>");
var divSubTitle = $("<div class='sub-title'>" + operationList[i].processList[j].phaseList[g].taskName + "</div>");
divSubTitleWrap.append(divCode);
divSubTitleWrap.append(divSubTitle);
ahrefRequiredFlg.append(divProccess);
ahrefRequiredFlg.append(divTitle);
ahrefRequiredFlg.append(divSubTitleWrap);
ahrefRequiredFlg.append(iIcon);
messageli.append(ahrefRequiredFlg);
$("#continousWork-list").append(messageli);
CHK_pu.countContinousWorkReport = CHK_pu.countContinousWorkReport + 1;
}
}
var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[j].phaseList[0].phaseName + "</div>");
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var divSubTitleWrap = $("<div class='sub-title-wrap'> </div>");
var divCode = $(" <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div></div>");
var divSubTitle = $("<div class='sub-title'>" + operationList[i].operationName + "</div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12''></i>");
divSubTitleWrap.append(divCode);
ahrefRequiredFlg.append(divProccess);
ahrefRequiredFlg.append(divTitle);
ahrefRequiredFlg.append(divSubTitleWrap);
ahrefRequiredFlg.append(divSubTitle);
ahrefRequiredFlg.append(iIcon);
messageli.append(ahrefRequiredFlg);
$("#continousWork-list").append(messageli);
CHK_pu.countContinousWorkReport = CHK_pu.countContinousWorkReport + 1;
}
}
}
......@@ -291,11 +297,11 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case 3:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].processKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].processKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].phaseList[0].phaseName
+ "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
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