diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml index 7a9f91be..e5c45c26 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml @@ -708,7 +708,8 @@ FILE_FUNC, COPY_CONTRACT_YN, FILE_MEMO, - MEMBER_SEQ + MEMBER_SEQ, + FILE_ADD1 ) VALUES ( #{rceptNo}, C_CASEFILE_SEQ.NEXTVAL, @@ -726,7 +727,8 @@ #{fileFuncType}, #{copyContractYn}, #{fileMemo}, - #{memberSeq,jdbcType=VARCHAR} + #{memberSeq,jdbcType=VARCHAR}, + #{fileAdd1} ) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp index 3661eb66..4c43edef 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp @@ -17,8 +17,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> -<%@ taglib prefix="ckeditor" uri="http://ckeditor.com"%> @@ -26,13 +24,6 @@ - - - - - - - @@ -40,29 +31,15 @@ - - - - - - - - - - - - - - @@ -81,24 +58,9 @@ - - - - - - - - - - - - @@ -118,7 +80,6 @@ - @@ -128,231 +89,187 @@ -<c:out value='${bdMstr.bbsNm}' /> - 글 등록 +기안 파일 첨부하기 -

■ 기안파일첨부하기

- - - - - - - - - - - - - - - - - - - - - - - - - - +

■ 기안파일첨부하기

+
@@ -360,7 +277,7 @@ function checkFileNo(){
- +
@@ -373,76 +290,16 @@ function checkFileNo(){ - @@ -450,47 +307,43 @@ function checkFileNo(){

첨부파일

 - - - -
- - - - - - - - - - - - - - - - - - - - -
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
-

첨부하실 파일을 마우스로 끌어서 넣어주세요.

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
- - - - "> - - "> - - -
+
+
+
+ +
+
    + +
+ +
+
- - -
- - - - - - - - + +
- - - + + + + + + + + + + + + + + +
+ +
+ - - - - - -
- -
-
- + - - 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 c406a7ae..53efd1a9 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 @@ -3347,10 +3347,10 @@ function atendReqPopOpen(caseNo){ window.open(popUrl, "", popOption); } -function fileFirstPopOpen(p_caseNo, p_fileFuncType, p_approKey){ +function fileFirstPopOpen(p_caseNo, p_rceptNo, p_fileFuncType, p_approKey, fileGubun){ //alert('작업중') //return; - var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey; + var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo +"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; window.open(popUrl, "", popOption); } @@ -3741,16 +3741,16 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, //$("#subjectStrImsi").val(r.title); //그룹웨어로그인아이디 //$("#contentsStrImsi").val(r.contents); - //착수 보고서 는 첩부파일 팝업을 띄운다. + //착수 보고서 는 첩부파일 팝업을 띄운다. 착수보고 첨부파일 파일구분 값 - 4840000000 if (jobID=='1-1'||jobID=='2-1' ||jobID=='3-1'||jobID=='4-1' ||jobID=='5-1'||jobID=='6-1'){ - //fileFirstPopOpen($("#caseNo").val(),'X-1',r.data2.docId); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-1',r.data2.docId, '4840000000'); - var f = document.nanumViewFrm; + /* var f = document.nanumViewFrm; f.action = $("#nanumViewFrm #gwCallUrlView").val(); f.target = "_blank"; - f.submit(); + f.submit(); */ }else{ var f = document.nanumViewFrm; @@ -3776,6 +3776,13 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, }); } +function nanumApiByPopup(fileKey){ + $("#nanumViewFrm #fileKeyView").val(fileKey); + var f = document.nanumViewFrm; + f.action = $("#nanumViewFrm #gwCallUrlView").val(); + f.target = "_blank"; + f.submit(); +} //일반기안 띄우기 function nanumCallGeneral(p_jobID, nanumSubject){