From 59358d45752c6061f873ffe22654135f6cda614e Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Tue, 15 Oct 2024 10:37:03 +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=EA=B4=80=EB=A6=AC=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/rent02020-info.jsp     | 16 ++++++++--------
 .../WEB-INF/jsp/fims/rent/rent02050-main.jsp     |  8 +++++---
 .../WEB-INF/jsp/fims/rent/rent02060-info.jsp     | 14 +++-----------
 3 files changed, 16 insertions(+), 22 deletions(-)

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 1bdde37b..97c4f76b 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
@@ -50,21 +50,21 @@
 					    <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 />
+                        <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-25" 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="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 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>
             </div>
         </form>
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 f0aa4af8..1e509e7e 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
@@ -144,9 +144,10 @@
                                 <th class="cmn" style="width: 160px;">업무구분</th>
                                 <th class="cmn" style="width: 120px;">대상여부</th>
                                 <th class="cmn" style="width: 180px;" onclick="FimsSupport.searchFromGridTitle('CHG_DMND_DT', this.innerText, 'ymd', '');">요청일시</th>
+                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_DMND_RGTR', this.innerText, 'match', 'perfect');">요청자</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_APRV_YN', this.innerText, 'codeValue', 'CMN006');">승인여부</th>
                                 <th class="cmn" style="width: 180px;" onclick="FimsSupport.searchFromGridTitle('CHG_APRV_DT', this.innerText, 'ymd', '');">승인일시</th>
-                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_AUTZR', this.innerText, 'match', 'part');">승인자</th>
+                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_AUTZR', this.innerText, 'match', 'perfect');">승인자</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_APRV_RSN', this.innerText, 'match', 'part');">승인사유</th>
                                 <th class="cmn" style="width: 200px;" onclick="FimsSupport.searchFromGridTitle('ENT_NM', this.innerText, 'match', 'part');">기업명</th>
                                 <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('ENT_REG_NO', this.innerText, 'match', 'part');">법인(사업자)번호</th>
@@ -179,9 +180,10 @@
                                     <td class="cmn text-center" onclick ondblclick>{TASK_SE_NM}</td>
                                     <td class="cmn text-center fw-bold text-blue" onclick ondblclick>{TRGT_STTS_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CHG_DMND_DT}</td>
+                                    <td class="cmn text-center" onclick ondblclick>{CHG_DMND_RGTR_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CHG_APRV_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CHG_APRV_DT}</td>
-                                    <td class="cmn text-center" onclick ondblclick>{CHG_AUTZR}</td>
+                                    <td class="cmn text-center" onclick ondblclick>{CHG_AUTZR_NM}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{CHG_APRV_RSN}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{ENT_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{ENT_REG_NO}</td>
@@ -207,7 +209,7 @@
                             </template>
                             <template name="tmpltNotFound">
                                 <tr class="cmn">
-                                    <td valign="top" colspan="29" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+                                    <td valign="top" colspan="30" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
                                 </tr>
                             </template>
                         </table>
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 49d7dc40..8883fc51 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
@@ -35,21 +35,13 @@
                     <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 />
+                        <input is="id-input" type="text" class="form-control w-25" 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 />
+                        <input is="id-input" type="text" class="form-control w-25" name="chgAutzrNm" data-map="CHG_AUTZR_NM" readonly />
                     </div>
                     <!-- 변경 승인 사유 -->
                     <div class="col-md-12">
@@ -95,7 +87,7 @@
                     <!-- 기업 명 -->
                     <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 />
+                        <input is="id-input" type="text" class="form-control w-45" name="entNm" data-map="ENT_NM" readonly />
                     </div>
                     <!-- 기업 전화번호 -->
                     <div class="col-md-4">