Merge branch 'main' into main-prdAndseq-api-feat

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp
#	src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
main
Jonguk. Lim 1 month ago
commit 98546af7a3

@ -440,7 +440,10 @@
} }
$P.productList.onAppend = item => { $P.productList.onAppend = (item) => {
if($P.productList._items != null && $P.productList._items.length > 0){
$P.productList._items.forEach((it)=>{it.state = "";});
}
if (!item) return; if (!item) return;
if (item.length < 1) return; if (item.length < 1) return;

@ -22,6 +22,7 @@
<input type="hidden" name="hptlNo" data-map="hptlNo"/> <input type="hidden" name="hptlNo" data-map="hptlNo"/>
<input type="hidden" name="joinYn" data-map="joinYn"/> <input type="hidden" name="joinYn" data-map="joinYn"/>
<input type="hidden" name="bsshSttusNm" data-map="bsshSttusNm"/> <input type="hidden" name="bsshSttusNm" data-map="bsshSttusNm"/>
<label for="bssh--${pageName}" style="margin-top: 10px; padding-left: 20px;"><strong>취급 업체 정보</strong></label> <label for="bssh--${pageName}" style="margin-top: 10px; padding-left: 20px;"><strong>취급 업체 정보</strong></label>
<div class="row my-1 mx-4 g-1 border-card rounded-3"> <div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4"> <div class="col-md-4">
@ -371,7 +372,7 @@
, data : params , data : params
, success : resp => { , success : resp => {
dialog.open({ dialog.open({
id : "productPopupDialog" id : "productMainDialog"
, title : dialogTitle , title : dialogTitle
, content : resp , content : resp
, size : $P.productControl.infoSize , size : $P.productControl.infoSize
@ -411,7 +412,10 @@
} }
$P.productList.onAppend = item => { $P.productList.onAppend = (item) => {
if($P.productList._items != null && $P.productList._items.length > 0){
$P.productList._items.forEach((it)=>{it.state = "";});
}
if (!item) return; if (!item) return;
if (item.length < 1) return; if (item.length < 1) return;
@ -586,7 +590,7 @@
}); });
return false; return false;
} }
debugger
const data = {...$P.productFormFields.get(), keyCnt : ""+prdRowKey++}; const data = {...$P.productFormFields.get(), keyCnt : ""+prdRowKey++};
data.prdValidDe = data.prdValidDe.replaceAll('-',''); data.prdValidDe = data.prdValidDe.replaceAll('-','');
$P.productList.append([data]); $P.productList.append([data]);

Loading…
Cancel
Save