diff --git a/WebContent/WEB-INF/view/inventoryMng/materialRequestList.jsp b/WebContent/WEB-INF/view/inventoryMng/materialRequestList.jsp index de43290..d8320b0 100644 --- a/WebContent/WEB-INF/view/inventoryMng/materialRequestList.jsp +++ b/WebContent/WEB-INF/view/inventoryMng/materialRequestList.jsp @@ -357,7 +357,7 @@ - +
diff --git a/WebContent/WEB-INF/view/partMng/partMngList.jsp b/WebContent/WEB-INF/view/partMng/partMngList.jsp index 8ca08cd..d5e8dc0 100644 --- a/WebContent/WEB-INF/view/partMng/partMngList.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngList.jsp @@ -497,7 +497,7 @@ String connector = person.getUserId(); --> - +
diff --git a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp index 395cfd0..7199532 100644 --- a/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp +++ b/WebContent/WEB-INF/view/partMng/structureAscendingList.jsp @@ -786,7 +786,7 @@ function fn_excelDownload(){
- +
diff --git a/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp b/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp index f1d0306..4fe21ff 100644 --- a/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp +++ b/WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp @@ -388,7 +388,7 @@ function fn_search() { - +
diff --git a/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp b/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp index ad163db..0e5329b 100644 --- a/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp +++ b/WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp @@ -341,7 +341,7 @@ function fn_search() { - + diff --git a/WebContent/WEB-INF/view/quality/incomingInspectionProgressList.jsp b/WebContent/WEB-INF/view/quality/incomingInspectionProgressList.jsp index b662cb9..520bac0 100644 --- a/WebContent/WEB-INF/view/quality/incomingInspectionProgressList.jsp +++ b/WebContent/WEB-INF/view/quality/incomingInspectionProgressList.jsp @@ -303,7 +303,7 @@ function fn_deliveryAcceptanceViewPopUp(objId, deliveryStatus){
- +
diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp index 7cb6c00..df816c6 100644 --- a/WebContent/WEB-INF/view/quality/processInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp @@ -302,7 +302,7 @@ async function fn_createExcelFile(data){
- +
diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp index 8f5c8b0..2bd8ed0 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp @@ -392,7 +392,7 @@ function fn_registPopUp(){
- +
diff --git a/WebContent/WEB-INF/view/salesMng/purchaseRequestRegList.jsp b/WebContent/WEB-INF/view/salesMng/purchaseRequestRegList.jsp index 7f89d2b..bda810c 100644 --- a/WebContent/WEB-INF/view/salesMng/purchaseRequestRegList.jsp +++ b/WebContent/WEB-INF/view/salesMng/purchaseRequestRegList.jsp @@ -192,10 +192,10 @@ var columns = [ } ,{headerHozAlign : 'center', hozAlign : 'center', title : "주문유형", field :"ORDER_TYPE_NAME" , widthGrow:1.1 } ,{headerHozAlign : 'center', hozAlign : 'center', title : "제품구분", field :"PRODUCT_NAME_FULL" , widthGrow:1.1} - ,{headerHozAlign : 'center', hozAlign : 'left' , title : "고객사", field :"CUSTOMER_NAME" , widthGrow:1.5 } + ,{headerHozAlign : 'center', hozAlign : 'left' , title : "고객사", field :"CUSTOMER_NAME" , widthGrow:1.5 } ,{headerHozAlign : 'center', hozAlign : 'center', title : "유/무상", field :"PAID_TYPE_NAME" , widthGrow:0.9 } ,{headerHozAlign : 'center', hozAlign : 'left', title : "품번", field :"PART_NO" , widthGrow:1.4} - ,{headerHozAlign : 'center', hozAlign : 'left' , title : "품명", field :"PART_NAME" , widthGrow:1.8 } + ,{headerHozAlign : 'center', hozAlign : 'left' , title : "품명", field :"PART_NAME" , widthGrow:1.8 } ,{headerHozAlign : 'center', hozAlign : 'center', title : "구매요청서", field :"HAS_PURCHASE_REQUEST" , widthGrow:1.1, formatter:fnc_subInfoValueFormatter, cellClick : function(e, cell) { @@ -203,10 +203,10 @@ var columns = [ fn_openSalesRequestFormPopUp(data.OBJID); } } - ,{headerHozAlign : 'center', hozAlign : 'center', title : "요청인", field :"REQUEST_USER_NAME" , widthGrow:1.1 } + ,{headerHozAlign : 'center', hozAlign : 'center', title : "작성자", field :"REQUEST_USER_NAME" , widthGrow:1.2 } ,{headerHozAlign : 'center', hozAlign : 'center', title : "입고요청일", field :"DELIVERY_REQUEST_DATE" , widthGrow:1.1 } ,{headerHozAlign : 'center', hozAlign : 'center', title : "작성일", field :"REGDATE_TITLE" , widthGrow:1.1 } - ,{headerHozAlign : 'center', hozAlign : 'center', title : "상태", field :"STATUS_TITLE" , widthGrow:1.1 } + ,{headerHozAlign : 'center', hozAlign : 'center', title : "상태", field :"STATUS_TITLE" , widthGrow:0.9 } ]; //var grid; diff --git a/WebContent/css/basic.css b/WebContent/css/basic.css index 1b0815e..805a042 100644 --- a/WebContent/css/basic.css +++ b/WebContent/css/basic.css @@ -721,6 +721,22 @@ html,body {height:100%} .plm_btns:first-child:hover {margin-left: 0px;} .plm_btns:hover {height:25px; border-radius: 3px; background: #38426b; color:#fff; cursor: pointer; font-size: 12px; border: 1px solid #fff; float:left; padding:3px 10px; font-weight:700; margin-left: 5px;} + +/* Excel Download 아이콘 버튼 */ +.plm_btns.excelIcon { + background: #e7eaee url('/images/ExcelDownload2.png') no-repeat center center; + background-size: 18px; + width: 25px; + height: 25px; + padding: 0; + text-indent: -9999px; + overflow: hidden; +} +.plm_btns.excelIcon:hover { + background: #38426b url('/images/ExcelDownload2.png') no-repeat center center; + background-size: 18px; + border: 1px solid #fff; +} .upload_btns {height:20px; border-radius: 3px; background: #e7eaee; color:#0d58c8; cursor: pointer; margin-top:3px; font-size: 12px; border: 1px solid #ccc; float:right; padding:3px 10px; font-weight:700; transition-duration: 0.2s;} diff --git a/WebContent/images/ExcelDownload2.png b/WebContent/images/ExcelDownload2.png new file mode 100644 index 0000000..912ed53 Binary files /dev/null and b/WebContent/images/ExcelDownload2.png differ diff --git a/WebContent/js/common.js b/WebContent/js/common.js index d8eb7c2..1d97f00 100644 --- a/WebContent/js/common.js +++ b/WebContent/js/common.js @@ -3022,7 +3022,8 @@ $(document).ready(function() { var pageTitle = $('.plm_menu_name_gdnsi h2 span').text().trim(); // 이미 엑셀 버튼이 있으면 추가하지 않음 (#btnExcel 또는 .excel 클래스 체크) if ($('#btnExcel').length === 0 && $('.btnArea .excel').length === 0) { - $('.btnArea').append(""); + // $('.btnArea').append(""); + $('.btnArea').append(""); } $(document).on('click', '.excelBtn', async function() {