From 75d320129c330a25312fc128ba06c0e4a1621f3c Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 14 Oct 2024 17:37:21 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EB=8C=80=EC=B0=A8=EA=B3=84=EC=95=BD?=
 =?UTF-8?q?=20=EB=A7=A4=ED=95=91=20=EC=83=81=EC=84=B8=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95.=20=20=20-=20=EB=8B=A8=EC=86=8D=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/rent/rent02010-main.jsp  |   4 +-
 .../WEB-INF/jsp/fims/rent/rent02020-info.jsp  | 124 ++++++++++++++----
 .../WEB-INF/jsp/fims/rent/rent02060-info.jsp  |   4 +-
 .../resources/js/fims/rent/rent02020.js       |   2 +-
 4 files changed, 106 insertions(+), 28 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 10746658..5eec1fc7 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
@@ -142,9 +142,9 @@
                                 <th class="cmn" style="width: 120px;" onclick="FimsSupport.searchFromGridTitle('RTPYR_SE_CD', this.innerText, 'codeValue', 'FIM011');">납부자구분</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('RTPYR_NO', this.innerText, 'ymd', '');">납부자번호</th>
                                 <th class="cmn" style="width: 200px;" onclick="FimsSupport.searchFromGridTitle('RTPYR_NM', this.innerText, 'match', 'part');">납부자명</th>
-                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('VLTN_ARTCL', this.innerText, 'match', 'part');">위반항목</th>
                                 <th class="cmn" style="width: 120px;" onclick="FimsSupport.searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">단속법정동</th>
                                 <th class="cmn" style="width: 280px;" onclick="FimsSupport.searchFromGridTitle('CRDN_PLC', this.innerText, 'match', 'part');">단속장소</th>
+                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('VLTN_ARTCL', this.innerText, 'match', 'part');">위반항목</th>
                                 <th class="cmn" style="width: 120px;" onclick="FimsSupport.searchFromGridTitle('FFNLG_CRDN_AMT', this.innerText, 'match', 'part');">단속원금</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CRDN_STTS_CD', this.innerText, 'codeValue', 'FIM010');">처리상태</th>
                                 <th class="cmn" style="width: 180px;">등록일시</th>
@@ -170,9 +170,9 @@
                                         <span>*************</span>
                                     </td>
                                     <td class="cmn text-start"  onclick ondblclick>{RTPYR_NM}</td>
-                                    <td class="cmn text-start"  onclick ondblclick>{VLTN_ARTCL}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CRDN_STDG_NM}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{CRDN_PLC}</td>
+                                    <td class="cmn text-start"  onclick ondblclick>{VLTN_ARTCL}</td>
                                     <td class="cmn text-end"    onclick ondblclick>{FFNLG_CRDN_AMT}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{CRDN_STTS_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{REG_DT}</td>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp
index bbe410f5..4896bb00 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp
@@ -21,28 +21,56 @@
 
                 <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="crdnDt">단속일시</label>
-					    <input is="id-input" type="text" class="form-control w-30" name="crdnDt" data-map="CRDN_DT" data-fmt-type="dt" readonly />
+					    <input is="id-input" type="text" class="form-control w-45" name="crdnDt" data-map="CRDN_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-4">
+                        <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-45" name="vltnArtcl" data-map="VLTN_ARTCL" 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="crdnStdgNm">법정동</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-45" name="crdnStdgNm" data-map="CRDN_STDG_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="crdnPlc">단속장소</label>
-                        <input is="id-input" type="text" class="form-control w-50" name="crdnPlc" data-map="CRDN_PLC" readonly />
+                        <input is="id-input" type="text" class="form-control w-60" name="crdnPlc" data-map="CRDN_PLC" 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="crdnSttsNm">단속상태</label>
+					    <input is="id-input" type="text" class="form-control w-45 fw-bold text-primary" name="crdnSttsNm" data-map="CRDN_STTS_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="rtpyrNm">납부자명</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="rtpyrNm" data-map="RTPYR_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="rtpyrSeNm">납부자 구분</label>
+					    <input is="id-input" type="text" class="form-control w-45" name="rtpyrSeNm" data-map="RTPYR_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="rtpyrNo">납부자번호</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="rtpyrNo" data-map="RTPYR_NO" readonly />
                     </div>
                 </div>
             </div>
 
+            <!-- 단속 이미지 -->
+            <jsp:include page="/WEB-INF/jsp/fims/photo-main.jsp" />
+
             <p></p>
 
             <!-- 임대차계약 정보 -->
@@ -60,34 +88,60 @@
 
                 <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-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-45" name="hirerTelno" data-map="HIRER_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="hirerMblTelno">휴대전화번호</label>
+                        <input is="id-input" type="text" class="form-control w-45" name="hirerMblTelno" data-map="HIRER_MBL_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="hirerEmlAddr">이메일</label>
+                        <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-80" name="hirerAddr" data-map="HIRER_ADDR" readonly />
+                        <input is="id-input" type="text" class="form-control w-px-75" 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-87" name="hirerDtlAddr" data-map="HIRER_DTL_ADDR" readonly />
                     </div>
 					<!-- 등록 일시 / 등록자 -->
 					<div class="col-md-6">
@@ -144,10 +198,13 @@
         // pageObject
         let $P = pageObject["${pageName}"];
 
+        $P.$findn("photoMainWrapper").addClass("w-px-1050 min-w-px-640");
+
         // datasetControl
         $P.ctrl = newRent02020Control("${pageName}", "[data-doctx=${pageName}]");
-        // 파일 리스트
-        $P.fileListArr = new Array();
+        // 단속 사진
+        $P.existFileArr = [];
+        $P.localUploadArr = [];
         // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정)
         $P.callPurpose = "${callPurpose}";
 
@@ -160,7 +217,7 @@
             $P.ctrl.urls.getInfo = wctx.url(prefixUrl + "/040/info.do");        // 임대차계약 상세 정보 조회
         }
 
