From cc5cb5a0acbad07e489cfe4678328b281755e284 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Wed, 2 Oct 2024 16:57:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EB=8C=80=EC=B0=A8=EA=B3=84=EC=95=BD?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=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  |   2 +-
 .../WEB-INF/jsp/fims/rent/rent02030-main.jsp  |   3 +-
 .../WEB-INF/jsp/fims/rent/rent02050-main.jsp  |   2 +-
 .../WEB-INF/jsp/fims/rent/rent02060-info.jsp  | 157 ++++++++++++------
 .../resources/js/fims/rent/rent02060.js       |   6 +-
 5 files changed, 114 insertions(+), 56 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 5a12d7c7..10746658 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
@@ -368,7 +368,7 @@
             $P.findn("tableRspns").changeColumn(colsOuterHTML);
 
             // 버튼 설정
-            $(".nav-link.active").removeClass("active");                        // 기존의 활성화된 탭에서 active 클래스 제거
+            $($P.find(".nav-link.active")).removeClass("active");               // 기존의 활성화된 탭에서 active 클래스 제거
             $P.$findn("tabItem0").addClass("active");                           // 새로운 탭에 active 클래스 추가
 
             let tabName = $P.$findn("tabMain").find("button.active").text().trim();
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 45a432c8..4a564958 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
@@ -28,7 +28,6 @@
             <form name="frmSearch">
                 <!-- hidden -->
                 <input type="hidden" name="crdnId" data-map="CRDN_ID" />
-                <input type="hidden" name="entId" data-map="ENT_ID" />
 
                 <!-- 메인 조건 -->
                 <div class="container-search">
@@ -328,7 +327,7 @@
                           callPurpose: "create"
                         , lsctId: $P.ctrl.getValue("LSCT_ID")                   // 임대차계약 ID
                         , crdnId: $P.$findn("crdnId").val()                     // 단속 ID
-                        , entId: $P.$findn("entId").val()                       // 기업 ID
+                        , entId: $P.ctrl.getValue("ENT_ID")                     // 임대차계약 ID
                     }
 
                     $P.ctrl.save(params);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
index 42381520..f0aa4af8 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02050-main.jsp
@@ -356,7 +356,7 @@
             $P.findn("tableRspns").changeColumn(colsOuterHTML);
 
             // 버튼 설정
-            $(".nav-link.active").removeClass("active");                        // 기존의 활성화된 탭에서 active 클래스 제거
+            $($P.find(".nav-link.active")).removeClass("active");               // 기존의 활성화된 탭에서 active 클래스 제거
             $P.$findn("tabItem0").addClass("active");                           // 새로운 탭에 active 클래스 추가
 
             let tabName = $P.$findn("tabMain").find("button.active").text().trim();
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02060-info.jsp
index 910b527c..dc500f69 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02060-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02060-info.jsp
@@ -12,13 +12,14 @@
 		    <!-- hidden -->
 		    <input type="hidden" name="lsctMpngId" data-map="LSCT_MPNG_ID" />
 
-            <!-- 단속 정보 -->
+            <!-- 임대차계약 승인 정보 -->
             <div class="card">
+                <input type="hidden" name="crdnId" data-map="CRDN_ID" />
+
                 <!-- 업무 버튼 -->
                 <div class="container-page-btn">
-                    <label class="col-form-label bg-label-danger pe-2 w-px-120 text-sm-center">단속 정보</label>
+                    <label class="col-form-label bg-label-danger pe-2 w-px-120 text-sm-center">승인요청 정보</label>
                 </div> <!-- <div class="container-page-btn"> -->
-
                 <div class="row g-1">
 					<!-- 단속 일시 -->
 					<div class="col-md-6">
@@ -30,100 +31,159 @@
 					    <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="vhrno">차량번호</label>
 					    <input is="id-input" type="text" class="form-control w-30" name="vhrno" data-map="VHRNO" readonly />
 					</div>
