From 1a7062c69de24ab444ed3c5c7d49d69dbfd1e62d Mon Sep 17 00:00:00 2001 From: JIWOO Date: Thu, 27 Mar 2025 12:15:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=EA=B2=B0=EA=B3=BC=20=EB=82=B4=20'=EA=B8=B0=ED=83=80'?= =?UTF-8?q?=EC=9D=BC=20=EC=8B=9C=20=EA=B8=B0=ED=83=80=20=EC=82=AC=EC=9C=A0?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trublcfrncmng/trublcfrncmng_sql.xml | 12 ++++++ .../config/mappers/trublend/trublend_sql.xml | 1 + .../trublprocessmng/trublprocessmng_sql.xml | 7 ++++ .../_extra/gtm/trublcfrncmng/endNticeEdit.jsp | 19 ++++++++- .../_extra/gtm/trublcfrncmng/endNticeView.jsp | 20 ++++++++- .../_extra/gtm/trublcfrncmng/redyEdit.jsp | 42 ++++++++++++++++++- .../_extra/gtm/trublcfrncmng/redyView.jsp | 20 ++++++++- .../_extra/gtm/trublcfrncmng/redyWrite.jsp | 20 ++++++++- .../_extra/gtm/trublcfrncmng/redyWritePop.jsp | 21 +++++++++- .../_extra/gtm/trublcfrncmng/reportEdit.jsp | 27 ++++++++++-- .../_extra/gtm/trublcfrncmng/reportView.jsp | 20 ++++++++- .../seed/_extra/gtm/trublend/trublendView.jsp | 20 ++++++++- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 32 ++++++++++++++ 13 files changed, 248 insertions(+), 13 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index b97325a1..ea7325a2 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -297,6 +297,8 @@ NVL((SELECT RESPONDENT_COMPANY FROM C_CASERESPONDENT C WHERE C.CASE_NO = A.CASE_NO AND ROWNUM = 1), '-') AS RESPONDENT_COMPANY, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '-') AS MEDIATION_BIG, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL, + MEDIATION_SMALL AS MEDIATION_SMALL_CODE, + MEDIATION_ETC_DETAIL, TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE, (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER, DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '성립', 1, '불성립', 2, '중지', 3, '심의', 1) AS BIG_ORDER @@ -528,6 +530,12 @@ UPDATE C_MASTER SET MEDIATION_BIG = #{mediationBig} , MEDIATION_SMALL = #{mediationSmall} + + ,MEDIATION_ETC_DETAIL = #{mediationETCDetail} + + + ,MEDIATION_ETC_DETAIL = NULL + WHERE CASE_NO = #{caseNo} @@ -1002,6 +1010,7 @@ NVL(MEDIATION_BIG, '-') AS MEDIATION_BIG_CODE, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL, NVL(MEDIATION_SMALL, '-') AS MEDIATION_SMALL_CODE, + MEDIATION_ETC_DETAIL, TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE, (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER FROM C_MASTER A @@ -1035,6 +1044,7 @@ NVL(B.MEDIATION_BIG, '-') AS MEDIATION_BIG_CODE, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = B.MEDIATION_SMALL), '-') AS MEDIATION_SMALL, NVL(B.MEDIATION_SMALL, '-') AS MEDIATION_SMALL_CODE, + MEDIATION_ETC_DETAIL, TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE, (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER, MOD_RESOLUTION @@ -1403,6 +1413,8 @@ NVL((SELECT RESPONDENT_COMPANY FROM C_CASERESPONDENT C WHERE C.CASE_NO = A.CASE_NO AND ROWNUM = 1), '-') AS RESPONDENT_COMPANY, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '-') AS MEDIATION_BIG, NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL, + MEDIATION_SMALL AS MEDIATION_SMALL_CODE, + MEDIATION_ETC_DETAIL, TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE, (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER, DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '성립', 1, '불성립', 2, '중지', 3, '심의', 1) AS BIG_ORDER, diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml index b3416e80..104b4289 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml @@ -413,6 +413,7 @@ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CM.MEDIATION_BIG) AS MEDIATION_BIG_NAME, CM.MEDIATION_SMALL, (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CM.MEDIATION_SMALL) AS MEDIATION_SMALL_NAME, + CM.MEDIATION_ETC_DETAIL, CM.AGREEMENT_FILE, CM.WITHDRAWAL_FILE, CM.CON_PROTOCOL_FILE, diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index 0e5f8e21..4bfc719b 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml @@ -1755,6 +1755,7 @@ CM.PENDENCY_PERIOD, CM.MEDIATION_BIG, CM.MEDIATION_SMALL, + CM.MEDIATION_ETC_DETAIL, CM.AGREEMENT_FILE, CM.WITHDRAWAL_FILE, CM.CON_PROTOCOL_FILE, @@ -3082,6 +3083,12 @@ SET MEDIATION_BIG = #{mediationBig, jdbcType=VARCHAR}, MEDIATION_SMALL = #{mediationSmall, jdbcType=VARCHAR}, + + MEDIATION_ETC_DETAIL = #{mediationETCDetail, jdbcType=VARCHAR}, + + + MEDIATION_ETC_DETAIL = NULL, + MEDIATION_REQ_AMOUNT = #{mediationReqAmount, jdbcType=INTEGER}, MEDIATION_AMOUNT = #{mediationAmount, jdbcType=INTEGER}, RESPONDENT_AMOUNT = #{respondentAmount, jdbcType=INTEGER}, 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 55735e6a..5eb61e46 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 @@ -183,6 +183,23 @@ function loadBogoData(){ var list = new Array(); if(r.data.length != 0){ $.each(r.data, function(k,v) { + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } cnt++; html += ''; @@ -202,7 +219,7 @@ function loadBogoData(){ } html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; html += ''; list.push(v.caseNo); diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp index 6450ff12..d47c382b 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp @@ -172,6 +172,24 @@ function loadBogoData(){ var list = new Array(); if(r.data.length != 0){ $.each(r.data, function(k,v) { + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + cnt++; html += ''; html += ''+(Number(k)+1)+''; @@ -190,7 +208,7 @@ function loadBogoData(){ } html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; html += ''; list.push(v.caseNo); diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp index c3b67ec2..fea1273f 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp @@ -236,6 +236,25 @@ function loadBogoData(){ var list = new Array(); if(r.data.length != 0){ $.each(r.data, function(k,v) { + + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + cnt++; html += ''; html += ''; @@ -255,7 +274,7 @@ function loadBogoData(){ } html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; html += ''; list.push(v.caseNo); @@ -696,6 +715,25 @@ function setData(parentId){ lists += coms + v.memberNo; idxs ++; }else{ + + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + //심의안건, 보고안건, 조정조서 html += ''; html += ''+cnt+''; @@ -717,7 +755,7 @@ function setData(parentId){ html += ''+v.respondentCeo+''; */ html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; if(parentId == 'sim') { diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp index 06fa5970..0ff51f49 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp @@ -197,6 +197,24 @@ function loadBogoData(){ var list = new Array(); if(r.data.length != 0){ $.each(r.data, function(k,v) { + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + cnt++; html += ''; html += ''+(Number(k)+1)+''; @@ -215,7 +233,7 @@ function loadBogoData(){ } html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; html += ''; list.push(v.caseNo); diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp index d0778910..0243dac8 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp @@ -166,6 +166,24 @@ function setData(parentId){ lists += coms + v.memberNo; idxs ++; }else{ + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + //심의안건, 보고안건, 조정조서 html += ''+cnt+''; html += ''+v.caseNo+''; @@ -180,7 +198,7 @@ function setData(parentId){ html += ''+v.respondentCompany+''; } html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; } html += ''; diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp index 6a538629..1bc29ca6 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp @@ -155,6 +155,25 @@ html += ''+v.memberPosit+''; html += ''+v.memberUnit+''; }else{ + + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + //심의안건, 보고안건 html += ''; html += ''+cnt+''; @@ -162,7 +181,7 @@ html += ''+v.applcntCompany+''; html += ''+v.respondentCompany+''; html += ''+v.mediationBig+''; - html += ''+v.mediationSmall+''; + html += ''+mediationSmall+''; html += ''+v.caseExaminer+''; } html += ''; 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 069acec8..1faa0f27 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 @@ -235,6 +235,7 @@ function loadBogoData(){ html += ''; html += ''; + html += ''; html += ''+v.caseExaminer+''; html += ''+''+''; html += ''; @@ -243,12 +244,17 @@ function loadBogoData(){ $("#bogo").append(html); mediationSmall(k, v.mediationSmallCode); mediationBig(k, v.mediationBigCode); + + if(v.mediationSmallCode == '0633000000'){ + $("#mediationETCDetail"+k).val(v.mediationEtcDetail); + $("#mediationETCDetail"+k).show(); + } }); $("#arrListbogo").val(bogolist); //alert($("#arrListbogo").val()); }else{ html += ''; - html += '선택된 보고안건이 없습니다.'; + html += '선택된 보고안건이 없습니다.'; html += ''; $("#bogo").html(html); } @@ -313,6 +319,11 @@ function mediationSmallChange(i){ $(bicList[i]).attr("selected", true); } }*/ + if(smallVal == '0633'){ + $("#mediationETCDetail"+i).show(); + }else{ + $("#mediationETCDetail"+i).hide(); + } } function mediationSmallChangeSim(i){ var smallVal = $("#mediationSmallSim"+i).val().substring(0,4); @@ -862,6 +873,12 @@ function regData(){ $("#mediationBig").val($("#mediationBig"+i).val()); $("#mediationSmall").val($("#mediationSmall"+i).val()); + //기타 사유 등록 + $("#mediationETCDetail").val(''); + if($("#mediationSmall"+i).val() == '0633000000'){ + $("#mediationETCDetail").val($("#mediationETCDetail"+i).val()); + } + var url = ""; $("#type").val("U"); var param = jQuery('#frm').serialize(); @@ -3585,6 +3602,7 @@ function nanumHisDel(){ + @@ -3808,7 +3826,7 @@ function nanumHisDel(){ - + @@ -3817,18 +3835,19 @@ function nanumHisDel(){ + - + - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp index 3eee8688..6b85abf9 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp @@ -191,6 +191,24 @@ function loadBogoData(){ var list = new Array(); if(r.data.length != 0){ $.each(r.data, function(k,v) { + //소분류 기타일 시 기타 사유 텍스트 추가 + var mediationSmall = v.mediationSmall; + var mediationSmallCode = v.mediationSmallCode; + var etcDetail = ""; + if(v.mediationEtcDetail == 'A'){ + etcDetail = "(타 기관 중복 신청)"; + } else if(v.mediationEtcDetail == 'B'){ + etcDetail = "(종료사건 재신청)"; + } else if(v.mediationEtcDetail == 'C'){ + etcDetail = "(연락 두절)"; + } else if(v.mediationEtcDetail == 'D'){ + etcDetail = "(공정거래위원회 이송 요구)"; + } + + if(mediationSmallCode == '0633000000'){ + mediationSmall = mediationSmall + etcDetail; + } + cnt++; html += ''; html += ''; @@ -209,7 +227,7 @@ function loadBogoData(){ } html += ''; - html += ''; + html += ''; html += ''; html += ''; list.push(v.caseNo); 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 433c4fb8..3b025bf9 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 @@ -1311,7 +1311,25 @@ function docOpen(){

