출하수거관리 html 수정중

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

@@ -20,35 +20,42 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_REQ_DT" class="form-control itp_input" name="serviceDlvReqDt">
-												<option value="A">납품요청일*</option>											
+											<select id="ITP_FORM_INOUTMNG01010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
+												<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_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_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_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_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_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG01010_DELETE_SHMT_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_INOUTMNG01010_SEARCH_SHMT_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_INOUTMNG01010_DELETE_SHMT_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_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG01010_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="width:11%; padding:0px;">
 											<button type="button" id="ITP_FORM_INOUTMNG01010_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_INOUTMNG01010_DELETE_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-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
@@ -74,8 +81,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_" name="" value="">
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_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">
@@ -85,12 +91,14 @@
 											</div>
 											<label class="col-xs-2 itp_lb">납품일자 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
+												<div class="col-xs-7 itp_in">
+													<div class="input-daterange input-group date">
+														<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" 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">
@@ -110,11 +118,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_INOUTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_INOUTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_INOUTMNG01010_DETAIL_jqGrid"></table>
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridPager"></div>
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

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

@@ -17,22 +17,28 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG02010_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_INOUTMNG02010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
+												<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_INOUTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_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_INOUTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_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_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG02010_DELETE_SHMT_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;">
 											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_SHMT_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_INOUTMNG02010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm UPB" 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;">
@@ -41,13 +47,17 @@
 												<option value="">출하상태</option>											
 											</select>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_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_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG02010_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_INOUTMNG02010_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_INOUTMNG02010_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_INOUTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

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

@@ -47,13 +47,15 @@ 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: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
@@ -66,12 +68,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
 		},
 		{
@@ -84,6 +88,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		},
 		{
@@ -96,6 +101,7 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '6', fixed: false, align: 'right',
+			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -124,6 +130,7 @@ const gridColModel = {
 			index: 'EXPRY_YN', name: 'expryYn',
 			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -151,6 +158,7 @@ const gridColModel = {
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -168,7 +176,8 @@ const gridColModel = {
 		{
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		}
 	],
@@ -451,6 +460,8 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_INOUTMNG01010_LIST_CONTAINER').show();
+			$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').show();
+			$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_SRH', '#ITP_BTN_INOUTMNG01010_OUC']);
 			$('#ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'DETAIL') { // 출하지시 상세

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

@@ -31,30 +31,34 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
-			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'shmtReqUnqNo',
 			label: ITP_MSG_LOCALE.label.shmtReqUnqNo,			// 출하지시번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo,			// 발주번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo,			// 발주항번
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_ST_CD', name: 'shmtReqStCd',
 			label: ITP_MSG_LOCALE.label.shmtReqStCd,			// 출하상태코드
+			minwidth: 120,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_PODR_DTL_ST_CD}
@@ -62,55 +66,61 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm,					// 납품장소
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 160,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty,				// 출하수량
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_AMT', name: 'shmtAmt',
 			label: ITP_MSG_LOCALE.label.shmtAmt,				// 출하금액
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
+			minwidth: 80,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_QTY', name: 'whsQty',
 			label: ITP_MSG_LOCALE.label.whsQty,					// 입고수량
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_AMT', name: 'whsAmt',
 			label: ITP_MSG_LOCALE.label.whsAmt,					// 입고금액
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
 			label: ITP_MSG_LOCALE.label.whsCnfmNm,				// 입고확인자
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_DT', name: 'whsDt',
 			label: ITP_MSG_LOCALE.label.whsDt,					// 입고일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{