diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java
index ae829c07..4d8a7481 100644
--- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java
+++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java
@@ -435,7 +435,9 @@ public class Sndb01Controller extends ApplicationController {
.addObject("pageName", "sndb01040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("infoPrefix", "wrngSndngDtl") // prefix
.addObject("infoPrefixUrl", CLASS_URL) // prefixUrl
- .addObject("mainQuery", toJson(req)) // 검색 조건
+ .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD)
+ .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD)
+ .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID)
.addObject("wrngSndngDtlList", toJson(mav.getModel().get("wrngSndngDtlList"))) // 자료
;
}
@@ -767,6 +769,9 @@ public class Sndb01Controller extends ApplicationController {
.addObject("pageName", "sndb01080") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("infoPrefix", "advntceSndngDtl") // prefix
.addObject("infoPrefixUrl", CLASS_URL) // prefixUrl
+ .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD)
+ .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD)
+ .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID)
.addObject("mainQuery", toJson(req)) // 검색 조건
.addObject("advntceSndngDtlList", toJson(mav.getModel().get("advntceSndngDtlList"))) // 자료
;
@@ -1150,6 +1155,9 @@ public class Sndb01Controller extends ApplicationController {
.addObject("pageName", "sndb01120") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
.addObject("infoPrefix", "nhtSndngDtl") // prefix
.addObject("infoPrefixUrl", CLASS_URL) // prefixUrl
+ .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD)
+ .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD)
+ .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID)
.addObject("mainQuery", toJson(req)) // 검색 조건
.addObject("nhtSndngDtlList", toJson(mav.getModel().get("nhtSndngDtlList"))) // 자료
;
diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp
index 96d8ae04..ab0b8779 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp
@@ -496,10 +496,10 @@
let params = {};
params.sggCd = $("#sggCd--${pageName}").val(); // 시군구 코드
params.taskSeCd = $("#frmSearch--${pageName} input[name='taskSeCd']:checked").val(); // 업무 구분 코드
- params["GdccIds"] = selected.join(","); // params[$P.control.prefixed("IDs")] = selected.join(",");
+ params.GdccIds = selected.join(","); // params[$P.control.prefixed("IDs")] = selected.join(",");
dialog.alert({
- content: "선택한 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
, onOK: () => {
$P.control.remove(params);
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index 7d8db312..dc701504 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -647,21 +647,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
index 63ce3fdf..54edd0a5 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
@@ -763,21 +763,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
index 130b1bc8..f1e8596a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
@@ -608,21 +608,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason : $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp
index eb6ee29e..272aaf86 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp
@@ -541,21 +541,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size : "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp
index 8ee7e9d1..93a7dcd2 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp
@@ -14,6 +14,7 @@
@@ -136,8 +137,6 @@
$P.callPurpose = "${callPurpose}";
// FormFields
$P.formFields = new FimsFormFields("#frmEdit--${pageName}");
- // main 의 검색 조건을 그대로 유지
- $P.mainQuery = ${mainQuery};
/**************************************************************************
* DatasetControl
@@ -260,6 +259,12 @@
// 출력
$P.print = (params) => {
if (!params) return;
+
+ dialog.alert({
+ content: "작업중입니다"
+ , onOK: () => {
+ }
+ });
}
/**************************************************************************
@@ -276,6 +281,11 @@
return;
}
+ // 검색조건
+ $P.control.query = $P.formFields.get(); // 검색 조건
+ $P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
+ $P.control.query.delYn = "N"; // 삭제 여부
+
// DataTables(그리드)
let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)")
, $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
@@ -290,8 +300,7 @@
if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return;
dialog.alert({
-// content: $P.control.prefixName + " 정보를 출력하시겠습니까?"
- content: "작업중입니다"
+ content: $P.control.prefixName + " 정보를 출력하시겠습니까?"
, onOK: () => {
$P.print($P.formFields.get());
}
@@ -334,15 +343,12 @@
$("#frmEdit--${pageName}")[0].reset();
// 기본 데이터 설정
- $("#sggCd--${pageName}").val($P.mainQuery.sggCd); // 시군구 코드
- $("#taskSeCd--${pageName}").val($P.mainQuery.taskSeCd); // 업무 구분 코드
-
- // 검색 조건 설정
- $P.control.defaultFetchSize = $P.mainQuery.fetchSize;
- $P.control.query = $P.mainQuery;
+ $("#sggCd--${pageName}").val("${sggCd}"); // 시군구 코드
+ $("#taskSeCd--${pageName}").val("${taskSeCd}"); // 업무 구분 코드
+ $("#sndngId--${pageName}").val("${sndngId}"); // 발송 ID
// 업무 구분별 설정
- $P.setTask($P.mainQuery.taskSeCd);
+ $P.setTask("${taskSeCd}");
}
// 업무 구분별 설정
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp
index 9dc9b16b..d2f075e6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp
@@ -541,21 +541,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
index 11faf4ad..574bb00d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
@@ -14,6 +14,7 @@
@@ -146,7 +147,6 @@
-
@@ -169,8 +169,6 @@
$P.callPurpose = "${callPurpose}";
// FormFields
$P.formFields = new FimsFormFields("#frmEdit--${pageName}");
- // main 의 검색 조건을 그대로 유지
- $P.mainQuery = ${mainQuery};
/**************************************************************************
* DatasetControl
@@ -373,7 +371,7 @@
});
}
- // // 반송 확인(종적결과 등록)
+ // 반송 확인(종적결과 등록)
$P.createSndbk = (params) => {
if (!params) return;
@@ -406,6 +404,11 @@
return;
}
+ // 검색조건
+ $P.control.query = $P.formFields.get(); // 검색 조건
+ $P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
+ $P.control.query.delYn = "N"; // 삭제 여부
+
// DataTables(그리드)
let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)")
, $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
@@ -562,7 +565,7 @@
content: "종적결과를 확인하시겠습니까?"
, onOK: () => {
// 파리미터 설정
- let params = $P.mainQuery; // mainQuery
+ let params = $P.formFields.get(); // mainQuery
params.title = title; // 타이틀
$P.createSndbk(params);
@@ -630,21 +633,18 @@
$("#frmEdit--${pageName}")[0].reset();
// 기본 데이터 설정
- $("#sggCd--${pageName}").val($P.mainQuery.sggCd); // 시군구 코드
- $("#taskSeCd--${pageName}").val($P.mainQuery.taskSeCd); // 업무 구분 코드
+ $("#sggCd--${pageName}").val("${sggCd}"); // 시군구 코드
+ $("#taskSeCd--${pageName}").val("${taskSeCd}"); // 업무 구분 코드
+ $("#sndngId--${pageName}").val("${sndngId}"); // 발송 ID
// 업무가 주정차위반(PVS) 또는 전용차로위반(BPV) 이라면..
- if ($P.mainQuery.taskSeCd == "PVS" || $P.mainQuery.taskSeCd == "BPV") {
+ if ("${taskSeCd}" == "PVS" || "${taskSeCd}" == "BPV") {
$("#btnLinkNxrpIndivA01--${pageName}").prop("disabled", true);
$("#btnLinkNxrpIndivA03--${pageName}").prop("disabled", true);
}
- // 검색 조건 설정
- $P.control.defaultFetchSize = $P.mainQuery.fetchSize;
- $P.control.query = $P.mainQuery;
-
// 업무 구분별 설정
- $P.setTask($P.mainQuery.taskSeCd);
+ $P.setTask("${taskSeCd}");
}
// 업무 구분별 설정
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp
index eb771dbe..58dbebc1 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp
@@ -593,21 +593,22 @@
// 삭제 메세지 확인
dialog.alert({
content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp
index 13f6fd58..afefe5b1 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp
@@ -12,7 +12,9 @@
@@ -39,9 +41,6 @@
-
@@ -330,6 +329,11 @@
return;
}
+ // 검색조건
+ $P.control.query = $P.formFields.get(); // 검색 조건
+ $P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
+ $P.control.query.delYn = "N"; // 삭제 여부
+
// DataTables(그리드)
let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)")
, $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
@@ -400,7 +404,7 @@
// 중복자료 삭제
$P.fnRemoveDpcnData = () => {
-
+ //
}
// 반송(종적결과) 확인
@@ -412,7 +416,7 @@
content: "종적결과를 확인하시겠습니까?"
, onOK: () => {
// 파리미터 설정
- let params = $P.mainQuery; // mainQuery
+ let params = $P.formFields.get(); // mainQuery
params.title = title; // 타이틀
$P.createSndbk(params);
@@ -438,9 +442,6 @@
$("#btnPrintNhtOutsourcing--${pageName}").on("click", function() {
$P.fnMakeFileNht($(this).attr("title"), "outsourcing") // 고지서 출력(외주파일)
});
- $("#btnRemoveDpcnData--${pageName}").on("click", function() {
- $P.fnRemoveDpcnData($(this).attr("title")); // 중복자료 삭제
- });
$("#btnCreateSndbk--${pageName}").on("click", function() {
$P.fnCreateSndbk($(this).attr("title")); // 반송 등록
});
@@ -459,9 +460,6 @@
, ${infoPrefix}Fetch: ${nhtSndngDtlFetch}
, ${infoPrefix}Total: ${nhtSndngDtlTotal}
});
-
- // 초기 데이터 설정
- $P.initData();
});
}
@@ -469,19 +467,20 @@
$P.initForm = () => {
// 화면 초기화
$("#frmEdit--${pageName}")[0].reset();
- }
- // 초기 데이터 설정
- $P.initData = () => {
- // SNDNG_ID
- $("#sndngId--${pageName}").val($P.control.dataset.getValue("SNDNG_ID"));
+ // 기본 데이터 설정
+ $("#sggCd--${pageName}").val("${sggCd}"); // 시군구 코드
+ $("#taskSeCd--${pageName}").val("${taskSeCd}"); // 업무 구분 코드
+ $("#sndngId--${pageName}").val("${sndngId}"); // 발송 ID
- // 검색 조건 설정
- $P.control.defaultFetchSize = $P.mainQuery.fetchSize;
- $P.control.query = $P.mainQuery;
+ // 업무 구분별 설정
+ $P.setTask("${taskSeCd}");
+ }
+ // 업무 구분별 설정
+ $P.setTask = (taskSeCd) => {
// 업무구분에 따른 URL 설정
- $P.control.urls.load = wctx.url("/" + $P.mainQuery.taskSeCd + "${infoPrefixUrl}" + "/120/list.do"); // 검색
+ $P.control.urls.load = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/120/list.do"); // 검색
}
/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
index 06d964d5..782dfed9 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
@@ -674,24 +674,23 @@
// 삭제 메세지 확인
dialog.alert({
- content : "선택한 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK : async() => {
- // 사유 입력
- var resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- var template = await resp.text();
-
- dialog.open({
- id : "inputDelRsnDialog",
- title: title,
- size : "lg",
- content: template,
- init : () => {
- setDialogZindex();
- },
- onOK : () => {
- $P.callbackRsn({ reason : $("#reason").val() });
- }
- });
+ content: "선택하신 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
+ // 삭제 사유 입력
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
@@ -774,7 +773,7 @@
});
new Error("");
}
-
+
let parts = header.split(';');
filenameInHeader = decodeURIComponent(parts[1].split('=')[1]);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
index d1ecb58a..da94bf8f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
@@ -452,22 +452,23 @@
// 삭제 메세지 확인
dialog.alert({
- content: "선택한 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
- // 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK : () => {
- $P.callbackRsn({ reason : $("#reason").val() });
- }
- });
+ content: "선택하신 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
+ // 삭제 사유 입력
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp
index fcf8b161..438688e4 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp
@@ -474,8 +474,9 @@
// 미배달 사유 코드
let undlvrRsnCd = $P.sndngDtlControl.dataset.getValue("UNDLVR_RSN_CD");
let undlvrRsnNm = $P.sndngDtlControl.dataset.getValue("UNDLVR_RSN_NM");
+
// 발송상세 상태코드 확인 (FIM050 - 05:반송)
- if (undlvrRsnCd == "") {
+ if (undlvrRsnNm == null || undlvrRsnNm == "") {
dialog.alert({
content : "조회된 반송(미배달) 사유가 없습니다."
+ "
" + "[" + title + "]" + " 실행이 취소되었습니다."
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
index b91c9a31..41d15db0 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
@@ -674,22 +674,23 @@
// 삭제 메세지 확인
dialog.alert({
- content: "선택한 " + $P.rductControl.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
- // 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsnRduct({ reason : $("#reason").val() });
- }
- });
+ content: "선택하신 " + $P.rductControl.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
+ // 삭제 사유 입력
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsnRduct({ reason : $("#reason").val() });
+ }
+ });
+ });
}
});
}
@@ -818,22 +819,23 @@
// 삭제 메세지 확인
dialog.alert({
- content : "선택한 " + $P.levyExclControl.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK : async() => {
+ content: "선택하신 " + $P.levyExclControl.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsnLevyExcl({ reason: $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsnLevyExcl({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
index d27c811c..2614205e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
@@ -512,22 +512,23 @@
// 삭제 메세지 확인
dialog.alert({
- content: "선택한 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK: async() => {
- // 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason: $("#reason").val() });
- }
- });
+ content: "선택하신 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
+ // 삭제 사유 입력
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp
index 728f5e29..5d1b84fe 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp
@@ -301,24 +301,23 @@
// 삭제 메세지 확인
dialog.alert({
- content : "선택한 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK : async() => {
- // 사유 입력
- var resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- var template = await resp.text();
-
- dialog.open({
- id : "inputDelRsnDialog",
- title: title,
- size : "lg",
- content: template,
- init : () => {
- setDialogZindex();
- },
- onOK : () => {
- $P.callbackRsn({ reason : $("#reason").val() });
- }
- });
+ content: "선택하신 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
+ // 삭제 사유 입력
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp
index 13b9b0bd..532f9ce8 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp
@@ -525,22 +525,23 @@
// 삭제 메세지 확인
dialog.alert({
- content : "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
- , onOK : async() => {
+ content: "선택하신 " + selected.length + "건의 " + $P.control.prefixName + " 정보를 삭제하시겠습니까?"
+ , onOK: () => {
// 삭제 사유 입력
- let resp = await fetch(wctx.url("/resources/html/inputRsnDialog.html"));
- let template = await resp.text();
-
- dialog.open({
- id: "inputDelRsnDialog"
- , title: title
- , size: "lg"
- , content: template
- , init: () => { setDialogZindex(); }
- , onOK: () => {
- $P.callbackRsn({ reason : $("#reason").val() });
- }
- });
+ fetch(wctx.url("/resources/html/inputRsnDialog.html"))
+ .then(function(resp) { return resp.text(); })
+ .then(function(template) {
+ dialog.open({
+ id: "inputDelRsnDialog"
+ , title: title
+ , size: "lg"
+ , content: template
+ , init: () => { setDialogZindex(); }
+ , onOK: () => {
+ $P.callbackRsn({ reason: $("#reason").val() });
+ }
+ });
+ });
}
});
}