-                    <!-- 위반 내용 -->
+                    <!-- 요청 일시 -->
+                    <div class="col-md-6">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="chgDmndDt">요청일시</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="chgDmndDt" data-map="CHG_DMND_DT" data-fmt-type="dt" readonly />
+                    </div>
+                    <!-- 요청 등록자 -->
+                    <div class="col-md-6">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="vhrno">요청자</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="chgDmndRgtrNm" data-map="CHG_DMND_RGTR_NM" readonly />
+                    </div>
+                    <!-- 변경 승인 일시 -->
+                    <div class="col-md-6">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="chgAprvDt">승인일시</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="chgAprvDt" data-map="CHG_APRV_DT" data-fmt-type="dt" readonly />
+                    </div>
+                    <!-- 변경 승인자 -->
+                    <div class="col-md-6">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="chgAutzr">승인자</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="chgAutzr" data-map="CHG_AUTZR" readonly />
+                    </div>
+                    <!-- 변경 승인 사유 -->
+                    <div class="col-md-12">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="chgAprvRsn">승인사유</label>
+                        <input is="id-input" type="text" class="form-control w-87" name="chgAprvRsn" data-map="CHG_APRV_RSN" readonly />
+                    </div>
+                    <!-- 등록 일시 / 등록자 -->
                     <div class="col-md-6">
-                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="vltnArtcl">위반내용</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="vltnArtcl" data-map="VLTN_ARTCL" readonly />
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="regDt">등록일시</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="regDt" data-map="REG_DT" data-fmt-type="dt" readonly />
+                        <input is="id-input" type="text" class="form-control w-25" name="rgtrNm" data-map="RGTR_NM" readonly />
                     </div>
-                    <!-- 단속 장소 -->
+                    <!-- 수정 일시 / 수정자 -->
                     <div class="col-md-6">
-                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="crdnPlc">단속장소</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="crdnStdgNm" data-map="CRDN_STDG_NM" readonly />
-                        <input is="id-input" type="text" class="form-control w-40" name="crdnPlc" data-map="CRDN_PLC" readonly />
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="mdfcnDt">수정일시</label>
+                        <input is="id-input" type="text" class="form-control w-30" name="mdfcnDt" data-map="MDFCN_DT" data-fmt-type="dt" readonly />
+                        <input is="id-input" type="text" class="form-control w-25" name="mdfrNm" data-map="MDFR_NM" readonly />
+                    </div>
+                </div>
+            </div> <!-- 임대차계약 승인 정보 -->
+
+            <p></p>
+
+            <!-- 임대 기업 정보 -->
+            <div class="card">
+                <input type="hidden" name="entId" data-map="ENT_ID" />
+
+                <!-- 업무 버튼 -->
+                <div class="container-page-btn">
+                    <label class="col-form-label bg-label-danger pe-2 w-px-120 text-sm-center">임대기업 정보</label>
+                </div> <!-- <div class="container-page-btn"> -->
+                <div class="row g-1">
+                    <!-- 기업 구분 코드 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entSeNm">기업구분</label>
+                        <input is="id-input" type="text" class="form-control w-25" name="entSeNm" data-map="ENT_SE_NM" readonly />
+                    </div>
+                    <!-- 기업 등록 번호 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entRegNo">법인(사업자)번호</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="entRegNo" data-map="ENT_REG_NO" readonly />
+                    </div>
+                    <!-- 기업 명 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entNm">기업명</label>
+                        <input is="id-input" type="text" class="form-control w-60" name="entNm" data-map="ENT_NM" readonly />
+                    </div>
+                    <!-- 기업 전화번호 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entTelno">전화번호</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="entTelno" data-map="ENT_TELNO" readonly />
+                    </div>
+                    <!-- 기업 팩스번호 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entFxno">팩스번호</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="entFxno" data-map="ENT_FXNO" readonly />
+                    </div>
+                    <!-- 기업 이메일 주소 -->
+                    <div class="col-md-4">
+                        <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="entEmlAddr">이메일</label>
+                        <input is="id-input" type="text" class="form-control w-60" name="entEmlAddr" data-map="ENT_EML_ADDR" readonly />
                     </div>
                 </div>