조정결과

- 소분류:
+ 소분류: + + + + + + + + + + + + + + + + + + ${etcDetial}
대분류:
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 43ff39ba..b8a7cef5 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 @@ -247,6 +247,12 @@ $(document).ready(function(){ } } + //소분류 기타일 시 기타항목 라디오버튼 노출 + if(smallVal == '0633'){ + $(".mediationETCDiv").show(); + }else{ + $(".mediationETCDiv").hide(); + } }); //조정신청내역 종료 단계에서 읽기만 @@ -762,6 +768,18 @@ $("#periodCalulation").click(function(){ $("#mediationSmall").attr("disabled",false); } + //보고 상태 조정결과 소분류 기타일 시 기타 사유 처리 + if("${masterData.statePro}" == '0404000000' && $("#mediationSmall").val() == '0633000000'){ + if($("input[name='mediationETCDetail']:checked").length == 0){ + alert("조정결과 기타 사유를 체크해주세요."); + return false; + } + }else{ + //소분류 결과 변경 시 기타 사유 삭제 + $("input[name='mediationETCDetail']").prop("checked", false); + } + + if($("#mediationBig") != undefined){ $("#mediationBig").attr("readonly",false); $("#mediationBig").attr("disabled",false); @@ -2836,6 +2854,14 @@ function resnCombo(){ for(var i = 0; i < list.size(); i++){ if(list[i].value == '${masterData.mediationSmall}'){ $(list[i]).attr("selected", true); + //소분류 기타일 시 기타항목 라디오버튼 노출 + if(list[i].value == '0633000000'){ + $(".mediationETCDiv").show(); + var mediationETCDetail = '${masterData.mediationEtcDetail}'; + if (mediationETCDetail) { + $("input[name='mediationETCDetail'][value='" + mediationETCDetail + "']").prop("checked", true); + } + } } } //} @@ -5703,6 +5729,12 @@ function docOpen(obj) { * 재심의 진행 : +

보고안건 상정보고안건 상정
순번피신청인 종료사유(대분류) 종료사유(소분류)기타사유 담당자 수정의결
선택된 보고안건이 없습니다.선택된 보고안건이 없습니다.
+
'+(Number(k)+1)+''+v.mediationBig+''+v.mediationSmall+''+mediationSmall+''+v.caseExaminer+'