chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'V2025121901' (#113) from V2025121901 into main

Browse Source 
Reviewed-on: #113
This commit was merged in pull request #113.
This commit is contained in:
hjjeong
2025-12-23 08:47:07 +00:00
parent 138e178005 29671cb26a
commit 4ed18d9f11
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WebContent/WEB-INF/view/inventoryMng/inventoryMngNewList.jsp
View File

@@ -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;
}
</style>
<script>
@@ -104,8 +110,8 @@
{title:"자재목록", headerHozAlign:'center',
//frozen:false,
columns:[
{headerHozAlign : 'center', hozAlign : 'left', width : '100', title : '프로젝트번호', field : 'PROJECT_NO' },
{headerHozAlign : 'center', hozAlign : 'left', width : '200', title : '유닛명', field : 'UNIT_NAME' },
{headerHozAlign : 'center', hozAlign : 'left', width : '130', title : '프로젝트번호', field : 'PROJECT_NO' },
//{headerHozAlign : 'center', hozAlign : 'left', width : '200', title : '유닛명', field : 'UNIT_NAME' },
{headerHozAlign : 'center', hozAlign : 'left', width : '180', title : '품번', field : 'PART_NO' },
{headerHozAlign : 'center', hozAlign : 'left', width : '180', title : '품명', field : 'PART_NAME' },
{headerHozAlign : 'center', hozAlign : 'left', width : '180', title : '재질', field : 'MATERIAL' },

38
WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
View File

@@ -91,6 +91,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) {
@@ -101,7 +102,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'},
@@ -328,14 +330,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;