-            </div>
+            </div> <!-- 임대 기업 정보 -->
 
             <p></p>
 
             <!-- 임대차계약 정보 -->
             <div class="card">
+                <input type="hidden" name="lsctId" data-map="LSCT_ID" />
+
                 <!-- 업무 버튼 -->
                 <div class="container-page-btn">
                     <label class="col-form-label bg-label-danger pe-2 w-px-120 text-sm-center">임대차계약 정보</label>
                 </div> <!-- <div class="container-page-btn"> -->
-
                 <div class="row g-1">
                     <!-- 계약 시작 일시 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="ctrtBgngYmd">계약시작일시</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="ctrtBgngYmd" data-map="CTRT_BGNG_DT" data-fmt-type="dt" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="ctrtBgngYmd" data-map="CTRT_BGNG_DT" data-fmt-type="dt" readonly />
                     </div>
                     <!-- 계약 종료 일시 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="ctrtEndYmd">계약종료일시</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="ctrtEndYmd" data-map="CTRT_END_DT" data-fmt-type="dt" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="ctrtEndYmd" data-map="CTRT_END_DT" data-fmt-type="dt" readonly />
                     </div>
                     <!-- 자동차등록번호 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="vhrno">자동차등록번호</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="vhrno" data-map="VHRNO" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="vhrno" data-map="VHRNO" readonly />
                     </div>
                     <!-- 임차인 구분 코드 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="vhrno">임차인구분</label>
-                        <input is="id-input" type="text" class="form-control w-20" name="hirerSeNm" data-map="HIRER_SE_NM" readonly />
+                        <input is="id-input" type="text" class="form-control w-25" name="hirerSeNm" data-map="HIRER_SE_NM" readonly />
                     </div>
                     <!-- 임차인 등록 번호 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerRegNo">임차인등록번호</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="hirerRegNo" data-map="HIRER_REG_NO" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="hirerRegNo" data-map="HIRER_REG_NO" readonly />
                     </div>
                     <!-- 임차인 명 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerNm">임차인명</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="hirerNm" data-map="HIRER_NM" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="hirerNm" data-map="HIRER_NM" readonly />
                     </div>
                     <!-- 임차인 전화번호 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerTelno">전화번호</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="hirerTelno" data-map="HIRER_TELNO" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="hirerTelno" data-map="HIRER_TELNO" readonly />
                     </div>
                     <!-- 임차인 휴대 전화번호 -->
-                    <div class="col-md-6">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerMblTelno">휴대전화번호</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="hirerMblTelno" data-map="HIRER_MBL_TELNO" readonly />
+                        <input is="id-input" type="text" class="form-control w-45" name="hirerMblTelno" data-map="HIRER_MBL_TELNO" readonly />
                     </div>
                     <!-- 임차인 이메일 주소 -->
-                    <div class="col-md-12">
+                    <div class="col-md-4">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerEmlAddr">이메일</label>
-                        <input is="id-input" type="text" class="form-control w-30" name="hirerEmlAddr" data-map="HIRER_EML_ADDR" readonly />
+                        <input is="id-input" type="text" class="form-control w-60" name="hirerEmlAddr" data-map="HIRER_EML_ADDR" readonly />
                     </div>
                     <!-- 주소 --><!-- 우편번호 -->
                     <div class="col-md-12">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerAddr">주소</label>
-                        <input is="id-input" type="text" class="form-control w-70" name="hirerAddr" data-map="HIRER_ADDR" readonly />
+                        <input is="id-input" type="text" class="form-control w-79" name="hirerAddr" data-map="HIRER_ADDR" readonly />
                         <input is="id-input" type="text" class="form-control w-px-80" name="hirerZip" data-map="HIRER_ZIP" readonly />
                     </div>
                     <!-- 상세주소 -->
                     <div class="col-md-12">
                         <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="hirerDtlAddr">상세주소</label>
