From 091b5d9703ecf913f2ac3fcbe131e72445d5c74b Mon Sep 17 00:00:00 2001
From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:56:33 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A0=9C=ED=92=88=EA=B2=80=EC=83=89=20?=
=?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 71 ++++++++++++-------
.../WEB-INF/jsp/adds/nims/product-main.jsp | 6 +-
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
index 940cd1c..38dd7fe 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
@@ -60,8 +60,10 @@
-
-
+
+
+
+
@@ -75,18 +77,18 @@
-
-
-
+
+
+
-
-
+
+
-
+
@@ -108,6 +110,7 @@
최소 유통단위 수량 |
낱개 단위 수량 |
폐기 수량 |
+ 이미지 |
@@ -123,6 +126,7 @@
{MIN_DISTB_QY} |
{PCE_QY} |
{DSUSE_QY} |
+ |
@@ -157,19 +161,27 @@
let $P = pageObject["${pageName}"];
// FormFields
- $P.formFields = new FimsFormFields("#frmEdit--${pageName}");
+ $P.bsshFormFields = new FimsFormFields("#bssh--${pageName}");
+ $P.productFormFields = new FimsFormFields("#product--${pageName}");
/**************************************************************************
* DatasetControl
**************************************************************************/
- $P.control = new DatasetControl({
- prefix: "dsuseMgtReceipt"
- , prefixName: "마약류 폐기 신청서 접수"
- , keymapper: info => info ? info.MNG_ID : ""
- , dataGetter: obj => obj.${infoPrefix}Info
- , infoSize: "xl"
- });
+ $P.control = new DatasetControl({
+ prefix: "dsuseMgtReceiptBssh"
+ , prefixName: "마약류 취급업체 조회"
+ , keymapper: info => info ? info.bsshCd : ""
+ , dataGetter: obj => obj.${infoPrefix}Info
+ , infoSize: "xl"
+ });
+ $P.productControl = new DatasetControl({
+ prefix: "dsuseMgtReceiptProduct"
+ , prefixName: "마약류 제품 조회"
+ , keymapper: info => info ? info.prductCd : ""
+ , dataGetter: obj => obj.${infoPrefix}Info
+ , infoSize: "xl"
+ });
/**************************************************************************
* DatasetControl 이벤트
**************************************************************************/
@@ -177,10 +189,18 @@
$P.control.onCurrentChange = item => {
if (!item) return;
+ $P.bsshFormFields.set($P.control, item);
+ // 업무구분에 따른 URL 변경
+ //$P.fnSetURL(item.data.bsshCd);
+ }
+
+ $P.productControl.onCurrentChange = item => {
+ if (!item) return;
+
// Dataset 셋팅
- $P.formFields.set($P.control, item);
+ $P.productFormFields.set($P.productControl, item);
// 업무구분에 따른 URL 변경
- $P.fnSetURL(item.data.TASK_SE_CD);
+ //$P.fnSetURL(item.data.bsshCd);
}
// 저장 callback
@@ -219,7 +239,7 @@
});
}
- $P.control.getProductInfo = () => {
+ $P.productControl.getProductInfo = () => {
let dialogTitle = "마약류 제품 조회";
let params = {openPage : "product--${pageName}"};
@@ -231,8 +251,8 @@
id : "productMainDialog"
, title : dialogTitle
, content : resp
- , size : $P.control.infoSize
- , onClose : () => { $P.control.setData(); }
+ , size : $P.productControl.infoSize
+ , onClose : () => { $P.productControl.setData(); }
});
}
});
@@ -256,8 +276,8 @@
**************************************************************************/
// 업무구분에 따른 URL 설정
$P.fnSetURL = (taskSeCd) => {
- $P.control.urls.create = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/create.do"); // 등록
- $P.control.urls.update = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/update.do"); // 수정
+// $P.control.urls.create = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/create.do"); // 등록
+// $P.control.urls.update = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/update.do"); // 수정
}
// 전자우편 안내문 등록 버튼 이벤트
@@ -266,7 +286,7 @@
}
$P.fnSearchProduct = (title) => {
- $P.control.getProductInfo();
+ $P.productControl.getProductInfo();
}
/**************************************************************************
@@ -281,7 +301,7 @@
content: "현재 " + $P.control.prefixName + " 정보를 저장하시겠습니까?"
, init: () => { setDialogZindex(); }
, onOK: () => {
- $P.control.save($P.formFields.get()); // formFields
+ $P.control.save($P.bsshFormFields.get()); // formFields
}
});
}
@@ -322,6 +342,7 @@
// 3. Dataset 설정
$P.control.setData([${opnnDlbrMbrInfo}]);
+ $P.productControl.setData([${opnnDlbrMbrInfo}]);
});
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
index 8d02395..341e72c 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
@@ -50,7 +50,7 @@
-
+
| {prductCd} |
{prductNm} |
{nrcdSeNm} |
@@ -97,7 +97,7 @@
}
, prefix: "productMain"
, prefixName: "마약류 제품 조회"
- , keymapper: info => info ? info.productCd : ""
+ , keymapper: info => info ? info.prductCd : ""
, dataGetter : obj => obj.productMainList
, appendData: true
, infoSize: "xl"
@@ -162,7 +162,7 @@
//
let replacer = (str, dataItem) => str
- .replace(/{onclick}/gi, "pageObject['${pageName}'].control.setCurrent('" + dataItem.getValue("productCd") + "');")
+ .replace(/{onclick}/gi, "pageObject['${pageName}'].control.setCurrent('" + dataItem.getValue("prductCd") + "');")
.replace(/{ondblclick}/gi, "pageObject['${pageName}'].fnSave()");
let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]