From eea2f67983a821c5e29fbe457dfd113bd4918e73 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Tue, 23 Dec 2025 16:54:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EC=84=9C=20No=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=B0=9C=EC=A3=BC=EC=84=9C=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=8B=A4=EB=A5=B4?= =?UTF-8?q?=EA=B2=8C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliveryMngAcceptanceList.jsp | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp index da96cd2..6bab535 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp @@ -88,6 +88,7 @@ var columns = [ {title:'TOTAL_SUPPLY_PRICE' ,field:'TOTAL_SUPPLY_PRICE' ,visible:false, frozen:true}, {title:'TOTAL_DELIVERY_PRICE' ,field:'TOTAL_DELIVERY_PRICE' ,visible:false, frozen:true}, {title:'TOTAL_NOT_DELIVERY_PRICE',field:'TOTAL_NOT_DELIVERY_PRICE',visible:false, frozen:true}, + {title:'FORM_TYPE' ,field:'FORM_TYPE' ,visible:false, frozen:true}, {headerHozAlign : 'center', hozAlign : 'center', minWidth : 130, widthGrow : 1, title : '품의서 No', field : 'PROPOSAL_NO', formatter: fnc_createGridAnchorTag, cellClick : function(e, cell) { @@ -98,7 +99,8 @@ var columns = [ formatter:fnc_createGridAnchorTag, cellClick:function(e, cell){ var objId = fnc_checkNull(cell.getData().OBJID); - fn_formPopUp(objId); + var formType = fnc_checkNull(cell.getData().FORM_TYPE, 'general'); + fn_formPopUp(objId, formType); } }, {headerHozAlign : 'center', hozAlign : 'center', minWidth : 140, widthGrow : 1, title : '프로젝트번호', field : 'PROJECT_NO'}, @@ -325,14 +327,36 @@ function fn_deliveryResultPopUp(objId,purchaseOrderNo){ fn_centerPopup(popup_width, popup_height, url, target); } -//등록,수정,뷰 -function fn_formPopUp(objId){ +//등록,수정,뷰 - 발주서 타입에 따라 다른 팝업 열기 +function fn_formPopUp(objId, formType){ var popup_width = 1460; - var popup_height = 1050; - + var popup_height = 1050; + + // 양식 타입에 따라 다른 팝업 열기 + formType = fnc_checkNull(formType, 'general'); + var hiddenForm = document.hiddenForm; - var target = "purchaseOrderFormPopup_new"; - var url = "/purchaseOrder/purchaseOrderFormPopup_new.do"; + var target = ""; + var url = ""; + + if(formType == 'outsourcing'){ + // 외주가공 발주서 양식 + target = "purchaseOrderFormPopup_outsourcing"; + url = "/purchaseOrder/purchaseOrderFormPopup_outsourcing.do"; + popup_width = 1200; + popup_height = 900; + } else if(formType == 'general'){ + // 일반 발주서 양식 + target = "purchaseOrderFormPopup_general"; + url = "/purchaseOrder/purchaseOrderFormPopup_general.do"; + popup_width = 1000; + popup_height = 900; + } else { + // 기존 발주서 양식 (FORM_TYPE이 없거나 기존 데이터) + target = "purchaseOrderFormPopup_new"; + url = "/purchaseOrder/purchaseOrderFormPopup_new.do"; + } + fn_centerPopup(popup_width, popup_height, "", target); hiddenForm.PURCHASE_ORDER_MASTER_OBJID.value = objId; -- 2.49.1 From 29671cb26a75c60867c79f3cef1045e0f7b5adf0 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Tue, 23 Dec 2025 17:42:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EC=84=9C=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85,=20=EC=9E=90=EC=9E=AC=EA=B4=80=EB=A6=AC=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/view/inventoryMng/inventoryMngNewList.jsp | 10 ++++++++-- src/com/pms/mapper/purchaseOrder.xml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/view/inventoryMng/inventoryMngNewList.jsp b/WebContent/WEB-INF/view/inventoryMng/inventoryMngNewList.jsp index 804b9bc..bb8dbc1 100644 --- a/WebContent/WEB-INF/view/inventoryMng/inventoryMngNewList.jsp +++ b/WebContent/WEB-INF/view/inventoryMng/inventoryMngNewList.jsp @@ -41,6 +41,12 @@ .select2-container .select2-selection--multiple .select2-selection__rendered { overflow: auto !important; } + body, html { + overflow-x: hidden; + width: 100%; + margin: 0; + padding: 0; + }