Skip to content

D
design
Commit fbf72a47 by NGUYEN HOANG SON
Options

Merge #19120

parents bfd04ce8 622c433e
Showing with 31 additions and 31 deletions
app/script/check.js
......@@ -3185,8 +3185,7 @@ CHK.createOperationList = function(operationList, isSearched = false) {
} else {
operationNameTd = $("<td class='operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '"
+ operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block text-black text-decoration-none mb-1'>" + operationList[i].operationName
+ operationList[i].operationId + "', '" + operationList[i].contentId + " ', null ,'REPORT_LIST' ,'REPORT_LIST',null);\" class='d-block text-black text-decoration-none mb-1'>" + operationList[i].operationName
+ "</a><div class='fa-sm mobile_operation_date'><i class='far fa-clock fa-blue' style='color:blue;margin-right:10px'></i>"
+ setOperationDate(operationList[i].operationStartDate) + " ~ "
+ setOperationDate(operationList[i].operationEndDate) +"</div></td>");
......@@ -3361,7 +3360,7 @@ CHK.scanResult = function(scannedCode, scanType) {
return operation.permitCode == resultCode;
})[0];
if (scannedOperation != null) {
CHK.sendScanResult('goOperation', scannedOperation.operationId, scannedOperation.contentId, scanType);
CHK.sendScanResult('goOperation', scannedOperation.operationId, scannedOperation.contentId, scanType ,'REPORT_LIST' ,'REPORT_LIST',null);
} else {
CHK.displayAlert("notExistCode");
}
......
app/script/check_pu.js
......@@ -166,7 +166,7 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
}
else
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + " ', null ,'NEW_FORM_INPUT' ,'NEW_REPORT',null);\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + " ', null ,'NEW_FORM_INPUT' ,'REPORT_LIST',null);\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
}
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>");
......@@ -200,34 +200,35 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) {
{
if (!operationList[i].processList || operationList[i].processList.length == 0) continue;
//TODO aタグlist.html 転移処理
var messageli = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId + "'></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 ,'NEW_FORM_INPUT' ,'CONTINOUS_WORK',null);\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
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
{
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 divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName + "</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;
}
var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName + "</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;
}
}
......
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