From ef1664a1d68732efdd5c59ee4306ffe1da07fc12 Mon Sep 17 00:00:00 2001 From: subsub Date: Fri, 3 Jan 2025 12:00:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2025/01/03=20=EB=8C=93=EA=B8=80=20=EA=B0=84?= =?UTF-8?q?=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kofair_case_seed/adm/style/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/kofair_case_seed/adm/style/style.css b/src/main/webapp/kofair_case_seed/adm/style/style.css index 34250f56..6240c642 100644 --- a/src/main/webapp/kofair_case_seed/adm/style/style.css +++ b/src/main/webapp/kofair_case_seed/adm/style/style.css @@ -186,6 +186,7 @@ form h3,.title.depth02{font-size:20px;font-weight:bold;} .wrap .file_wrap .file_name img{display:inline-block;vertical-align:middle;} .cs_file_list{display:inline-flex;width:calc(100% - 150px);flex-direction:column;gap:8px;} +.cs_file_list.row{flex-direction:row;} .file_row{display:flex !important;padding:10px 20px;align-items:center;flex-wrap:wrap;gap:5px;background:#f4f5f6;border-radius:5px;} .file_row a{display:flex;align-items:center;gap:8px;} .file_row.background_none{background:none;padding:0;} @@ -196,7 +197,7 @@ form h3,.title.depth02{font-size:20px;font-weight:bold;} .cs_file_box{display:flex !important;width:100%;padding:15px 20px;margin:12px 0 0 0 !important;border:2px solid #e5e5e5;border-radius:5px;justify-content:space-between;align-items:center;} .file_table tr td,.wrap .table-layout .file_table td{border-bottom:0} -.file_table .file_row{display:block;background:transparent;white-space:nowrap;} +.file_table .file_row{display:block !important;background:transparent;white-space:nowrap;} .file_table .file_row img{display:inline-block;vertical-align:middle;margin:0 4px 0 0;} .wrap .col-table.data-table .file_table .fileView{display:flex;height:auto;flex-wrap:wrap;gap:6px;} @@ -241,8 +242,8 @@ div.webnote_toolbar_container{display:flex;} .cmmt_tit span{color: #163db1; font-weight: bold; font-size: 20px;} .cmmt_list{width: 100%; border-top: 1px solid #d5d5d5; margin-top: 10px;} .cmmt_list li{display: flex; border-bottom: 1px solid #d5d5d5; padding: 24px 0;} -.cmmt_person{min-width: 70px; position: relative; font-size: 18px; font-weight: 500; margin-right: 10px; padding-left: 20px;} -.cmmt_person::before{position: absolute; content: " "; width: 1px; height: 15px; background-color: #d5d5d5; right: 0; top: 4px;} +.cmmt_person{min-width: 70px; position: relative; font-size: 18px; font-weight: 500; margin-right: 10px; padding:0 20px;} +.cmmt_person::before{position: absolute; content: " "; width: 1px; height: 15px; background-color: #d5d5d5; right: 0; top: 6px;} .cmmt_detail{font-size: 18px; font-weight: 400; line-height: 1.3; letter-spacing: -0.5px; color: #222; padding-left: 20px;} .cmmt_date{display: inline-block; margin-top: 20px; font-weight: 400; font-size: 16px; color: #999;} .cmmt_detail .btn_wrap{float: right; margin-top: 15px;} From 0a9bff4b7331ed7f05e7b930784bc1bfe7d532b2 Mon Sep 17 00:00:00 2001 From: subsub Date: Fri, 3 Jan 2025 12:51:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?2025/01/03=20=EB=B6=84=EC=9F=81=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=20=ED=98=91=EC=9D=98=ED=9A=8C=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?>=20=EA=B2=B0=EA=B3=BC=EB=B3=B4=EA=B3=A0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_extra/gtm/trublcfrncmng/endNticeEdit.jsp | 2 +- .../_extra/gtm/trublcfrncmng/reportEdit.jsp | 163 ++++++++++-------- 2 files changed, 90 insertions(+), 75 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp index 1550a029..82bc0db8 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp @@ -2278,7 +2278,7 @@ function nanumCallTest(no, nanumSubject, officeGubun, officeDept){ - 합계 : + 합계 : 0 diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp index 1019dde6..69f3156d 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp @@ -8,7 +8,7 @@ $(document).ready(function(){ //jQuery DatePicker Option var dateOption = { showOn: "button", - buttonImage: "/img/icon_calendar.gif", + buttonImage: "/kofair_case_seed/adm/images/component/icon_calendar.png", buttonImageOnly: true, dateFormat: 'yy-mm-dd', showMonthAfterYear:true, @@ -3540,64 +3540,75 @@ function nanumHisDel(){ -
+ +

분쟁조정 협의회 관리

+ +
-

분쟁조정 협의회 관리

- 목록 + -
- - - - - - + + + + + + + + + +
+
+ - -
+ + 목록 +
+
-
+
- - - - - + + + + + + + + +
+ +
+ - -
+ + 목록 +
+
-

표기는 필수 입력사항

- + +
+

표기는 필수 입력사항

+
-
+
-

회의명

+

회의명

@@ -3606,7 +3617,7 @@ function nanumHisDel(){
-

조정유형

+

조정유형

@@ -3619,7 +3630,7 @@ function nanumHisDel(){
-

회의구분

+

회의구분

@@ -3641,7 +3652,7 @@ function nanumHisDel(){
-

개최일시

+

개최일시

@@ -3653,7 +3664,7 @@ function nanumHisDel(){
-

회의장소

+

회의장소

@@ -3661,8 +3672,8 @@ function nanumHisDel(){
-
-

서명활성여부

+
+

서명활성여부

   @@ -3673,7 +3684,7 @@ function nanumHisDel(){ -
+
@@ -3703,7 +3714,7 @@ function nanumHisDel(){
-
+
@@ -3734,7 +3745,7 @@ function nanumHisDel(){
-
+
@@ -3765,7 +3776,7 @@ function nanumHisDel(){
-
+
@@ -3789,7 +3800,7 @@ function nanumHisDel(){ @@ -3808,17 +3819,17 @@ function nanumHisDel(){ } -

회의내용 및 기타

+

회의내용 및 기타

-

회의내용(2000자)

+

회의내용(2000자)

-

특이사항(2000자)

+

특이사항(2000자)

@@ -3898,15 +3909,15 @@ function nanumHisDel(){ } -

경비정산

-
+

경비정산

+

경비의 사용내역 및 사용액수를 입력하세요.

-
- - +
+ +
-
+
- +
@@ -3916,18 +3927,18 @@ function nanumHisDel(){ - - + + - +
합계 : 합계 : 0
-

회의록 및 기타문서

+

회의록 및 기타문서

전차회의록

@@ -4038,7 +4049,7 @@ function nanumHisDel(){
- +
@@ -4047,7 +4058,7 @@ function nanumHisDel(){
- +
@@ -4056,19 +4067,23 @@ function nanumHisDel(){
- +
-
- - - - - - +
+
+ + + +
+
+ + + +