diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
index 81be0e5..94520d0 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
@@ -104,6 +104,7 @@ var columns = [
{headerHozAlign:'center', hozAlign:'left', minWidth:120, widthGrow:1.5, title:'품번', field:'PART_NO'},
{headerHozAlign:'center', hozAlign:'left', minWidth:150, widthGrow:2, title:'품명', field:'PART_NAME'},
{headerHozAlign:'center', hozAlign:'left', minWidth:120, widthGrow:1.2, title:'공급업체', field:'PARTNER_NAME'},
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' },
{headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:0.8, title:'발주수량', field:'ORDER_QTY',
formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false}
},
@@ -113,6 +114,15 @@ var columns = [
{headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:0.8, 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:90, widthGrow:1.1, title:'수입검사 검사현황', field:'INSPECTION_STATUS'},
{headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:1.1, title:'처리결과 폐기수량', field:'DEFECT_QTY',
formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false}
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
index c96657c..3e2eabf 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
@@ -1052,6 +1052,7 @@ function fn_executeOrderCancel(objId){
+
diff --git a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
index 050f0d3..403bdde 100644
--- a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
@@ -221,7 +221,8 @@ var columns = [
}
}
},
- {headerHozAlign:'center', hozAlign:'center', title:"작성일", field:"REGDATE_TITLE", widthGrow:1.0}
+ {headerHozAlign:'center', hozAlign:'center', title:"작성일", field:"REGDATE_TITLE", widthGrow:1.0},
+ {headerHozAlign:'center', hozAlign:'center', title:"작성자", field:"WRITER_NAME", widthGrow:1.0}
];
// 검색
diff --git a/WebContent/WEB-INF/view/salesMng/purchaseRegProposalMngList.jsp b/WebContent/WEB-INF/view/salesMng/purchaseRegProposalMngList.jsp
index d351bd7..0b6c265 100644
--- a/WebContent/WEB-INF/view/salesMng/purchaseRegProposalMngList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/purchaseRegProposalMngList.jsp
@@ -23,9 +23,6 @@ String menuName = CommonUtils.getMenuName(menuObjId, "구매요청_품의서관
margin: 0;
padding: 0;
}
- .pmsPopupForm tr:last-child td {
- border-bottom: none;
- }
.select2-selection__choice {
font-size: 11px;
background-color: #fff !important;
@@ -44,17 +41,8 @@ String menuName = CommonUtils.getMenuName(menuObjId, "구매요청_품의서관
.select2-selection__rendered {
height: 18px !important;
}
- /* frozen 컬럼 오른쪽 굵은 선 제거 (헤더) */
- .tabulator .tabulator-header .tabulator-frozen-left {
- border-right: none !important;
- }
- /* frozen 컬럼 기본 두꺼운 테두리 제거 */
- .tabulator .tabulator-frozen-left {
- border-right: none !important;
- }
- /* 체크박스 컬럼 오른쪽에 얇은 구분선 추가 (데이터 행만) */
- .tabulator .tabulator-tableholder .tabulator-table .tabulator-row .tabulator-cell.tabulator-frozen-left {
- border-right: 1px solid #ddd !important;
+ .select2-container .select2-selection--multiple .select2-selection__rendered {
+ overflow: auto !important;
}