From 38a2c87129d81105dbbfb9d1b8ebe44ace02a523 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 27 Nov 2024 10:47:43 +0900 Subject: [PATCH 1/4] Merge branch 'tolag3' --- src/main/java/seed/utils/FairnetUtils.java | 12 ++++++++++++ .../jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 4d02dfc3..85520004 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -188,4 +188,16 @@ public class FairnetUtils { return innorixFileListInfoStr; } + + public void sessionSet( + HttpServletRequest reqeust + , String certNm + , String certNo + ) { + HttpSession session = reqeust.getSession(); + session.setAttribute("certNm", certNm); + session.setAttribute("certNo", certNo); + + + } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp index 95493b98..16e8c1a9 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp @@ -79,8 +79,10 @@ function jstreeInit() { } }, "plugins" : [ - "contextmenu", "dnd", "search", - "types" + "contextmenu" +// , "dnd" + , "search" + , "types" ] }) .bind('loaded.jstree', function(e, data) { @@ -296,7 +298,8 @@ function jstreeInit() { } else { data.instance.refresh(); } - }) ; + }) + ; } From c4e08f46e3267e819a6e61ea0deb1a90d1685f59 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 27 Nov 2024 10:49:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=B6=84=EC=9F=81=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=20=EC=82=AC=EA=B1=B4=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=8A=B9=EC=9D=B8=20=EC=9A=94=EC=B2=AD=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20html=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 68e56de2..428a8286 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -8756,6 +8756,41 @@ function nanumProcessStartTmp(){ +

사건권한 승인요청

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
순번이름전화번호진행상태상태변경
1사용자1010-0000-0000승인완료
2사용자2010-1111-1111승인요청
+
+
+
From 8b617db9cee49568de79cc4d51f3f6de49e84c4d Mon Sep 17 00:00:00 2001 From: subsub Date: Wed, 27 Nov 2024 10:50:20 +0900 Subject: [PATCH 3/4] =?UTF-8?q?24/11/27=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seed/_extra/gtm/trublend/trublendView.jsp | 168 +++++++++--------- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 90 +++++----- .../_extra/gtm/trublreqstmng/administView.jsp | 24 +-- .../kofair_case_seed/adm/style/index.css | 3 +- .../kofair_case_seed/adm/style/style.css | 1 + 5 files changed, 144 insertions(+), 142 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendView.jsp index b8a5175e..e4cea65d 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendView.jsp @@ -1306,7 +1306,7 @@ function smsAutoPopOpen(caseNo, e) {

경제적 성과

- ＊신청금액 : + 신청금액 : / 조정금액 : @@ -1345,11 +1345,11 @@ function smsAutoPopOpen(caseNo, e) {

합의서 및
종료요청서

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1359,11 +1359,11 @@ function smsAutoPopOpen(caseNo, e) {

취하서

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1373,11 +1373,11 @@ function smsAutoPopOpen(caseNo, e) {

조정조서

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1387,11 +1387,11 @@ function smsAutoPopOpen(caseNo, e) {

동기이력조회

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1401,11 +1401,11 @@ function smsAutoPopOpen(caseNo, e) {

기타

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1450,11 +1450,11 @@ function smsAutoPopOpen(caseNo, e) {

신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1464,11 +1464,11 @@ function smsAutoPopOpen(caseNo, e) {

조사관 사건문서첨부(신청인)

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1478,11 +1478,11 @@ function smsAutoPopOpen(caseNo, e) {

피신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1492,11 +1492,11 @@ function smsAutoPopOpen(caseNo, e) {

조사관 사건문서첨부
(피신청인)

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1512,11 +1512,11 @@ function smsAutoPopOpen(caseNo, e) {

접수사실 통지 및 신청서 보완요구

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1526,11 +1526,11 @@ function smsAutoPopOpen(caseNo, e) {

사실관계의 확인을 위한 출석요구

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1540,11 +1540,11 @@ function smsAutoPopOpen(caseNo, e) {

조정안에 대한 수락여부 조회

-
+ --%>
-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 + @@ -1613,11 +1613,11 @@ function smsAutoPopOpen(caseNo, e) {

조정안 수락 통지서

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1627,11 +1627,11 @@ function smsAutoPopOpen(caseNo, e) {

조정안 불수락 통지서

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1690,11 +1690,11 @@ function smsAutoPopOpen(caseNo, e) { 계약서 사본 -
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1832,7 +1832,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊상호

+

상호

@@ -1842,7 +1842,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊대표자

+

대표자

@@ -1852,7 +1852,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊개인/법인

+

개인/법인

@@ -1862,7 +1862,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊우편번호

+

우편번호

@@ -1870,7 +1870,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -1881,7 +1881,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -1892,7 +1892,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊대표 전화번호(휴대폰)

+

대표 전화번호(휴대폰)

@@ -1912,7 +1912,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊사업자등록번호('-')제외

+

사업자등록번호('-')제외

@@ -2051,7 +2051,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -2059,7 +2059,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -2245,7 +2245,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊상호

+

상호

@@ -2255,7 +2255,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊담당변호사

+

담당변호사

@@ -2265,7 +2265,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊우편번호

+

우편번호

@@ -2275,7 +2275,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -2286,7 +2286,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -2297,7 +2297,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊휴대폰번호

+

휴대폰번호

@@ -2317,7 +2317,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊이메일

+

이메일

@@ -2348,7 +2348,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊상호

+

상호

@@ -2358,7 +2358,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊대표자

+

대표자

@@ -2368,7 +2368,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊개인/법인

+

개인/법인

@@ -2378,7 +2378,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊우편번호

+

우편번호

@@ -2386,7 +2386,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -2397,7 +2397,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -2408,7 +2408,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊대표 전화번호(휴대폰)

+

대표 전화번호(휴대폰)

@@ -2428,7 +2428,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊사업자등록번호('-')제외

+

사업자등록번호('-')제외

@@ -2567,7 +2567,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -2575,7 +2575,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -2762,7 +2762,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊상호

+

상호

@@ -2772,7 +2772,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊담당변호사

+

담당변호사

@@ -2782,7 +2782,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊우편번호

+

우편번호

@@ -2792,7 +2792,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊지번주소

+

지번주소

@@ -2803,7 +2803,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊도로명주소

+

도로명주소

@@ -2814,7 +2814,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊휴대폰번호

+

휴대폰번호

@@ -2834,7 +2834,7 @@ function smsAutoPopOpen(caseNo, e) {
-

＊이메일

+

이메일

diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 68e56de2..f5096dd3 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -5313,9 +5313,9 @@ function nanumProcessStartTmp(){ @@ -5393,14 +5393,14 @@ function nanumProcessStartTmp(){ - - + [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + + + + +
+ +
@@ -5514,13 +5514,13 @@ function nanumProcessStartTmp(){

접수사실 통지 및 신청서 보완요구

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5544,13 +5544,13 @@ function nanumProcessStartTmp(){

피신청인 자료제출 요구

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5574,13 +5574,13 @@ function nanumProcessStartTmp(){

사실관계의 확인을 위한 출석요구

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5602,13 +5602,13 @@ function nanumProcessStartTmp(){

조정안에 대한 수락여부 조회

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5630,13 +5630,13 @@ function nanumProcessStartTmp(){

조정절차 종료사실 통지

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5668,13 +5668,13 @@ function nanumProcessStartTmp(){

신청인 조정안 수락 여부 제출

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + @@ -5688,13 +5688,13 @@ function nanumProcessStartTmp(){

피신청인 조정안 수락 여부 제출

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) - 삭제 - + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp index 436fcc13..0ea2a727 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp @@ -1293,11 +1293,11 @@ function showConsignmentGubun(){

신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1307,11 +1307,11 @@ function showConsignmentGubun(){

조사관 사건문서첨부(신청인)

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1321,11 +1321,11 @@ function showConsignmentGubun(){

피신청인 사건문서첨부

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + @@ -1335,11 +1335,11 @@ function showConsignmentGubun(){

조사관 사건문서첨부
(피신청인)

-
+
-
- gif  [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) + diff --git a/src/main/webapp/kofair_case_seed/adm/style/index.css b/src/main/webapp/kofair_case_seed/adm/style/index.css index ac1e6cf4..0ded5873 100644 --- a/src/main/webapp/kofair_case_seed/adm/style/index.css +++ b/src/main/webapp/kofair_case_seed/adm/style/index.css @@ -1,7 +1,8 @@ @charset "utf-8"; -.wrap.main{min-height:100vh;} +/* .wrap.main{min-height:100vh;} */ +.main .contents{padding:0;width:100%;} .main .box_wrap{display:flex;flex-wrap:wrap;gap:40px;} .main .box{border:5px solid #f4f5fb;border-radius:10px;;} .main .width3{width:calc((100% / 3) - 27px);} 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 3bb09708..2f929e35 100644 --- a/src/main/webapp/kofair_case_seed/adm/style/style.css +++ b/src/main/webapp/kofair_case_seed/adm/style/style.css @@ -155,6 +155,7 @@ form h3,.title.depth02{font-size:20px;font-weight:bold;} .cs_file_list{display:inline-flex;width:calc(100% - 150px);flex-direction:column;gap:8px;} .file_row{display:flex;padding:10px 20px;align-items:center;flex-wrap:wrap;gap:5px;background:#f4f5f6;border-radius:5px;} +.file_row img+a{max-width:calc(100% - 50px);width:auto;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;} .file_row .btn_file_del{width:18px;height:18px;background:#e40000;border-radius:5px;margin:2px 0 0 0;} .file_row .btn_file_del i{display:inline-block;width:100%;height:100%;background:url(/kofair_case_seed/adm/images/component/icon_popup_close_white.png) no-repeat center center;background-size:8px auto;} From ae505cd67c08fecfe8fe447dc32ebef2fd1a296a Mon Sep 17 00:00:00 2001 From: subsub Date: Wed, 27 Nov 2024 11:03:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?24/11/27=20=EC=82=AC=EA=B1=B4=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=8A=B9=EC=9D=B8=EC=9A=94=EC=B2=AD=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 6dac8bff..62a8b427 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -8760,8 +8760,15 @@ function nanumProcessStartTmp(){
-
+
+ + + + + + + @@ -8776,15 +8783,15 @@ function nanumProcessStartTmp(){ - - + + - - + +
순번1 사용자1 010-0000-0000승인완료승인완료
2 사용자2 010-1111-1111승인요청승인요청