-                        <input is="id-input" type="text" class="form-control w-78" name="hirerDtlAddr" data-map="HIRER_DTL_ADDR" readonly />
+                        <input is="id-input" type="text" class="form-control w-87" name="hirerDtlAddr" data-map="HIRER_DTL_ADDR" readonly />
                     </div>
-					<!-- 등록 일시 / 등록자 -->
-					<div class="col-md-6">
-					    <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="regDt">등록일시</label>
-					    <input is="id-input" type="text" class="form-control w-30" name="regDt" data-map="REG_DT" data-fmt-type="dt" readonly />
-					    <input is="id-input" type="text" class="form-control w-25" name="rgtrNm" data-map="RGTR_NM" readonly />
-					</div>
-					<!-- 수정 일시 / 수정자 -->
-					<div class="col-md-6">
-					    <label is="name-label" class="col-form-label bg-lighter pe-2 w-px-120 text-sm-end" for="mdfcnDt">수정일시</label>
-					    <input is="id-input" type="text" class="form-control w-30" name="mdfcnDt" data-map="MDFCN_DT" data-fmt-type="dt" readonly />
-					    <input is="id-input" type="text" class="form-control w-25" name="mdfrNm" data-map="MDFR_NM" readonly />
-					</div>
                 </div>
-            </div>
+            </div> <!-- 임대차계약 정보 -->
 		</form>
 		<!-- 입력 영역 -->
 
@@ -151,7 +211,7 @@
 <!-- / inner page html <div class="content-pop"> -->
 
 <script>
-    LoadScript("rent02020Script", wctx.url("/webjars/js/fims/rent/rent02020.js?ver=${ver}"));
+    LoadScript("rent02060Script", wctx.url("/webjars/js/fims/rent/rent02060.js?ver=${ver}"));
 
     /**************************************************************************
      * Global Variable
@@ -166,7 +226,7 @@
         let $P = pageObject["${pageName}"];
 
         // datasetControl
-        $P.ctrl = newRent02020Control("${pageName}", "[data-doctx=${pageName}]");
+        $P.ctrl = newRent02060Control("${pageName}", "[data-doctx=${pageName}]");
         // 파일 리스트
         $P.fileListArr = new Array();
         // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정)
@@ -177,7 +237,7 @@
          **************************************************************************/
         // URL 설정
         $P.setUrl = (prefixUrl) => {
-            $P.ctrl.urls.load = wctx.url(prefixUrl + "/020/list.do")            // 검색
+            $P.ctrl.urls.load = wctx.url(prefixUrl + "/060/list.do")            // 검색
         }
 
         // 첨부파일 조회
@@ -239,7 +299,6 @@
 
             // URL 설정
             $P.setUrl("${prefixUrl}");
-
         }
 
         /**************************************************************************
diff --git a/src/main/webapp/resources/js/fims/rent/rent02060.js b/src/main/webapp/resources/js/fims/rent/rent02060.js
index 77782c0d..19aeb3e8 100644
--- a/src/main/webapp/resources/js/fims/rent/rent02060.js
+++ b/src/main/webapp/resources/js/fims/rent/rent02060.js
@@ -21,9 +21,9 @@ function newRent02060Control(pageName, doctx="[data-doctx='rent02060']") {
         let formFields = new FimsFormFields(ctrl.selector("[name='frmEdit']"));
         formFields.set(ctrl, item);
 
-        let key = item.data.LSCT_MPNG_ID;
-        if (key != null) {
-            pageObject[pageName].fnSearchFileList(key);
+        let fileKey = item.data.LSCT_ID;
+        if (fileKey != null) {
+            pageObject[pageName].fnSearchFileList(fileKey);
         }
     };