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

Merge pull request '검색영역 수정' (#115) from V2025121901 into main

Browse Source 
Reviewed-on: #115
This commit was merged in pull request #115.
This commit is contained in:
hjjeong
2025-12-30 09:21:36 +00:00
parent 5df50b7247 4bbd0c1e4e
commit 5836f8d571
4 changed files with 92 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp
View File

@@ -663,91 +663,84 @@ function fn_openPurchaseListPopup() {
<!-- 검색 영역 -->
<div id="plmSearchZon">
<div style="display: flex; flex-wrap: wrap; gap: 10px 15px; align-items: center;">
<!-- 주문유형 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_category_cd">주문유형</label>
<select name="search_category_cd" id="search_category_cd" style="width:120px" class="select2">
<option value="">선택</option>
${code_map.category_cd}
</select>
</div>
<table>
<tr>
<td><label for="search_category_cd">주문유형</label></td>
<td>
<select name="search_category_cd" id="search_category_cd" style="width:210px" class="select2" autocomplete="off">
<option value="">선택</option>
${code_map.category_cd}
</select>
</td>
<!-- 제품구분 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_product_cd">제품구분</label>
<select name="search_product_cd" id="search_product_cd" style="width:120px" class="select2">
<option value="">선택</option>
${code_map.product_cd}
</select>
</div>
<td><label for="search_product_cd">제품구분</label></td>
<td>
<select name="search_product_cd" id="search_product_cd" style="width:210px" class="select2" autocomplete="off">
<option value="">선택</option>
${code_map.product_cd}
</select>
</td>
<!-- 국내/해외 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_area_cd">국내/해외</label>
<select name="search_area_cd" id="search_area_cd" style="width:100px" class="select2">
<option value="">선택</option>
<option value="국내">국내</option>
<option value="해외">해외</option>
</select>
</div>
<td><label for="search_area_cd">국내/해외</label></td>
<td>
<select name="search_area_cd" id="search_area_cd" style="width:213px" class="select2" autocomplete="off">
<option value="">선택</option>
<option value="국내">국내</option>
<option value="해외">해외</option>
</select>
</td>
<!-- 고객사 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_customer_objid">고객사</label>
<select name="search_customer_objid" id="search_customer_objid" style="width:150px" class="select2">
<option value="">선택</option>
${code_map.customer_cd}
</select>
</div>
<td><label for="search_customer_objid">고객사</label></td>
<td>
<select name="search_customer_objid" id="search_customer_objid" style="width:253px" class="select2" autocomplete="off">
<option value="">선택</option>
${code_map.customer_cd}
</select>
</td>
<!-- 유/무상 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_paid_type">유/무상</label>
<select name="search_paid_type" id="search_paid_type" style="width:80px" class="select2">
<option value="">선택</option>
<option value="paid">유상</option>
<option value="free">무상</option>
</select>
</div>
<td><label for="search_paid_type">유/무상</label></td>
<td>
<select name="search_paid_type" id="search_paid_type" style="" class="select2" autocomplete="off">
<option value="">선택</option>
<option value="paid">유상</option>
<option value="free">무상</option>
</select>
</td>
<!-- S/N -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_serial_no">S/N</label>
<input type="text" name="search_serial_no" id="search_serial_no" value="" style="width:100px;">
</div>
<td><label for="search_serial_no">S/N</label></td>
<td>
<input type="text" name="search_serial_no" id="search_serial_no" value="" style="">
</td>
</tr>
<tr>
<td><label for="search_part_no">품번</label></td>
<td>
<select name="search_part_no" id="search_part_no" class="select2-part" style="width:150px;">
<option value="">품번 선택</option>
</select>
<input type="hidden" name="search_part_objid" id="search_part_objid" value="">
</td>
<!-- 품번 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_part_no">품번</label>
<select name="search_part_no" id="search_part_no" class="select2-part" style="width:150px;">
<option value="">품번 선택</option>
</select>
<input type="hidden" name="search_part_objid" id="search_part_objid" value="">
</div>
<td><label for="search_part_name">품명</label></td>
<td>
<select name="search_part_name" id="search_part_name" class="select2-part" style="width:150px;">
<option value="">품명 선택</option>
</select>
</td>
<!-- 품명 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label for="search_part_name">품명</label>
<select name="search_part_name" id="search_part_name" class="select2-part" style="width:150px;">
<option value="">품명 선택</option>
</select>
</div>
<td><label>접수일</label></td>
<td>
<input type="text" name="search_receipt_date_from" id="search_receipt_date_from" autocomplete="off" value="" class="date_icon" style="width:100px;">~
<input type="text" name="search_receipt_date_to" id="search_receipt_date_to" autocomplete="off" value="" class="date_icon" style="width:100px;">
</td>
<!-- 접수일 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label>접수일</label>
<input type="text" name="search_receipt_date_from" id="search_receipt_date_from" autocomplete="off" value="" class="date_icon" style="width:90px;"> ~
<input type="text" name="search_receipt_date_to" id="search_receipt_date_to" autocomplete="off" value="" class="date_icon" style="width:90px;">
</div>
<!-- 요청납기 -->
<div style="display: flex; align-items: center; gap: 5px;">
<label>요청납기</label>
<input type="text" name="search_req_del_date_from" id="search_req_del_date_from" autocomplete="off" value="" class="date_icon" style="width:90px;"> ~
<input type="text" name="search_req_del_date_to" id="search_req_del_date_to" autocomplete="off" value="" class="date_icon" style="width:90px;">
</div>
</div>
<td><label>요청납기</label></td>
<td>
<input type="text" name="search_req_del_date_from" id="search_req_del_date_from" autocomplete="off" value="" class="date_icon" style="width:120px;">~
<input type="text" name="search_req_del_date_to" id="search_req_del_date_to" autocomplete="off" value="" class="date_icon" style="width:120px;">
</td>
</tr>
</table>
</div>
<!-- 그리드 영역 -->

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

@@ -495,7 +495,7 @@ function fn_purchaseClose(){
<td><label for="project_no">프로젝트번호</label></td>
<td>
<select name="project_no" id="project_no" style="width:260px;" class="select2" autocomplete="off" multiple="multiple">
<select name="project_no" id="project_no" style="width:253px;" class="select2" autocomplete="off" multiple="multiple">
<option value="">선택</option>
${code_map.project_no}
</select>
@@ -509,11 +509,11 @@ function fn_purchaseClose(){
<td><select name="type" id="type" class="select2" autocomplete="off" style="width:130px;"><option value="">선택</option>${code_map.type}</select></td>
--%>
<td><label for="">규격</label></td>
<td><input type="text" name="SEARCH_PART_SPEC" id="SEARCH_PART_SPEC" autocomplete="off" value="${param.SEARCH_PART_SPEC }" style="width:120px;"/></td>
<td><input type="text" name="SEARCH_PART_SPEC" id="SEARCH_PART_SPEC" autocomplete="off" value="${param.SEARCH_PART_SPEC }" style=""/></td>
<td><label for="">품명</label></td>
<td>
<select name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" class="select2-part" style="width:130px;">
<select name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" class="select2-part" style="">
<option value="">품명 선택</option>
</select>
</td>
@@ -527,8 +527,8 @@ function fn_purchaseClose(){
<td class=""><label>입고요청일</label></td>
<td>
<input type="text" name="delivery_start_date" id="delivery_start_date" style="width:90px;" autocomplete="off" value="${param.delivery_start_date}" class="date_icon">~
<input type="text" name="delivery_end_date" id="delivery_end_date" style="width:90px;" autocomplete="off" value="${param.delivery_end_date }" class="date_icon">
<input type="text" name="delivery_start_date" id="delivery_start_date" style="width:120px;" autocomplete="off" value="${param.delivery_start_date}" class="date_icon">~
<input type="text" name="delivery_end_date" id="delivery_end_date" style="width:120px;" autocomplete="off" value="${param.delivery_end_date }" class="date_icon">
</td>
<td class=""><label>발주일</label></td>
@@ -539,7 +539,7 @@ function fn_purchaseClose(){
<td><label for="">입고결과</label></td>
<td>
<select name="delivery_status" id="delivery_status" class="select2" autocomplete="off" style="width:130px;">
<select name="delivery_status" id="delivery_status" class="select2" autocomplete="off" style="">
<option value="">선택</option>
<option value="입고중">입고중</option>
<option value="입고완료">입고완료</option>

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

@@ -265,7 +265,7 @@ function fn_FileRegist(objId, docType, docTypeName){
</td>
<td><label>고객사</label></td>
<td>
<select name="search_customer_objid" id="search_customer_objid" class="select2" autocomplete="off" style="width:180px;">
<select name="search_customer_objid" id="search_customer_objid" class="select2" autocomplete="off" style="width:230px;">
<option value="">전체</option>
${code_map.customer_cd}
</select>

14
WebContent/WEB-INF/view/quality/incomingInspectionList.jsp
View File

@@ -243,7 +243,7 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
<td><label for="">품번</label></td>
<td>
<select name="search_part_no" id="search_part_no" class="select2-part" style="width:170px;">
<select name="search_part_no" id="search_part_no" class="select2-part" style="width:210px;">
<option value="">품번 선택</option>
</select>
<input type="hidden" name="search_part_objid" id="search_part_objid" value="">
@@ -251,7 +251,7 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
<td><label for="">품명</label></td>
<td>
<select name="search_part_name" id="search_part_name" class="select2-part" style="width:170px;">
<select name="search_part_name" id="search_part_name" class="select2-part" style="width:210px;">
<option value="">품명 선택</option>
</select>
</td>
@@ -281,7 +281,7 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
<td><label for="">검사여부</label></td>
<td>
<select name="search_inspection_yn" id="search_inspection_yn" class="select2" autocomplete="off" style="width:120px;">
<select name="search_inspection_yn" id="search_inspection_yn" class="select2" autocomplete="off" style="width:210px;">
<option value="">전체</option>
<option value="검사">검사</option>
<option value="스킵">스킵</option>
@@ -290,7 +290,7 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
<td><label for="">요청현황</label></td>
<td>
<select name="search_request_status" id="search_request_status" class="select2" autocomplete="off" style="width:120px;">
<select name="search_request_status" id="search_request_status" class="select2" autocomplete="off" style="width:140px;">
<option value="">전체</option>
<option value="미요청">미요청</option>
<option value="요청중">요청중</option>
@@ -299,12 +299,12 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
</td>
<td><label for="">요청자</label></td>
<td><select name="request_user_id" id="request_user_id" class="select2" autocomplete="off" style="width:120px;"><option value="">선택</option>${code_map.request_user_id}</select></td>
<td><select name="request_user_id" id="request_user_id" class="select2" autocomplete="off" style="width:140px;"><option value="">선택</option>${code_map.request_user_id}</select></td>
<td class=""><label>요청일</label></td>
<td>
<input type="text" name="request_start_date" id="request_start_date" style="width:100px;" autocomplete="off" value="${param.request_start_date}" class="date_icon">~
<input type="text" name="request_end_date" id="request_end_date" style="width:100px;" autocomplete="off" value="${param.request_end_date }" class="date_icon">
<input type="text" name="request_start_date" id="request_start_date" style="width:120px;" autocomplete="off" value="${param.request_start_date}" class="date_icon">~
<input type="text" name="request_end_date" id="request_end_date" style="width:120px;" autocomplete="off" value="${param.request_end_date }" class="date_icon">
</td>
</tr>
</table>