From 32f16303249832e905a61946cc79ba58bfab9483 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Thu, 17 Oct 2024 17:12:07 +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/rent02010-main.jsp  |  1 -
 .../WEB-INF/jsp/fims/rent/rent02050-main.jsp  | 52 ++++++++++++-------
 2 files changed, 32 insertions(+), 21 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 5eec1fc7..6b70838d 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
@@ -393,7 +393,6 @@
 
             if (tabName == "계약서등록") {
                 $P.ctrl.query.chgDmndYn = "N";                                      // 변경 요청 여부 N
-                $P.ctrl.query.chgAprvYn = "N";                                      // 변경 승인 여부 N
             }
 
             $P.ctrl.query.trgtSttsNm = tabName;
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 1e509e7e..1bccc949 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
@@ -101,12 +101,6 @@
                             전체
                         </button>
                     </li>
-                    <li class="nav-item">
-                        <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem1"
-                                onClick="pageObject['${pageName}'].fnSearchList('미대상');">
-                            미대상
-                        </button>
-                    </li>
                     <li class="nav-item">
                         <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem2"
                                 onClick="pageObject['${pageName}'].fnSearchList('대상');">
@@ -115,14 +109,26 @@
                     </li>
                     <li class="nav-item">
                         <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem3"
-                                onClick="pageObject['${pageName}'].fnSearchList('승인요청');">
-                            승인요청
+                                onClick="pageObject['${pageName}'].fnSearchList('요청중');">
+                            요청중
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem4"
+                                onClick="pageObject['${pageName}'].fnSearchList('승인');">
+                            승인
                         </button>
                     </li>
                     <li class="nav-item">
                         <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem4"
-                                onClick="pageObject['${pageName}'].fnSearchList('승인완료');">
-                            승인완료
+                                onClick="pageObject['${pageName}'].fnSearchList('미승인');">
+                            미승인
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button type="button" class="nav-link w-px-160 h-100" role="tab" data-bs-toggle="tab" name="tabItem1"
+                                onClick="pageObject['${pageName}'].fnSearchList('기타');">
+                            기타
                         </button>
                     </li>
                 </ul>
@@ -145,9 +151,9 @@
                                 <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: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_APRV_STTS', this.innerText, 'codeValue', 'CMN010');">승인상태</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', 'perfect');">승인자</th>
+                                <th class="cmn" style="width: 160px;" onclick="FimsSupport.searchFromGridTitle('CHG_AUTZR_NM', 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>
@@ -181,7 +187,7 @@
                                     <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_STTS_NM}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CHG_APRV_DT}</td>
                                     <td class="cmn text-center" onclick ondblclick>{CHG_AUTZR_NM}</td>
                                     <td class="cmn text-start"  onclick ondblclick>{CHG_APRV_RSN}</td>
@@ -309,7 +315,7 @@
             if (tabName == "대상") {
                 $P.$findn("btnCreate").prop("disabled", false);
                 $P.$findn("btnRemove").prop("disabled", true);
-            } else if (tabName == "승인요청") {
+            } else if (tabName == "승인") {
                 $P.$findn("btnCreate").prop("disabled", true);
                 $P.$findn("btnRemove").prop("disabled", false);
             } else {
@@ -381,12 +387,18 @@
             $P.ctrl.query.fetchSize = DEFAULT_FETCH_SIZE;                           // 한번에 조회되는 자료 건수
             $P.ctrl.query.delYn = "N";                                              // 삭제 여부
 
-            if (tabName == "승인요청") {
-                $P.ctrl.query.chgDmndYn = "Y";                                      // 변경 요청 여부 Y
-                $P.ctrl.query.chgAprvYn = "N";                                      // 변경 승인 여부 N
-            } else if (tabName == "승인완료") {
-                $P.ctrl.query.chgDmndYn = "Y";                                      // 변경 요청 여부 Y
-                $P.ctrl.query.chgAprvYn = "Y";                                      // 변경 승인 여부 Y
+            if (tabName == "대상") {
+                $P.ctrl.query.chgDmndYn     = "N";                              // 변경 요청 여부
+                $P.ctrl.query.nxrpCrdnLinkYn= "N";                              // 세외수입 단속 연계 여부
+            } else if (tabName == "요청중") {
+                $P.ctrl.query.chgDmndYn     = "Y";                              // 변경 요청 여부
+                $P.ctrl.query.chgAprvStts   = "RQ";                             // 변경 승인 상태
+            } else if (tabName == "승인") {
+                $P.ctrl.query.chgDmndYn     = "Y";                              // 변경 요청 여부
+                $P.ctrl.query.chgAprvStts   = "AP";                             // 변경 승인 상태
+            } else if (tabName == "미승인") {
+                $P.ctrl.query.chgDmndYn     = "Y";                              // 변경 요청 여부
+                $P.ctrl.query.chgAprvStts   = "UA";                             // 변경 승인 상태
             }
 
             $P.ctrl.query.trgtSttsNm = tabName;