From 1e805504ca3865c242e364709c9ff1efec5296a7 Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Thu, 15 Dec 2022 16:15:54 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=99=94=EB=A9=B4=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/mng/code/mngCodeCfnMgtForm.jsp        | 11 ++++-
 .../biz/mng/code/mngCodeDtlMgtForm.jsp        | 40 +++++++++++++++++-
 .../biz/mng/code/mngCodeDtlMgtPopup.jsp       | 42 +++++++++++++++----
 .../biz/mng/code/mngCodeGrpMgtForm.jsp        | 17 +++++---
 4 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp
index bb0a9ef1..dcccf893 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp
@@ -131,9 +131,16 @@
 			{
 				header: '분류코드명',
 				name: 'clCodeNm',
-				minWidth: 400,
+				minWidth: 150,
 				sortable: false,
-				align: 'center'
+				//align: 'center'
+			},
+			{
+				header: '분류코드설명',
+				name: 'clCodeNm',
+				minWidth: 200,
+				sortable: false,
+				//align: 'center'
 			},
 			{
 				header: '사용여부',
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp
index 0a28f53a..f113eca2 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp
@@ -153,23 +153,58 @@
 			{
 				header: '공통코드',
 				name: 'code',
-				width: 100,
+				width: 70,
 				sortable: false,
 				align: 'center'
 			},
 			{
 				header: '공통코드명',
 				name: 'codeNm',
+				minWidth: 100,
+				sortable: false,
+				//align: 'center'
+			},
+			{
+				header: '코드설명',
+				name: 'codeDc',
 				minWidth: 150,
 				sortable: false,
 				//align: 'center'
 			},
+			{
+				header: '정렬순서',
+				name: 'ordr',
+				minWidth: 60,
+				sortable: false,
+				align: 'right'
+			},
 			{
 				header: '사용여부',
 				name: 'useAt',
 				width: 60,
 				sortable: false,
 				align: 'center'
+			},
+			{
+				header: '확장1',
+				name: 'etc1',
+				minWidth: 70,
+				sortable: false,
+				align: 'center'
+			},
+			{
+				header: '확장2',
+				name: 'etc2',
+				minWidth: 70,
+				sortable: false,
+				align: 'center'
+			},
+			{
+				header: '확장3',
+				name: 'etc3',
+				minWidth: 70,
+				sortable: false,
+				align: 'center'
 			}
 		];
 		const gridDatasource = {
@@ -186,6 +221,9 @@
 			el: 'grid',
 			rowHeaders: ['rowNum'],
 			columns: gridColumns,
+			columnOptions: {
+				frozenCount: 5
+			}
 		};
 		GRID = TuiGrid.of(gridOptions, gridDatasource, (res) => {
 		});
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp
index 456fb2db..17a985e1 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp
@@ -27,7 +27,7 @@
                             <label for="codeId">코드그룹</label>
                         </th>
 
-                        <td nowrap colspan="3">
+                        <td nowrap>
                             <c:if test="${!isUpdate}">
                             <select style="width: 40%"  name="clCode" id="clCode" class="select" title="분류코드">
                                 <c:forEach var="result" items="${cfnCodeList}" varStatus="status">
@@ -43,13 +43,10 @@
                             <input type="hidden" id="codeId" name="codeId" value="${cmmnDetailCode.codeId}">
                             </c:if>
                         </td>
-
-                    </tr>
-                    <tr>
                         <th class="required" scope="row" nowrap>
                             <label for="code">코드</label>
                         </th>
-                        <td nowrap colspan="3">
+                        <td nowrap>
                             <form:input path="code" size="15" maxlength="15" readonly="${isUpdate}"/>
                             <form:errors path="code"/>
                         </td>
@@ -58,21 +55,51 @@
                         <th class="required" scope="row" nowrap>
                             <label for="codeNm">코드명</label>
                         </th>
-                        <td nowrap="nowrap" colspan="3">
+                        <td nowrap="nowrap">
                             <form:input path="codeNm" size="60" maxlength="60"/>
                             <form:errors path="codeNm"/>
                         </td>
+                        <th class="required" scope="row" nowrap>
+                            <label for="ordr">정렬순서</label>
+                        </th>
+                        <td nowrap="nowrap">
+                            <form:input path="ordr" size="2" maxlength="2" />
+                            <form:errors path="ordr"/>
+                        </td>
                     </tr>
                     <tr>
                         <th class="required" scope="row" nowrap>
                             <label for="useAt">사용여부</label>
                         </th>
-                        <td nowrap class="title_left" colspan="3">
+                        <td nowrap class="title_left">
                             <form:select path="useAt">
                                 <form:option value="Y" label="사용"/>
                                 <form:option value="N" label="미사용"/>
                             </form:select>
                         </td>
+                        <th scope="row" nowrap>
+                            <label for="etc1">확장1</label>
+                        </th>
+                        <td nowrap="nowrap">
+                            <form:input path="etc1" size="15" maxlength="15"/>
+                            <form:errors path="etc1"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th scope="row" nowrap>
+                            <label for="etc2">확장2</label>
+                        </th>
+                        <td nowrap="nowrap">
+                            <form:input path="etc2" size="15" maxlength="15"/>
+                            <form:errors path="etc2"/>
+                        </td>
+                        <th scope="row" nowrap>
+                            <label for="etc3">확장3</label>
+                        </th>
+                        <td nowrap="nowrap">
+                            <form:input path="etc3" size="15" maxlength="15"/>
+                            <form:errors path="etc3"/>
+                        </td>
                     </tr>
                     <tr>
                         <th class="required" scope="row">
@@ -83,6 +110,7 @@
                             <form:errors path="codeDc"/>
                         </td>
                     </tr>
+
                 </tbody>
             </table>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp
index ceaa0227..4417fb68 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp
@@ -118,7 +118,7 @@
 			{
 				header: '분류명',
 				name: 'clCodeNm',
-				minWidth: 200,
+				minWidth: 100,
 				//width: 200,
 				sortable: true,
 				sortingType: 'desc',
@@ -141,21 +141,28 @@
 			{
 				header: '그룹코드',
 				name: 'codeId',
-				width: 100,
+				minWidth: 100,
 				sortable: false,
 				align: 'center'
 			},
 			{
 				header: '그룹코드명',
 				name: 'codeIdNm',
-				width: 100,
+				minWidth: 150,
 				sortable: false,
-				align: 'center'
+				//align: 'center'
+			},
+			{
+				header: '코드설명',
+				name: 'codeIdDc',
+				minWidth: 200,
+				sortable: false,
+				//align: 'center'
 			},
 			{
 				header: '사용여부',
 				name: 'useAt',
-				width: 60,
+				minWidth: 60,
 				sortable: false,
 				align: 'center'
 			}