diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp index 491d89b..2d5b58a 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp @@ -89,17 +89,17 @@ $(document).ready(function(){ var columns = [ // 요구사항: 품의서 No, 발주서 No, 프로젝트번호, 품번, 품명, 공급업체, 발주수량, 입고수량, 미입고수량, 검사성적서, 입고결과 {title:'STATUS' ,field:'STATUS' ,visible:false, frozen:true}, - {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:'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', + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 120, widthGrow : 1, title : '품의서 No', field : 'PROPOSAL_NO', formatter: fnc_createGridAnchorTag, cellClick : function(e, cell) { fn_openProposalFormPopUp(cell.getData().SALES_REQUEST_OBJID); } }, - {headerHozAlign : 'center', hozAlign : 'center', minWidth : 130, widthGrow : 1, title : '발주서 No', field : 'PURCHASE_ORDER_NO', + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 120, widthGrow : 1, title : '발주서 No', field : 'PURCHASE_ORDER_NO', formatter:fnc_createGridAnchorTag, cellClick:function(e, cell){ var objId = fnc_checkNull(cell.getData().OBJID); @@ -107,10 +107,11 @@ var columns = [ fn_formPopUp(objId, formType); } }, - {headerHozAlign : 'center', hozAlign : 'center', minWidth : 140, widthGrow : 1, title : '프로젝트번호', field : 'PROJECT_NO'}, + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 130, widthGrow : 1, title : '프로젝트번호', field : 'PROJECT_NO'}, {headerHozAlign : 'center', hozAlign : 'left', minWidth : 140, widthGrow : 2, title : '품번', field : 'PART_NO' }, {headerHozAlign : 'center', hozAlign : 'left', minWidth : 180, widthGrow : 3, title : '품명', field : 'PART_NAME' }, {headerHozAlign : 'center', hozAlign : 'left', minWidth : 150, widthGrow : 2, title : '공급업체', field : 'PARTNER_NAME' }, + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' }, {headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '발주수량', field : 'TOTAL_PO_QTY', formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false } }, @@ -120,6 +121,15 @@ 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 : 'right', minWidth : 90, widthGrow : 1, title : '발주금액', field : 'TOTAL_SUPPLY_PRICE', + formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false } + }, + {headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '입고금액', field : 'TOTAL_DELIVERY_PRICE', + formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false } + }, + {headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '미입고금액', field : 'TOTAL_NOT_DELIVERY_PRICE', + formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false } + }, {headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow : 1, title : '업체성적서', field : 'INSPECTION_FILE_CNT', formatter:fnc_subInfoValueFormatter, cellClick:function(e, cell){ diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp index 0e0f59c..c96657c 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp @@ -334,7 +334,7 @@ var columns = [ } } }, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'프로젝트번호', field:'PROJECT_NO', + {headerHozAlign:'center', hozAlign:'center', widthGrow:1.1, title:'프로젝트번호', field:'PROJECT_NO', formatter: fnc_createGridAnchorTag, cellClick: function(e, cell){ var orderNo = cell.getData().PROJECT_NO; @@ -342,9 +342,9 @@ var columns = [ fn_openSaleRegPopup(orderNo, "detail"); } }, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매유형', field:'PURCHASE_TYPE_NAME'}, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'주문유형', field:'CATEGORY_NAME'}, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'제품구분', field:'PRODUCT_NAME'}, + {headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'구매유형', field:'PURCHASE_TYPE_NAME'}, + {headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'주문유형', field:'CATEGORY_NAME'}, + {headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'제품구분', field:'PRODUCT_NAME'}, {headerHozAlign:'center', hozAlign:'left', widthGrow:1.5, title:'품번', field:'PART_NO'}, {headerHozAlign:'center', hozAlign:'left', widthGrow:2, title:'품명', field:'PART_NAME'}, {headerHozAlign:'center', hozAlign:'left', widthGrow:1.5, title:'공급업체', field:'PARTNER_NAME'}, @@ -364,11 +364,12 @@ var columns = [ } else if(value === 'Y'){ return '발송완료'; } else { - return ''; + return '미발송'; } } }, - {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'} + {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'}, + {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매담당자', field:'WRITER_NAME'} ]; function editCheck (cell) { @@ -1033,12 +1034,27 @@ function fn_executeOrderCancel(objId){ -