From 2d76cdf06d6f462e5f0639cff2bfb5a4b0b853f9 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 23 Sep 2024 16:23:36 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EB=8C=80=EC=B0=A8=EA=B3=84=EC=95=BD?= =?UTF-8?q?=EC=84=9C=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/rent/rent02010-main.jsp | 38 +++++++++++++++---- .../WEB-INF/jsp/fims/rent/rent02030-main.jsp | 29 ++++++-------- .../WEB-INF/jsp/fims/rent/rent02040-info.jsp | 8 ---- .../resources/js/fims/rent/rent02010.js | 4 +- .../resources/js/fims/rent/rent02030.js | 3 +- 5 files changed, 46 insertions(+), 36 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp index d191a11d..ceb0a07f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02010-main.jsp @@ -122,8 +122,20 @@
  • +
    • +
  • + +
    • +
  • +
    • @@ -144,6 +156,8 @@ 업무구분 대상여부 + 요청일시 + 승인일시 단속일시 자동차등록번호 납부자구분 @@ -168,7 +182,9 @@ {ROW_NUM} {TASK_SE_NM} - {TRGT_YN} + {TRGT_NM} + {CHG_DMND_DT} + {CHG_APRV_DT} {CRDN_YMD_TM} {VHRNO} {RTPYR_SE_NM} @@ -191,7 +207,7 @@ @@ -389,11 +405,16 @@ $P.ctrl.query.fetchSize = DEFAULT_FETCH_SIZE; // 한번에 조회되는 자료 건수 $P.ctrl.query.delYn = "N"; // 삭제 여부 - if (tabName == "대상") { - $P.ctrl.query.regTrgtYn = "Y"; - } else if (tabName == "등록") { - $P.ctrl.query.regTrgtYn = "N"; + if (tabName == "계약서등록") { + $P.ctrl.query.chgDmndYn = "N"; // 변경 요청 여부 N + $P.ctrl.query.chgAprvYn = "N"; // 변경 승인 여부 N + } else if (tabName == "승인요청") { + $P.ctrl.query.chgDmndYn = "Y"; // 변경 요청 여부 Y + $P.ctrl.query.chgAprvYn = "N"; // 변경 승인 여부 N + } else if (tabName == "승인완료") { + $P.ctrl.query.chgAprvYn = "Y"; // 변경 승인 여부 Y } + $P.ctrl.query.regSttsNm = tabName; // 임대기업번호가 전체라면.. if ($P.ctrl.query.schEntNo == "" ) { @@ -440,6 +461,7 @@ $P.fnCreate = () => { let params = { callPurpose: "create" + , crdnId: $P.ctrl.getValue("CRDN_ID") , entId: $P.ctrl.getValue("ENT_ID") , schVhrno: $P.ctrl.getValue("VHRNO") , schCtrtYmd: $P.ctrl.getValue("CRDN_YMD") diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02030-main.jsp index 70757166..0ed89c3a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02030-main.jsp @@ -27,7 +27,8 @@
    - + +
    @@ -186,7 +187,6 @@ GRID.checkbox.sync(element, bool); let atLeastOne = GRID.checkbox.countChecked(element) > 0; - $P.$findn("btnOK").prop("disabled", !atLeastOne); $P.$findn("btnRemove").prop("disabled", !atLeastOne); Apply.toDataset.selection($P.ctrl.dataset, element, bool); @@ -222,7 +222,7 @@ // URL 설정 $P.setUrl = (prefixUrl) => { $P.ctrl.urls.load = wctx.url(prefixUrl + "/030/list.do"); // 검색 - $P.ctrl.urls.create = wctx.url(prefixUrl + "/030/createReg.do") // 등록 + $P.ctrl.urls.create = wctx.url(prefixUrl + "/030/createCtrt.do") // 등록 $P.ctrl.urls.remove = wctx.url(prefixUrl + "/030/removeHirer.do") // 삭제 $P.ctrl.urls.getInfo = wctx.url(prefixUrl + "/040/info.do"); // 상세 정보 } @@ -250,6 +250,7 @@ AppSupport.initDatepicker($P.findn("frmSearch")); // 달력 초기화 // 기본 데이터 설정 + $P.$findn("crdnId").val("${crdnId}"); // 단속 ID $P.$findn("entId").val("${entId}"); // 기업 ID let ctrtYmd = "${schCtrtYmd}"; @@ -303,25 +304,19 @@ // 확인 $P.fnOK = () => { - let selected = $P.ctrl.getDataset("selected"); - - if (selected.length < 1) { - dialog.alert({ - content: "선택하신 " + $P.ctrl.prefixName + " 정보가 없습니다." - , onOK: () => { } - }); - return; - } + // 임차인 ID + let hirerId = $P.ctrl.getValue("HIRER_ID") + // 임차인 ID 가 없다면.. return + if (!hirerId) return; dialog.alert({ - content: "현재 임대계약서 정보를 저장하시겠습니까?" + content: "현재 임대계약 정보를 저장하시겠습니까?" , onOK: () => { let params = { callPurpose: "create" - , crdnId: $P.ctrl.getValue("CRDN_ID") - , levyId: $P.ctrl.getValue("LEVY_ID") - , entId: $P.ctrl.getValue("ENT_ID") - , hirerId: $P.ctrl.getValue("HIRER_ID") + , crdnId: $P.$findn("crdnId").val() // 단속 ID + , entId: $P.$findn("entId").val() // 기업 ID + , hirerId: $P.ctrl.getValue("HIRER_ID") // 임차인 ID } $P.ctrl.save(params); diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02040-info.jsp index d8501d86..d1473895 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02040-info.jsp @@ -280,14 +280,6 @@ } , success: (resp) => { } }); -/* - // 파일만 삭제 할 때 사용 - ajax.post({ - url: "file/remove.do" - , data: { fileIDs: fileId } - , success: (resp) => { } - }); -*/ } else { let filtered = $P.fileListArr.filter((value, index, arr) => { return (value.name != fileName); diff --git a/src/main/webapp/resources/js/fims/rent/rent02010.js b/src/main/webapp/resources/js/fims/rent/rent02010.js index d6d16aab..a5124803 100644 --- a/src/main/webapp/resources/js/fims/rent/rent02010.js +++ b/src/main/webapp/resources/js/fims/rent/rent02010.js @@ -15,7 +15,9 @@ function newRent02010Control(pageName, doctx="[data-doctx='rent02010']") { , remove: "/remove.do" } , formats: { - CRDN_YMD_TM: datetimeFormat + CHG_DMND_DT: datetimeFormat + , CHG_APRV_DT: datetimeFormat + , CRDN_YMD_TM: datetimeFormat , FFNLG_CRDN_AMT: numberFormat , REG_DT: datetimeFormat , MDFCN_DT: datetimeFormat diff --git a/src/main/webapp/resources/js/fims/rent/rent02030.js b/src/main/webapp/resources/js/fims/rent/rent02030.js index fd64dea3..e2b31f04 100644 --- a/src/main/webapp/resources/js/fims/rent/rent02030.js +++ b/src/main/webapp/resources/js/fims/rent/rent02030.js @@ -77,7 +77,6 @@ function newRent02030Control(pageName, doctx="[data-doctx='rent02030']") { // gridCheckbox Apply.fromDataset.gridCheckbox(ctrl.dataset, ctrl.find("[name='tbodyList']"), 1, selectedArr); // gridButton - Apply.fromDataset.gridButton(ctrl.dataset, ctrl.find("[name='btnOK']"), selectedArr); // 선택 확인 버튼 Apply.fromDataset.gridButton(ctrl.dataset, ctrl.find("[name='btnRemove']"), selectedArr); // 삭제 버튼 }; @@ -111,7 +110,7 @@ function newRent02030Control(pageName, doctx="[data-doctx='rent02030']") { // 저장 callback ctrl.onSave = (params, resp) => { - let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, ctrl.prefixName); + let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, "임대차계약"); // 메시지 출력 dialog.alert({