출하수거 관리 html 수정

src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -25,32 +25,38 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG03010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
 											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_WHS_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_INOUTMNG03010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										
-										
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
 											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_RTN_WHS_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_INOUTMNG03010_DELETE_RTN_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-3 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>
@@ -74,8 +80,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_" name="" value="">
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
 								<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">
@@ -87,12 +92,12 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
 													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
+														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="" readonly>
 													</div>
 												</div>
 											</div>
 										</div>
-										<div class="form-group border">
+										<div class="form-group">
 											<label class="col-xs-2 itp_lb">수거담당자 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
@@ -112,11 +117,10 @@
 						</div>
 					</div>
 					<div class="itp_table fix">
-						<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_INOUTMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_INOUTMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_INOUTMNG03010_DETAIL_jqGrid"></table>
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridPager"></div>
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG04010.html

@@ -23,18 +23,22 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장" />
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장"/>
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장"/>
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG04010_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_INOUTMNG04010_DELETE_RTN_WHS_ID" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -43,13 +47,17 @@
 												<option value="">수거상태</option>											
 											</select>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG04010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG04010_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_INOUTMNG04010_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-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -61,7 +61,7 @@ const gridColModel = {
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -46,19 +46,21 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, //반품발주항번
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
@@ -77,12 +79,14 @@ const gridColModel = {
 			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: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -100,7 +104,7 @@ const gridColModel = {
 		{
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
-			width: '15', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -108,6 +112,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '6', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 60,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
@@ -180,6 +185,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -446,6 +452,8 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_INOUTMNG03010_LIST_CONTAINER').show();
+			$('#ITP_FORM_INOUTMNG03010_DELETE_WHS_NM').show();
+			$('#ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_SRH', '#ITP_BTN_INOUTMNG03010_CUC']);
 			$('#ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'DETAIL') { // 출하지시 상세

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -38,30 +38,35 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'colCmdUnqNo',
 			label: ITP_MSG_LOCALE.label.colCmdUnqNo,			// 수거지시번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'colCmdDtlNo',
 			label: ITP_MSG_LOCALE.label.colCmdDtlNo,			// 수거지시항번
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo,			// 반품발주번호
 			width: '8', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo,			// 반품발주항번
 			width: '8', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -75,18 +80,21 @@ const gridColModel = {
 			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: '10', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_NM', name: 'rtnWhsNm',
-			label: ITP_MSG_LOCALE.label.rtnWhsNm,					// 반품장소
+			label: ITP_MSG_LOCALE.label.rtnWhsNm,			// 반품장소
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false
 		},
 		{
@@ -98,7 +106,7 @@ const gridColModel = {
 		},
 		{
 			index: 'WHS_QTY', name: 'colQty',
-			label: ITP_MSG_LOCALE.label.colQty,					// 수거수량
+			label: ITP_MSG_LOCALE.label.colQty,		// 수거수량
 			width: '8', fixed: false, align: 'rigth',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -107,6 +115,7 @@ const gridColModel = {
 			index: 'SHMT_AMT', name: 'colAmt',
 			label: ITP_MSG_LOCALE.label.colAmt,				// 수거금액
 			width: '8', fixed: false, align: 'rigth',
+			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -114,12 +123,14 @@ const gridColModel = {
 			index: 'WHS_DT', name: 'colDt',
 			label: ITP_MSG_LOCALE.label.colDt,					// 수거일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'colCnfmNm',
 			label: ITP_MSG_LOCALE.label.colCnfmNm,				// 수거확인자
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -199,6 +210,8 @@ let pageObj = {
         if(mode == 'LIST') { // 목록
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG04010_PRINT', '#ITP_BTN_INOUTMNG04010_SRH']);
             $('#ITP_AJAX_INOUTMNG04010_LIST_CONTAINER').show();
+            $('#ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID').show();
+            $('#ITP_BTN_INOUTMNG04010_DELETE_WHS_ID').show();
             $('#ITP_FORM_INOUTMNG04010_SEARCH #ITP_FORM_INOUTMNG04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
         } 
     },