공급사 수주관리 수정

src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -22,7 +22,9 @@
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>수주일지</label>
+											<select id="ITP_FORM_ORDMNG01010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">수주일자</option>											
+											</select>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -39,12 +41,16 @@
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소 (매장/창고)" readonly/>
-											<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId"/>
-										</div>
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소 (매장/창고)" readonly/>
+												<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId"/>
+												<span class="input-group-btn">
+													<button id="ITP_BTN_ORDMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
+										</div>	
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
 											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_ORDMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-5 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
@@ -70,8 +76,7 @@
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">구매 발주 상세</h4>
-									<div class="itp_form_in">	
+									<div class="itp_form_in border-top">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -106,11 +111,10 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
+										<div class="itp_table_head fix" style="background:#fff;">
 											<h4 class="itp_table_tit">발주 품목</h4>
 										</div>
 										<div id="ITP_ORDMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_ORDMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_ORDMNG01010_VIEW_jqGrid"></table>
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridPager"></div>
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/ordmng/ORDMNG02010.html

@@ -22,7 +22,9 @@
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>납품요청일 *</label>
+											<select id="ITP_FORM_ORDMNG02010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">납품요청일</option>											
+											</select>
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -31,13 +33,17 @@
 												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_in itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거창고/매장" readonly/>
-											<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
-										</div>
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거창고/매장" readonly/>
+												<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
+												<span class="input-group-btn">
+													<button id="ITP_BTN_ORDMNG02010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
+										</div>	
+										<div class="col-xs-1 itp_in" style="padding: 0px; width:5%;">
 											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_ORDMNG02010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
@@ -64,8 +70,7 @@
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID" name="brandId" value="">
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_SPPLY_ID" name="spplyId" value="">
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">구매 발주 상세</h4>
-									<div class="itp_form_in">	
+									<div class="itp_form_in border-top">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -97,7 +102,7 @@
 											<div class="input-daterange input-group date">
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
-														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="">
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="" readonly>
 													</div>
 												</div>
 											</div>											
@@ -122,11 +127,10 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
+										<div class="itp_table_head fix" style="background:#fff;">
 											<h4 class="itp_table_tit">발주 품목</h4>
 										</div>
 										<div id="ITP_ORDMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
-											<div id="ITP_ORDMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
 											<table id="ITP_ORDMNG02010_DETAIL_jqGrid"></table>
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridPager"></div>
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -18,7 +18,9 @@
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>납품예정일자</label>
+											<select id="ITP_FORM_ORDMNG03010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">납품예정일자</option>											
+											</select>
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -27,15 +29,19 @@
 												<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT" class="form-control itp_input" name="toDt" value="2022.12.31" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_in itp_noMar">
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소(매장/창고)" readonly/>
 											<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" />
-										</div>
+												<span class="input-group-btn">
+													<button id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
+										</div>	
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
 											<button type="button" id="ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-4 itp_ip itp_noMar">
+										<div class="col-xs-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
 										</div>
 									</div>

src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -73,6 +73,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, 				//납품장소
 			width: '11', fixed: false, align: 'left',
+			minwidht: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -98,12 +99,14 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, 			//단가
 			width: '3', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth:80,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'PODR_AMT', name: 'podrAmt',
 			label: ITP_MSG_LOCALE.label.podrAmt, 			//발주금액
 			width: '4', fixed: false, align: 'right',
+			minwidth:80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		}
@@ -487,6 +490,7 @@ let modifyObj = {
 						index: 'ITEM_ID', name: 'itemId',
 						label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
 						width: '10', fixed: false, align: 'center',
+						minwidth: 100,
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
@@ -523,6 +527,7 @@ let modifyObj = {
 						label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
 						width: '8', fixed: false, align: 'right',
 						sortable: false, hidden: false, edittype: 'text',
+						classes: 'input_color',
 						editable: true, editrules: {number: true, custom: true, custom_func: shmtQtyValue}
 					},
 					{
@@ -537,6 +542,7 @@ let modifyObj = {
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
 						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, 
+						classes: 'input_color',
 						editable: true, sorttype: 'date',
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
 				        editrules: {custom: true, custom_func: isExpryDate}
@@ -545,6 +551,7 @@ let modifyObj = {
 						index: 'REMARK', name: 'deliDesc',				//API 비고 키
 						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
 						width: '10', fixed: false, align: 'center',
+						classes: 'input_color',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: true
 					},

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -37,6 +37,7 @@ const gridColModel = {
 				index: 'Brand_Nm', name: 'brandNm',			//정렬가능 여부,화면표시 여부
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
+				minwidht: 120,								//최소가로넓이 설정
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부	
 			},
 			{
@@ -255,6 +256,7 @@ let listObj = {
 		init: function () {
 				// 데이터 없을때
 			this.search();//search 불러오기
+			itp_fn_jqgrid_resize(ORDMNG03010_GRID_ID, ORDMNG03010_GRID_LIST, 'lg');
 		},
 		colModel: gridColModel.list,	//컬럼정보
 		search: function() {