From 96333f7c0b090bde1d200a658b6bdad96cdf87b6 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Wed, 10 Dec 2025 16:25:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=B0=BD=20=ED=81=AC=EA=B8=B0=20=EC=A4=84?= =?UTF-8?q?=EC=98=80=EC=9D=84=20=EB=95=8C=20=EA=B0=80=EB=A1=9C=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A1=A4=20=EC=95=88=EB=B3=B4=EC=9D=B4=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp index d0a86e4..b8ceb9e 100644 --- a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp +++ b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp @@ -17,6 +17,13 @@ #structureTableWrap1 { top: 56px; width: 99%; + height: calc(100vh - 80px); + display: flex; + flex-direction: column; +} +#structureGrid { + flex: 1; + min-height: 200px; } #structureName { margin-bottom: 10px; @@ -292,7 +299,7 @@ function fn_initGrid() { _tabulGrid = new Tabulator("#structureGrid", { layout: "fitColumns", - height: "650px", + height: "100%", pagination: false, headerSort: false, // 정렬 비활성화 columns: columns, -- 2.49.1 From 035c09738b1790217b51e726bba4d84ff09bfc5f Mon Sep 17 00:00:00 2001 From: hjjeong Date: Wed, 10 Dec 2025 17:00:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=EA=B4=80=EB=A6=AC=5F?= =?UTF-8?q?=EC=9E=85=EA=B3=A0=EA=B4=80=EB=A6=AC=20=EA=B2=80=EC=82=AC?= =?UTF-8?q?=EC=84=B1=EC=A0=81=EC=84=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliveryMngAcceptanceList.jsp | 34 +++++++++---------- src/com/pms/mapper/purchaseOrder.xml | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp index d7e2004..823e697 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp @@ -105,17 +105,11 @@ var columns = [ {headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '미입고수량', field : 'NON_DELIVERY_QTY', formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false } }, - {headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow : 1, title : '검사성적서', field : 'INSPECTION_FILE', - formatter: function(cell, formatterParams, onRendered){ - var fileYn = fnc_checkNull(cell.getValue()); - if(fileYn === 'Y'){ - return ''; - } - return ''; - }, - cellClick:function(e, cell){ - var objId = fnc_checkNull(cell.getData().OBJID); - fn_openInspectionFilePopUp(objId); + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow : 1, title : '검사성적서', field : 'INSPECTION_FILE_CNT', + formatter:fnc_subInfoValueFormatter, + cellClick:function(e, cell){ + var objid = fnc_checkNull(cell.getData().OBJID); + fn_FileRegist(objid,"INSPECTION_FILE","검사성적서"); } }, {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '입고결과', field : 'DELIVERY_STATUS', @@ -295,12 +289,18 @@ function fn_openProposalPopUp(proposalObjId){ window.open(url, "proposalFormPopUp", "width="+popup_width+",height="+popup_height+",scrollbars=yes,resizable=yes"); } -// 검사성적서 파일 팝업 -function fn_openInspectionFilePopUp(objId){ - var popup_width = 700; - var popup_height = 500; - var url = "/common/FileRegistPopup.do?docType=INSPECTION_FILE&targetObjId=" + objId + "&docTypeName=검사성적서"; - window.open(url, "inspectionFilePopUp", "width="+popup_width+",height="+popup_height+",scrollbars=yes,resizable=yes"); +// 첨부파일 팝업 +function fn_FileRegist(objId, docType, docTypeName){ + var popup_width = 800; + var popup_height = 300; + + var objId = objId; + var docType = docType; + var docTypeName = docTypeName; + var params = "?targetObjId="+objId+"&docType="+docType+"&docTypeName="+docTypeName; + var url = "/projectConcept/FileRegistPopup.do"+params; + + fn_centerPopup(popup_width, popup_height, url); } diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index 1a8f21f..d64a5f2 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -4298,6 +4298,7 @@ SELECT POM.OBJID ,POM.ORDER_TYPE_CD ,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = POM.ORDER_TYPE_CD) AS ORDER_TYPE_CD_NAME ,(SELECT user_name(RECEIVER_ID) FROM ARRIVAL_PLAN AP WHERE AP.parent_objid = POM.OBJID ORDER BY AP.RECEIPT_DATE desc LIMIT 1) AS CUR_RECEIVER_NAME + ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO AF WHERE AF.TARGET_OBJID = POM.OBJID AND AF.DOC_TYPE = 'INSPECTION_FILE' AND UPPER(AF.STATUS) = 'ACTIVE') AS INSPECTION_FILE_CNT FROM PURCHASE_ORDER_MASTER AS POM