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

Merge pull request 'V2026012702' (#130) from V2026012702 into main

Browse Source 
Reviewed-on: #130
This commit was merged in pull request #130.
This commit is contained in:
hjjeong
2026-02-02 07:38:23 +00:00
parent 43e4f27c83 7c96446708
commit 2897654b1a
12 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/WEB-INF/view/inventoryMng/materialRequestList.jsp
View File

@@ -357,7 +357,7 @@
<input type="button" value="자재불출" class="plm_btns" id="btnAccept">
<input type="button" value="접수" class="plm_btns" id="btnRec">
<input type="button" value="조회" class="plm_btns" id="btnSearch">
<input type="button" value="Excel Download" class="plm_btns" id="btnExcel">
<input type="button" value="Excel Download" class="plm_btns excelIcon" id="btnExcel">
</div>
</div>
<div id="plmSearchZon">

2
WebContent/WEB-INF/view/partMng/partMngList.jsp
View File

@@ -497,7 +497,7 @@ String connector = person.getUserId();
-->
<input type="button" value="도면 다중 업로드" class="plm_btns" id="btnDrawingUpload">
<input type="button" value="조회" class="plm_btns" id="btnSearch">
<input type="button" value="Excel Download" class="plm_btns" id="btnExcel">
<input type="button" value="Excel Download" class="plm_btns excelIcon" id="btnExcel">
<input type="file" id="drawingFiles" multiple style="display:none;" accept=".stp,.step,.dwg,.dxf,.pdf">
</div>
</div>

2
WebContent/WEB-INF/view/partMng/structureAscendingList.jsp
View File

@@ -786,7 +786,7 @@ function fn_excelDownload(){
<div class="btnArea">
<input type="button" value="정전개 조회" class="plm_btns" id="btnSearchAscending">
<input type="button" value="역전개 조회" class="plm_btns" id="btnSearchDescending">
<input type="button" value="Excel Download" class="plm_btns excel" id="btnExcel">
<input type="button" value="Excel Download" class="plm_btns excel excelIcon" id="btnExcel">
</div>
</div>
<div id="plmSearchZon">

2
WebContent/WEB-INF/view/productionplanning/rawMaterialRequirementList.jsp
View File

@@ -388,7 +388,7 @@ function fn_search() {
<input type="button" class="plm_btns" value="행 추가" id="btnAddRow">
<input type="button" class="plm_btns" value="행 삭제" id="btnDeleteRow">
<input type="button" class="plm_btns" value="조회" id="btnSearch">
<input type="button" class="plm_btns excelBtn" value="Excel Download" id="btnExcel">
<input type="button" class="plm_btns excelBtn excelIcon" value="Excel Download" id="btnExcel">
</div>
</div>

2
WebContent/WEB-INF/view/productionplanning/semiProductRequirementList.jsp
View File

@@ -341,7 +341,7 @@ function fn_search() {
<input type="button" class="plm_btns" value="행 추가" id="btnAddRow">
<input type="button" class="plm_btns" value="행 삭제" id="btnDeleteRow">
<input type="button" class="plm_btns" value="조회" id="btnSearch">
<input type="button" class="plm_btns excelBtn" value="Excel Download" id="btnExcel">
<input type="button" class="plm_btns excelBt excelIcon" value="Excel Download" id="btnExcel">
</div>
</div>

2
WebContent/WEB-INF/view/quality/incomingInspectionProgressList.jsp
View File

@@ -303,7 +303,7 @@ function fn_deliveryAcceptanceViewPopUp(objId, deliveryStatus){
<div class="btnArea">
<input type="button" class="plm_btns" value="수입검사 진행" id="btnInspection">
<input type="button" class="plm_btns" value="조회" id="btnSearch">
<input type="button" class="plm_btns excel" value="Excel Download" id="btnExcel">
<input type="button" class="plm_btns excel excelIcon" value="Excel Download" id="btnExcel">
</div>
</div>

2
WebContent/WEB-INF/view/quality/processInspectionList.jsp
View File

@@ -302,7 +302,7 @@ async function fn_createExcelFile(data){
<div class="btnArea">
<input type="button" class="plm_btns" value="공정검사 등록" id="btnRegist">
<input type="button" class="plm_btns" value="조회" id="btnSearch">
<input type="button" class="plm_btns" value="Excel Download" id="btnExcel">
<input type="button" class="plm_btns excelIcon" value="Excel Download" id="btnExcel">
</div>
</div>

2
WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp
View File

@@ -392,7 +392,7 @@ function fn_registPopUp(){
<div class="btnArea">
<input type="button" class="plm_btns" value="반제품검사 등록" id="btnRegist">
<input type="button" class="plm_btns" value="조회" id="btnSearch">
<input type="button" class="plm_btns" value="Excel Download" id="btnExcel">
<input type="button" class="plm_btns excelIcon" value="Excel Download" id="btnExcel">
</div>
</div>

8
WebContent/WEB-INF/view/salesMng/purchaseRequestRegList.jsp
View File

@@ -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;

16
WebContent/css/basic.css
View File

@@ -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;}

BIN
WebContent/images/ExcelDownload2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 808 B

3
WebContent/js/common.js
View File

@@ -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("<input type='button' class='plm_btns excelBtn' value='Excel Download'>");
// $('.btnArea').append("<input type='button' class='plm_btns excelBtn' value='Excel Download'>");
$('.btnArea').append("<input type='button' class='plm_btns excelIcon excelBtn' value='Excel Download' title='Excel Download'>");
}
$(document).on('click', '.excelBtn', async function() {