공급사 수거관리 html 수정

src/main/webapp/app/collmng/COLLMNG01010.html

@@ -19,7 +19,9 @@
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_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_COLLMNG01010_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">
@@ -36,12 +38,16 @@
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
 											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" readonly/>
 											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
-										</div>
+												<span class="input-group-btn">
+													<button id="ITP_BTN_COLLMNG01010_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_COLLMNG01010_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_COLLMNG01010_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_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
@@ -67,8 +73,7 @@
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_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>
@@ -87,9 +92,7 @@
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">수거장소</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-3 itp_in fnRtnWhsNm"></div>
-											</div>
+											<div class="col-xs-4 itp_ip fnRtnWhsNm"></div>
 											<label class="col-xs-2 itp_lb">수거 총 금액</label>
 											<div class="col-xs-4 itp_ip fnRtnDodrTotalAmt"></div>
 										</div>
@@ -103,11 +106,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_COLLMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-											<div id="ITP_COLLMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
 											<table id="ITP_COLLMNG01010_DETAIL_jqGrid"></table>
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridPager"></div>
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/collmng/COLLMNG02010.html

@@ -21,7 +21,9 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>수거 요청일 *</label>
+											<select id="ITP_FORM_COLLMNG02010_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">
@@ -30,13 +32,17 @@
 												<input type="text" id="ITP_FORM_COLLMNG02010_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_COLLMNG02010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
-											<input type="hidden" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
-										</div>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
+												<input type="hidden" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_COLLMNG02010_DELETE_RTN_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:8%;">
 											<button type="button" id="ITP_BTN_COLLMNG02010_SEARCH_RTN_WHS_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_COLLMNG02010_DELETE_RTN_WHS_ID" 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">
 											<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
@@ -65,8 +71,7 @@
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_RTN_lOCATION" class="form-control itp_input" name="rtnLocation"  />
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_SPPLY_ID" class="form-control itp_input" name="spplyId"  />
 								<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>
@@ -80,7 +85,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_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="" readonly>
 													</div>
 												</div>
 											</div>
@@ -113,11 +118,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_COLLMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_COLLMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_COLLMNG02010_DETAIL_jqGrid"></table>
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridPager"></div>
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/collmng/COLLMNG03010.html

@@ -20,8 +20,10 @@
 								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
- 											<label>수거일자 *</label>
-										</div>										
+ 											<select id="ITP_FORM_COLLMNG03010_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">
 												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
@@ -29,13 +31,17 @@
 												<input type="text" id="ITP_FORM_COLLMNG03010_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_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" readonly/>
-											<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" />
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" readonly/>
+												<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_COLLMNG03010_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:8%;">
 											<button type="button" id="ITP_BTN_COLLMNG03010_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_COLLMNG03010_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_COLLMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />

src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -66,6 +66,7 @@ const gridColModel = {
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
 			width: '10', fixed: false, align: 'left',
+			minwidth: 240,
 			sortable: false, hidden: false
 		},
 		{
@@ -84,7 +85,7 @@ const gridColModel = {
 		{
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
-			width: '7', fixed: false, align: 'left',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
 	],

src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -67,6 +67,7 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '10', fixed: false, align: 'center',
+			minwidth: 150,
 			sortable: false, hidden: false
 		},
 		{
@@ -85,6 +86,7 @@ const gridColModel = {
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
 			width: '15', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		},
 		{
@@ -167,12 +169,13 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			editrules: { required: true, number: true },
+			classes: 'input_color',
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
-			width: '10', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -311,6 +314,7 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_COLLMNG02010_LIST_CONTAINER').show();
+			$('#ITP_BTN_COLLMNG02010_DELETE_RTN_WHS_ID').show();
 			fn_show_btn_auth_array(['#ITP_BTN_COLLMNG02010_SRH', '#ITP_BTN_COLLMNG02010_CUDW']);
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SSPPLY_ID').val(fn_make_user_info.get('spplyId'));

src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -36,60 +36,70 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
 			label: ITP_MSG_LOCALE.label.colPickUnqNo,		// 수거서번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 160,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PICK_ST_NM', name: 'pickStNm',
 			label: ITP_MSG_LOCALE.label.pickStNm,			// 수거서상태
-			width: '6', fixed: false, align: 'left',
+			width: '6', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_REQ_DT', name: 'colRegDt',
 			label: ITP_MSG_LOCALE.label.colRegDt,			// 수거일자
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_REQ_DT', name: 'colReqDt',
 			label: ITP_MSG_LOCALE.label.colReqDt,			// 수거요청일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_SCH_DT', name: 'colSchDt',
 			label: ITP_MSG_LOCALE.label.colSchDt,			// 수거예정일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,				// 품목번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
 			width: '8', fixed: false, align: 'left',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_REQ_QTY', name: 'colReqQty',
 			label: ITP_MSG_LOCALE.label.colReqQty,			// 수거수량
 			width: '5', fixed: false, align: 'right',
+			minwidth: 80,
 			sortable: false, hidden: false
 		},		
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -110,18 +120,20 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
 			width: '10', fixed: false, align: 'left',
+			minwidth: 240,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
 			label: ITP_MSG_LOCALE.label.pickMgrNm,			// 수거담당자
-			width: '10', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
 			label: ITP_MSG_LOCALE.label.pickMgrTelNo,		// 수거담당자연락처
 			width: '9', fixed: false, align: 'center',
+			minwidth: 160,
 			sortable: false, hidden: false
 		}
 	],

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

@@ -37,13 +37,14 @@ const gridColModel = {
 				index: 'Brand_Nm', name: 'brandNm',			//정렬가능 여부,화면표시 여부
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
-				minwidht: 120,								//최소가로넓이 설정
+				minwidth: 120,								//최소가로넓이 설정
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부	
 			},
 			{
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',	//서버로 전송시 데이터 명 , 데이터명
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		//납품서번호
 				width: '20', fixed: false, align: 'center',		// cell가로넓이,고정 여부 ,text정렬 
+				minwidth: 120,
 				sortable: false, hidden: false					//정렬가능 여부,화면표시 여부
 			},
 			{