Merge remote-tracking branch 'origin/main'

dev
Jonguk. Lim 5 months ago
commit 7767054cc4

@ -130,6 +130,10 @@
</div> <!-- <div class="card"> --> </div> <!-- <div class="card"> -->
<div class="card col-6"> <div class="card col-6">
<label class="form-label fw-bold form-search-title" for="Rslt--${pageName}">결과 정보</label> <label class="form-label fw-bold form-search-title" for="Rslt--${pageName}">결과 정보</label>
<input type="hidden" id="setUsrRptIdNo--${pageName}" name="setUsrRptIdNo" />
<!-- <input type="hidden" id="setOrgUsrRptIdNo--${pageName}" name="setOrgUsrRptIdNo" />
<input type="hidden" id="setRptTyCd--${pageName}" name="setRptTyCd" />
<input type="hidden" id="setStatus--${pageName}" name="setStatus" /> -->
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-250" id="table-responsive-1--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-250" id="table-responsive-1--${pageName}">
@ -159,7 +163,7 @@
<template id="${infoPrefix}Row--${pageName}Mapping"> <template id="${infoPrefix}Row--${pageName}Mapping">
<tr data-key="{orgUsrRptIdNo}"> <tr data-key="{orgUsrRptIdNo}">
<td class="text-center"> <td class="text-center">
<input type="radio" class="form-check-input" name="maapingCheck" value="{dscdmngId}" alt="맵핑체크" onClick="return false" > <input type="radio" class="form-check-input" name="maapingCheck" value="{dscdmngId}" alt="맵핑체크" onchange="{onchange}">
</td> </td>
<%-- <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dscdmngId}</td>--%> <%-- <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dscdmngId}</td>--%>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{bsshNm}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{bsshNm}</td>
@ -469,6 +473,7 @@
document.getElementById("${infoPrefix}Row--${pageName}Mapping").innerHTML, <%-- from template#${infoPrefix}Row --%> document.getElementById("${infoPrefix}Row--${pageName}Mapping").innerHTML, <%-- from template#${infoPrefix}Row --%>
(str, dataItem) => str (str, dataItem) => str
.replace(/{onclick}/gi, "pageObject['${pageName}'].mappingControl.setCurrent('" + dataItem.getValue("usrRptIdNo") + "');") .replace(/{onclick}/gi, "pageObject['${pageName}'].mappingControl.setCurrent('" + dataItem.getValue("usrRptIdNo") + "');")
.replace(/{onchange}/gi, "pageObject['${pageName}'].radioClick('" + dataItem.getValue("usrRptIdNo") + "');")
); );
$("#tbody--${pageName}Mapping").html(trs.join()); $("#tbody--${pageName}Mapping").html(trs.join());
@ -481,7 +486,6 @@
if(col0val != "" && col0val != null){ if(col0val != "" && col0val != null){
col0.prop("checked",true); col0.prop("checked",true);
} }
}); });
} }
@ -527,9 +531,12 @@
$P.fnSave = () => { $P.fnSave = () => {
// validate 확인 // validate 확인
//if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; //if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return;
//let checkData = $("input[name='maapingCheck']:checked").val();
let checkData = $("#setUsrRptIdNo--${pageName}").val();
$P.mappingControl.setCurrent(checkData);
const row = $P.mappingControl.getCurrent();
dialog.alert({ dialog.alert({
content: "현재 폐기 보고 확인 정보를 저장하시겠습니까?" content: "현재 선택에 체크 된 폐기 보고 확인 정보를 저장하시겠습니까?"
, init: () => { setDialogZindex(); } , init: () => { setDialogZindex(); }
, onOK: () => { , onOK: () => {
$P.control.save(); // formFields $P.control.save(); // formFields
@ -537,6 +544,11 @@
}); });
} }
$P.radioClick = (dataKey) => {
$P.mappingControl.setCurrent(dataKey);
$("#setUsrRptIdNo--${pageName}").val(dataKey);
}
/************************************************************************** /**************************************************************************
* 초기 셋팅 * 초기 셋팅
**************************************************************************/ **************************************************************************/

Loading…
Cancel
Save