-        // 첨부파일 조회
+        // 임대차계약 첨부 파일 조회
         $P.fnSearchFileList = (lsctId) => {
             let tableFileList = $P.findn("fileList");                           // table element 찾기
             let fileLength = tableFileList.rows.length;
@@ -259,6 +316,27 @@
 
         // 3. dataset 설정
         $P.ctrl.setData([${Info}]);
+
+        // 4. 사진영역 설정
+        settingPhotoMain("${pageName}"
+            , $P.findn("crdnId")
+            , function() {
+                return {
+                      vhrno: $P.$findn("vhrno").val()
+                    , vhclNm: $P.$findn("vhclNm").val()
+                    , vhclColr: $P.$findn("vhclColr").val()
+                };
+            }
+            , async function(vhrnoEl) {
+                return await $P.getVehicleTotalInfo(vhrnoEl);                   // 차적조회는 "단속정보 수정" 에서 해라...
+            }
+        );
+
+        // 5. 사진영역 초기화
+        let crdnInfo = $P.ctrl.getCurrent();
+        let existVideo = false;
+
+        initPhotoMain("${pageName}", crdnInfo.fileList, existVideo);
     });
 
 </script>
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 dc500f69..49d7dc40 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
@@ -174,8 +174,8 @@
                     <!-- 주소 --><!-- 우편번호 -->
                     <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-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 />
+                        <input is="id-input" type="text" class="form-control w-80" name="hirerAddr" data-map="HIRER_ADDR" readonly />
+                        <input is="id-input" type="text" class="form-control w-px-75" name="hirerZip" data-map="HIRER_ZIP" readonly />
                     </div>
                     <!-- 상세주소 -->
                     <div class="col-md-12">
diff --git a/src/main/webapp/resources/js/fims/rent/rent02020.js b/src/main/webapp/resources/js/fims/rent/rent02020.js
index 57948043..a0fb74ad 100644
--- a/src/main/webapp/resources/js/fims/rent/rent02020.js
+++ b/src/main/webapp/resources/js/fims/rent/rent02020.js
@@ -42,7 +42,7 @@ function newRent02020Control(pageName, doctx="[data-doctx='rent02020']") {
 
                 dialog.open({
                       id: dialogId
-                    , title: ctrl.prefixName + " 정보"
+                    , title: "임대차계약 상세 정보"
                     , size: ctrl.infoSize
                     , content: resp
                     , init: () => {