재고관리 html 수정

src/main/webapp/app/stockmng/STOCKMNG02010.html

@@ -27,7 +27,7 @@
 													<option value="">실사기준일</option>											
 												</select>
 											</div>
-											<div class="col-xs-3 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="input-daterange input-group date">
 													<input type="text" id="ITP_FORM_STOCKMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 													<span class="input-group-addon itp_date_to">~</span>
@@ -77,14 +77,16 @@
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" disabled="disabled"></select>	
 											</div>
-											<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" disabled="disabled"></select>										
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DVSN" data-select-code="CDD_DVSN" class="form-control itp_input" name="cddDvsn"></select>										
 											</div>
-											<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="col-xs-a itp_ip itp_noMar">
 												<input id="ITP_FORM_STOCKMNG02010_DETAIL_EXCEL_UPLOAD_SELECT_FILE" type="file" style="display:none;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
+											</div>
+											<div class="col-xs-4 itp_ip itp_noMar">
 												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_EXCEL_UPLOAD" class="btn btn-warning btn-sm FFB"><i class="glyphicon "></i>&nbsp;&nbsp;엑셀업로드&nbsp;&nbsp;</button>
 												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_TEMPLATE_DOWNLOAD" class="btn btn-primary btn-sm FFB"><i class="glyphicon "></i>&nbsp;&nbsp;템플릿다운로드&nbsp;&nbsp;</button>
 											</div>
@@ -116,8 +118,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_CDD_ID" name="cddId" 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">

src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -55,8 +55,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" 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">
@@ -98,12 +97,16 @@
 				                        <div class="form-group">
 				                            <label class="col-xs-2 itp_lb">매장명</label>
 				                            <div class="col-xs-4 itp_ip">
-				                                <div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
+												<div class="col-xs-6 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
+														<span class="input-group-btn">
+															<button id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
 													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 				                            </div>
 				                            <label class="col-xs-2 itp_lb">등록일시</label>
@@ -143,7 +146,7 @@
 				        </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">Location 정보</h4>
 					        <div class="pull-right itp_cicon">
 					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
@@ -151,7 +154,6 @@
 					        </div>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -168,8 +170,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" 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">
@@ -220,11 +221,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">Location 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_VIEW_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_STOCKMNG04010_VIEW_jqGrid"></table>
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridPager"></div>
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/js/app/stockmng/ITP_STOCKMNG02010.js

@@ -204,6 +204,7 @@ const gridColModel = {
 			label: "정상여부",
 			width: '5', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 100,
 			editrules: {required: false}
 		},
 		{
@@ -216,7 +217,7 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: "브랜드",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
@@ -230,15 +231,16 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 100,
 			editrules: {required: false}
 		},
 		{

src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -61,13 +61,13 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -79,7 +79,7 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -111,14 +111,14 @@ const gridColModel = {
 		{
 			index: 'LOCATION', name: 'location',
 			label: "로케이션",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: true}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "로케이션명",
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
 			sortable: true, editable: false, edittype: 'text',
 			editrules: {required: true}
 		},
@@ -145,14 +145,15 @@ const gridColModel = {
 		{
 			index: 'LOCATION', name: 'location',
 			label: "로케이션",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "로케이션명",
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
+			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}
 		},
@@ -162,6 +163,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_STCK_DVSN},
+			classes: 'input_color',
 			editrules: {required: true}
 		},
 		{
@@ -170,6 +172,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_LOC_ST_CD},
+			classes: 'input_color',
 			editrules: {required: true}
 		}
 	]