Browse Source

Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

yhl88 2 years ago
parent
commit
88b0c9f6d4

+ 10 - 10
src/main/webapp/app/popup/biz/BIZPOP_PO_STOCK_PROC.html

@@ -18,35 +18,35 @@
18
 							
18
 							
19
 								<div class="form-group">
19
 								<div class="form-group">
20
 									<label class="col-xs-2 itp_lb">창고명</label>
20
 									<label class="col-xs-2 itp_lb">창고명</label>
21
-									<div class="col-xs-4 itp_ip fnWhsNm"></div>
21
+									<div class="col-xs-3 col_3 itp_ip fnWhsNm"></div>
22
 									<label class="col-xs-2 itp_lb">로케이션</label>
22
 									<label class="col-xs-2 itp_lb">로케이션</label>
23
-									<div class="col-xs-4 itp_ip fnLocationNm"></div>
23
+									<div class="col-xs-3 col_3 itp_ip fnLocationNm"></div>
24
 								</div>
24
 								</div>
25
 								<div class="form-group">
25
 								<div class="form-group">
26
 									<label class="col-xs-2 itp_lb">품목번호</label>
26
 									<label class="col-xs-2 itp_lb">품목번호</label>
27
-									<div class="col-xs-4 itp_ip fnItemId"></div>
27
+									<div class="col-xs-4 col_3 itp_ip fnItemId"></div>
28
 									<label class="col-xs-2 itp_lb">품목명</label>
28
 									<label class="col-xs-2 itp_lb">품목명</label>
29
-									<div class="col-xs-4 itp_ip fnItemNm"></div>
29
+									<div class="col-xs-4 col_3 itp_ip fnItemNm"></div>
30
 								</div>
30
 								</div>
31
 								<div class="form-group border">
31
 								<div class="form-group border">
32
 									<label class="col-xs-2 itp_lb">현재고</label>
32
 									<label class="col-xs-2 itp_lb">현재고</label>
33
-									<div class="col-xs-4 itp_ip fnStckQty"></div>
33
+									<div class="col-xs-4 col_3 itp_ip fnStckQty"></div>
34
 									<label class="col-xs-2 itp_lb">관리등급</label>
34
 									<label class="col-xs-2 itp_lb">관리등급</label>
35
-									<div class="col-xs-4 itp_ip"></div>
35
+									<div class="col-xs-4 col_3 itp_ip"></div>
36
 								</div>
36
 								</div>
37
 								<div class="form-group">
37
 								<div class="form-group">
38
 									<label class="col-xs-2 itp_lb">창고선택</label>
38
 									<label class="col-xs-2 itp_lb">창고선택</label>
39
-									<div class="col-xs-4 itp_ip">
39
+									<div class="col-xs-4 col_3 itp_ip">
40
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
40
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
41
 									</div>
41
 									</div>
42
 									<label class="col-xs-2 itp_lb">Location</label>
42
 									<label class="col-xs-2 itp_lb">Location</label>
43
-									<div class="col-xs-4 itp_ip">
43
+									<div class="col-xs-4 col_3 itp_ip">
44
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
44
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
45
 									</div>
45
 									</div>
46
 								</div>
46
 								</div>
47
 								<div class="form-group colspan">
47
 								<div class="form-group colspan">
48
-									<label class="col-xs-2 itp_lb">이동수량</label>
49
-									<div class="col-xs-4 itp_ip">
48
+									<label class="col-xs-2 itp_lb colspan">이동수량</label>
49
+									<div class="col-xs-4 col_3 itp_ip">
50
 									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" />
50
 									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" />
51
 									</div>									
51
 									</div>									
52
 								</div>								
52
 								</div>								

+ 11 - 3
src/main/webapp/app/stinfo/STINFO02010.html

@@ -245,18 +245,26 @@
245
 										<div class="itp_form_in">
245
 										<div class="itp_form_in">
246
 											<div class="form-group">
246
 											<div class="form-group">
247
 												<label class="col-xs-2 itp_lb">매장계좌정보 *</label>
247
 												<label class="col-xs-2 itp_lb">매장계좌정보 *</label>
248
-												<div class="col-xs-12 itp_ip">
249
-													<div class="col-xs-2 itp_in">
248
+												<div class="col-xs-4 itp_ip">
249
+													<div class="col-xs-4 itp_in">
250
 														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
250
 														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
251
 														</select>
251
 														</select>
252
 													</div>
252
 													</div>
253
 													<div class="col-xs-4 itp_in">
253
 													<div class="col-xs-4 itp_in">
254
 														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
254
 														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
255
 													</div>
255
 													</div>
256
-													<div class="col-xs-2 itp_in">
256
+													<div class="col-xs-3 itp_in">
257
 														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
257
 														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
258
 													</div>
258
 													</div>
259
 												</div>
259
 												</div>
260
+												<label class="col-xs-2 itp_lb">오픈일</label>
261
+												<div class="col-xs-4 itp_ip">
262
+													<div class="col-xs-7 itp_in">
263
+														<div class="input-daterange input-group date itp_in">
264
+															<input type="text" id="ITP_FORM_STINFO02010_DETAIL_FROM_DT" class="form-control itp_input" name="openDt" value="" readonly>
265
+														</div>
266
+													</div>
267
+												</div>
260
 											</div>
268
 											</div>
261
 										</div>
269
 										</div>
262
 										<div class="itp_form_in">
270
 										<div class="itp_form_in">

+ 6 - 5
src/main/webapp/app/stockmng/STOCKMNG02010.html

@@ -27,7 +27,7 @@
27
 													<option value="">실사기준일</option>											
27
 													<option value="">실사기준일</option>											
28
 												</select>
28
 												</select>
29
 											</div>
29
 											</div>
30
-											<div class="col-xs-3 itp_ip">
30
+											<div class="col-xs-4 itp_ip">
31
 												<div class="input-daterange input-group date">
31
 												<div class="input-daterange input-group date">
32
 													<input type="text" id="ITP_FORM_STOCKMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
32
 													<input type="text" id="ITP_FORM_STOCKMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
33
 													<span class="input-group-addon itp_date_to">~</span>
33
 													<span class="input-group-addon itp_date_to">~</span>
@@ -77,14 +77,16 @@
77
 											<div class="col-xs-2 itp_ip itp_noMar">
77
 											<div class="col-xs-2 itp_ip itp_noMar">
78
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" disabled="disabled"></select>	
78
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" disabled="disabled"></select>	
79
 											</div>
79
 											</div>
80
-											<div class="col-xs-3 itp_ip itp_noMar">
80
+											<div class="col-xs-2 itp_ip itp_noMar">
81
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" disabled="disabled"></select>										
81
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" disabled="disabled"></select>										
82
 											</div>
82
 											</div>
83
 											<div class="col-xs-2 itp_ip itp_noMar">
83
 											<div class="col-xs-2 itp_ip itp_noMar">
84
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DVSN" data-select-code="CDD_DVSN" class="form-control itp_input" name="cddDvsn"></select>										
84
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DVSN" data-select-code="CDD_DVSN" class="form-control itp_input" name="cddDvsn"></select>										
85
 											</div>
85
 											</div>
86
-											<div class="col-xs-3 itp_ip itp_noMar">
86
+											<div class="col-xs-a itp_ip itp_noMar">
87
 												<input id="ITP_FORM_STOCKMNG02010_DETAIL_EXCEL_UPLOAD_SELECT_FILE" type="file" style="display:none;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
87
 												<input id="ITP_FORM_STOCKMNG02010_DETAIL_EXCEL_UPLOAD_SELECT_FILE" type="file" style="display:none;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
88
+											</div>
89
+											<div class="col-xs-4 itp_ip itp_noMar">
88
 												<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>
90
 												<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>
89
 												<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>
91
 												<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>
90
 											</div>
92
 											</div>
@@ -116,8 +118,7 @@
116
 				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_CDD_ID" name="cddId" value="">
118
 				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_CDD_ID" name="cddId" value="">
117
 				    
119
 				    
118
 				                <section class="itp_form_sec">
120
 				                <section class="itp_form_sec">
119
-				                    <h4 class="itp_form_tit">재고실사 정보</h4>
120
-				                    <div class="itp_form_in">
121
+				                    <div class="itp_form_in border-top">
121
 				                        <div class="form-group">
122
 				                        <div class="form-group">
122
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
123
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
123
 				                                <div class="col-xs-4 itp_ip">
124
 				                                <div class="col-xs-4 itp_ip">

+ 11 - 11
src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -55,8 +55,7 @@
55
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" value="">
55
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" value="">
56
 				    
56
 				    
57
 				                <section class="itp_form_sec">
57
 				                <section class="itp_form_sec">
58
-				                    <h4 class="itp_form_tit">브랜드 정보</h4>
59
-				                    <div class="itp_form_in">
58
+				                    <div class="itp_form_in border-top">
60
 				                        <div class="form-group">
59
 				                        <div class="form-group">
61
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
60
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
62
 				                                <div class="col-xs-4 itp_ip">
61
 				                                <div class="col-xs-4 itp_ip">
@@ -98,12 +97,16 @@
98
 				                        <div class="form-group">
97
 				                        <div class="form-group">
99
 				                            <label class="col-xs-2 itp_lb">매장명</label>
98
 				                            <label class="col-xs-2 itp_lb">매장명</label>
100
 				                            <div class="col-xs-4 itp_ip">
99
 				                            <div class="col-xs-4 itp_ip">
101
-				                                <div class="col-xs-5 itp_in">
102
-													<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
100
+												<div class="col-xs-6 itp_in">
101
+													<div class="input-group">
102
+														<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
103
+														<span class="input-group-btn">
104
+															<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>
105
+														</span>
106
+													</div>
103
 												</div>
107
 												</div>
104
 												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
108
 												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
105
 													<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>
109
 													<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>
106
-													<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>
107
 								                </div>
110
 								                </div>
108
 				                            </div>
111
 				                            </div>
109
 				                            <label class="col-xs-2 itp_lb">등록일시</label>
112
 				                            <label class="col-xs-2 itp_lb">등록일시</label>
@@ -143,7 +146,7 @@
143
 				        </div>
146
 				        </div>
144
 				    </div>
147
 				    </div>
145
 				    <div class="itp_table fix">
148
 				    <div class="itp_table fix">
146
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
149
+					    <div class="itp_table_head fix" style="background:#fff;">
147
 					        <h4 class="itp_table_tit">Location 정보</h4>
150
 					        <h4 class="itp_table_tit">Location 정보</h4>
148
 					        <div class="pull-right itp_cicon">
151
 					        <div class="pull-right itp_cicon">
149
 					            <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>
152
 					            <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 @@
151
 					        </div>
154
 					        </div>
152
 					    </div>
155
 					    </div>
153
 					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
156
 					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
154
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
155
 					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
157
 					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
156
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
158
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
157
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
159
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -168,8 +170,7 @@
168
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" value="">
170
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" value="">
169
 				    
171
 				    
170
 				                <section class="itp_form_sec">
172
 				                <section class="itp_form_sec">
171
-				                    <h4 class="itp_form_tit">브랜드 정보</h4>
172
-				                    <div class="itp_form_in">
173
+				                    <div class="itp_form_in border-top">
173
 				                        <div class="form-group">
174
 				                        <div class="form-group">
174
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
175
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
175
 				                                <div class="col-xs-4 itp_ip">
176
 				                                <div class="col-xs-4 itp_ip">
@@ -220,11 +221,10 @@
220
 				        </div>
221
 				        </div>
221
 				    </div>
222
 				    </div>
222
 				    <div class="itp_table fix">
223
 				    <div class="itp_table fix">
223
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
224
+					    <div class="itp_table_head fix" style="background:#fff;">
224
 					        <h4 class="itp_table_tit">Location 정보</h4>
225
 					        <h4 class="itp_table_tit">Location 정보</h4>
225
 					    </div>
226
 					    </div>
226
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
227
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
227
-					        <div id="ITP_STOCKMNG04010_VIEW_jqGridView" class="itp_views fix"></div>
228
 					        <table id="ITP_STOCKMNG04010_VIEW_jqGrid"></table>
228
 					        <table id="ITP_STOCKMNG04010_VIEW_jqGrid"></table>
229
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridPager"></div>
229
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridPager"></div>
230
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>
230
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>

+ 6 - 4
src/main/webapp/css/style.css

@@ -587,13 +587,14 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
587
 #ITP_ASIDE .itp_modal .modal-title {font-size:16px; color:#fff;}
587
 #ITP_ASIDE .itp_modal .modal-title {font-size:16px; color:#fff;}
588
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
588
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
589
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}
589
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}
590
-#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:60px; border-bottom:1px solid #aaa;}
590
+#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:45px; border-bottom:1px solid #aaa;}
591
+#ITP_ASIDE .itp_modal .itp_form .colspan {height:60px !important;}
591
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
592
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
592
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
593
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
593
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
594
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
594
-#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:58px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa;}
595
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
595
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
596
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
596
-#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 0 0 10px;;}
597
+#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 10px 0 10px;;}
597
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}
598
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}
598
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_noMar {margin-right:0; padding-right:0px;}
599
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_noMar {margin-right:0; padding-right:0px;}
599
 #ITP_ASIDE .itp_modal .itp_form .itp_ip_offset {padding-left:15px;}
600
 #ITP_ASIDE .itp_modal .itp_form .itp_ip_offset {padding-left:15px;}
@@ -650,7 +651,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
650
     -o-transform:translate(0, calc(50vh - 50%));
651
     -o-transform:translate(0, calc(50vh - 50%));
651
     transform:translate(0, 50vh) translate(0, -50%);
652
     transform:translate(0, 50vh) translate(0, -50%);
652
 }
653
 }
653
-#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding:0; border:1px solid #aaa;}
654
+#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding:0; border:1px solid #aaa; border-left:none;}
654
 #ITP_ASIDE .itp_modal .itp_madal_header {padding-left:15px; border-bottom:1px solid #aaa;}
655
 #ITP_ASIDE .itp_modal .itp_madal_header {padding-left:15px; border-bottom:1px solid #aaa;}
655
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_help {font-size:12px; padding-top:6px;}
656
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_help {font-size:12px; padding-top:6px;}
656
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_txt {font-size:13px; width:auto; padding:5px 10px 0 0;}
657
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_txt {font-size:13px; width:auto; padding:5px 10px 0 0;}
@@ -704,6 +705,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
704
 #ITP_ASIDE .itp_modal .modal-bottom {border-top:1px solid #aaa; height:50px; display:flex;}
705
 #ITP_ASIDE .itp_modal .modal-bottom {border-top:1px solid #aaa; height:50px; display:flex;}
705
 #ITP_ASIDE .itp_modal .modal-bottom .col_3 {width:40%; hegith:50px;}
706
 #ITP_ASIDE .itp_modal .modal-bottom .col_3 {width:40%; hegith:50px;}
706
 #ITP_ASIDE .itp_modal .modal-bottom .col_7 {width:60%; height:50px;}
707
 #ITP_ASIDE .itp_modal .modal-bottom .col_7 {width:60%; height:50px;}
708
+#ITP_ASIDE .form-group .col_3 {width:32%;}
707
 #ITP_NOT_FOUND {width:100%; height:100%;}
709
 #ITP_NOT_FOUND {width:100%; height:100%;}
708
 #ITP_NOT_FOUND .itp_head {margin-bottom:8px; letter-spacing:-1px;}
710
 #ITP_NOT_FOUND .itp_head {margin-bottom:8px; letter-spacing:-1px;}
709
 #ITP_NOT_FOUND .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}
711
 #ITP_NOT_FOUND .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}

+ 19 - 8
src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -44,42 +44,49 @@ const gridColModel = {
44
 			index: 'BRAND_NM', name: 'brandNm',
44
 			index: 'BRAND_NM', name: 'brandNm',
45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
46
 			width: '10', fixed: false, align: 'center',
46
 			width: '10', fixed: false, align: 'center',
47
+			minwidth: 120,
47
 			sortable: false, hidden: false
48
 			sortable: false, hidden: false
48
 		},
49
 		},
49
 		{
50
 		{
50
 			index: 'STORE_NM', name: 'storeNm',
51
 			index: 'STORE_NM', name: 'storeNm',
51
 			label: "매장명", 
52
 			label: "매장명", 
52
-			width: '10', fixed: false, align: 'center',
53
+			width: '10', fixed: false, align: 'left',
54
+			minwidth: 100,
53
 			sortable: false, hidden: false
55
 			sortable: false, hidden: false
54
 		},
56
 		},
55
 		{
57
 		{
56
 			index: 'WHS_ID', name: 'whsId',
58
 			index: 'WHS_ID', name: 'whsId',
57
 			label: "창고번호", 
59
 			label: "창고번호", 
58
 			width: '8', fixed: false, align: 'center',
60
 			width: '8', fixed: false, align: 'center',
61
+			minwidth: 100,
59
 			sortable: false, hidden: false
62
 			sortable: false, hidden: false
60
 		},
63
 		},
61
 		{
64
 		{
62
 			index: 'WHS_NM', name: 'whsNm',
65
 			index: 'WHS_NM', name: 'whsNm',
63
 			label: "창고명", 
66
 			label: "창고명", 
64
-			width: '13', fixed: false, align: 'center',
67
+			width: '13', fixed: false, align: 'left',
68
+			minwidth: 120,
65
 			sortable: false, hidden: false
69
 			sortable: false, hidden: false
66
 		},
70
 		},
67
 		{
71
 		{
68
 			index: 'LOCATION_NM', name: 'locationNm',
72
 			index: 'LOCATION_NM', name: 'locationNm',
69
 			label: "Location명", 
73
 			label: "Location명", 
70
-			width: '10', fixed: false, align: 'center',
74
+			width: '10', fixed: false, align: 'left',
75
+			minwidth: 140,
71
 			sortable: false, hidden: false
76
 			sortable: false, hidden: false
72
 		},
77
 		},
73
 		{
78
 		{
74
 			index: 'ITEM_ID', name: 'itemId',
79
 			index: 'ITEM_ID', name: 'itemId',
75
 			label: "품목번호", 
80
 			label: "품목번호", 
76
 			width: '11', fixed: false, align: 'center',
81
 			width: '11', fixed: false, align: 'center',
82
+			minwidth: 180,
77
 			sortable: false, hidden: false
83
 			sortable: false, hidden: false
78
 		},
84
 		},
79
 		{
85
 		{
80
 			index: 'ITEM_NM', name: 'itemNm',
86
 			index: 'ITEM_NM', name: 'itemNm',
81
 			label: "품목명", 
87
 			label: "품목명", 
82
-			width: '10', fixed: false, align: 'center',
88
+			width: '10', fixed: false, align: 'left',
89
+			minwidth: 110,
83
 			sortable: false, hidden: false
90
 			sortable: false, hidden: false
84
 		},
91
 		},
85
 		{
92
 		{
@@ -91,25 +98,29 @@ const gridColModel = {
91
 		{
98
 		{
92
 			index: 'STCK_QTY', name: 'stckQty',
99
 			index: 'STCK_QTY', name: 'stckQty',
93
 			label: "현재고수량", 
100
 			label: "현재고수량", 
94
-			width: '8', fixed: false, align: 'center',
101
+			width: '8', fixed: false, align: 'right',
102
+			minwidth: 100,
95
 			sortable: false, hidden: false
103
 			sortable: false, hidden: false
96
 		},
104
 		},
97
 		{
105
 		{
98
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
106
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
99
 			label: "적정재고수량", 
107
 			label: "적정재고수량", 
100
-			width: '8', fixed: false, align: 'center',
108
+			width: '8', fixed: false, align: 'right',
109
+			minwidth: 100,
101
 			sortable: false, hidden: false
110
 			sortable: false, hidden: false
102
 		},
111
 		},
103
 		{
112
 		{
104
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
113
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
105
 			label: "안전재고비율(%)", 
114
 			label: "안전재고비율(%)", 
106
-			width: '10', fixed: false, align: 'center',
115
+			width: '10', fixed: false, align: 'right',
116
+			minwidth: 120,
107
 			sortable: false, hidden: false
117
 			sortable: false, hidden: false
108
 		},
118
 		},
109
 		{
119
 		{
110
 			index: 'CUR_STCK_RT', name: 'curStckRt',
120
 			index: 'CUR_STCK_RT', name: 'curStckRt',
111
 			label: "현재고비율(%)", 
121
 			label: "현재고비율(%)", 
112
-			width: '10', fixed: false, align: 'center',
122
+			width: '10', fixed: false, align: 'right',
123
+			minwidth: 100,
113
 			sortable: false, hidden: false
124
 			sortable: false, hidden: false
114
 		}		
125
 		}		
115
 	]
126
 	]

+ 5 - 3
src/main/webapp/js/app/stockmng/ITP_STOCKMNG02010.js

@@ -204,6 +204,7 @@ const gridColModel = {
204
 			label: "정상여부",
204
 			label: "정상여부",
205
 			width: '5', fixed: false, align: 'center',
205
 			width: '5', fixed: false, align: 'center',
206
 			sortable: false, editable: false, edittype: 'text',
206
 			sortable: false, editable: false, edittype: 'text',
207
+			minwidth: 100,
207
 			editrules: {required: false}
208
 			editrules: {required: false}
208
 		},
209
 		},
209
 		{
210
 		{
@@ -216,7 +217,7 @@ const gridColModel = {
216
 		{
217
 		{
217
 			index: 'BRAND_NM', name: 'brandNm',
218
 			index: 'BRAND_NM', name: 'brandNm',
218
 			label: "브랜드",
219
 			label: "브랜드",
219
-			width: '10', fixed: false, align: 'center',
220
+			width: '10', fixed: false, align: 'left',
220
 			sortable: false, editable: false, edittype: 'text',
221
 			sortable: false, editable: false, edittype: 'text',
221
 			editrules: {required: false}
222
 			editrules: {required: false}
222
 		},
223
 		},
@@ -230,15 +231,16 @@ const gridColModel = {
230
 		{
231
 		{
231
 			index: 'WHS_NM', name: 'whsNm',
232
 			index: 'WHS_NM', name: 'whsNm',
232
 			label: "창고명",
233
 			label: "창고명",
233
-			width: '10', fixed: false, align: 'center',
234
+			width: '10', fixed: false, align: 'left',
234
 			sortable: false, editable: false, edittype: 'text',
235
 			sortable: false, editable: false, edittype: 'text',
235
 			editrules: {required: false}
236
 			editrules: {required: false}
236
 		},
237
 		},
237
 		{
238
 		{
238
 			index: 'LOCATION_NM', name: 'locationNm',
239
 			index: 'LOCATION_NM', name: 'locationNm',
239
 			label: "Location",
240
 			label: "Location",
240
-			width: '10', fixed: false, align: 'center',
241
+			width: '10', fixed: false, align: 'left',
241
 			sortable: false, editable: false, edittype: 'text',
242
 			sortable: false, editable: false, edittype: 'text',
243
+			minwidth: 100,
242
 			editrules: {required: false}
244
 			editrules: {required: false}
243
 		},
245
 		},
244
 		{
246
 		{

+ 10 - 8
src/main/webapp/js/app/stockmng/ITP_STOCKMNG03010.js

@@ -50,7 +50,7 @@ const gridColModel = {
50
 		{
50
 		{
51
 			index: 'BRAND_NM', name: 'brandNm',
51
 			index: 'BRAND_NM', name: 'brandNm',
52
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
52
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
53
-			width: '10', fixed: false, align: 'center',
53
+			width: '10', fixed: false, align: 'left',
54
 			sortable: false, hidden: false
54
 			sortable: false, hidden: false
55
 		},
55
 		},
56
 		{
56
 		{
@@ -68,44 +68,46 @@ const gridColModel = {
68
 		{
68
 		{
69
 			index: 'WHS_NM', name: 'whsNm',
69
 			index: 'WHS_NM', name: 'whsNm',
70
 			label: "창고명", 
70
 			label: "창고명", 
71
-			width: '13', fixed: false, align: 'center',
71
+			width: '13', fixed: false, align: 'left',
72
 			sortable: false, hidden: false
72
 			sortable: false, hidden: false
73
 		},
73
 		},
74
 		{
74
 		{
75
 			index: 'LOCATION_NM', name: 'locationNm',
75
 			index: 'LOCATION_NM', name: 'locationNm',
76
 			label: "Location명", 
76
 			label: "Location명", 
77
-			width: '10', fixed: false, align: 'center',
77
+			width: '10', fixed: false, align: 'left',
78
 			sortable: false, hidden: false
78
 			sortable: false, hidden: false
79
 		},
79
 		},
80
 		{
80
 		{
81
 			index: 'ITEM_ID', name: 'itemId',
81
 			index: 'ITEM_ID', name: 'itemId',
82
 			label: "품목번호", 
82
 			label: "품목번호", 
83
-			width: '11', fixed: false, align: 'center',
83
+			width: '13', fixed: false, align: 'center',
84
 			sortable: false, hidden: false
84
 			sortable: false, hidden: false
85
 		},
85
 		},
86
 		{
86
 		{
87
 			index: 'ITEM_NM', name: 'itemNm',
87
 			index: 'ITEM_NM', name: 'itemNm',
88
 			label: "품목명", 
88
 			label: "품목명", 
89
-			width: '10', fixed: false, align: 'center',
89
+			width: '10', fixed: false, align: 'left',
90
 			sortable: false, hidden: false
90
 			sortable: false, hidden: false
91
 		},
91
 		},
92
 		{
92
 		{
93
 			index: 'UNIT', name: 'unit',
93
 			index: 'UNIT', name: 'unit',
94
 			label: "단위", 
94
 			label: "단위", 
95
-			width: '7', fixed: false, align: 'center',
95
+			width: '6', fixed: false, align: 'center',
96
 			sortable: false, hidden: false
96
 			sortable: false, hidden: false
97
 		},
97
 		},
98
 		{
98
 		{
99
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
99
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
100
 			label: "적정재고수량", 
100
 			label: "적정재고수량", 
101
-			width: '8', fixed: false, align: 'center',
101
+			classes: 'input_color',
102
+			width: '8', fixed: false, align: 'right',
102
 			sortable: false, editable: true, edittype: 'text',
103
 			sortable: false, editable: true, edittype: 'text',
103
 			editrules: {required: false}
104
 			editrules: {required: false}
104
 		},
105
 		},
105
 		{
106
 		{
106
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
107
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
107
 			label: "안전재고비율(%)", 
108
 			label: "안전재고비율(%)", 
108
-			width: '10', fixed: false, align: 'center',
109
+			classes: 'input_color',
110
+			width: '10', fixed: false, align: 'right',
109
 			sortable: false, editable: true, edittype: 'text',
111
 			sortable: false, editable: true, edittype: 'text',
110
 			editrules: {required: false}
112
 			editrules: {required: false}
111
 		}		
113
 		}		

+ 10 - 7
src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -61,13 +61,13 @@ const gridColModel = {
61
 		{
61
 		{
62
 			index: 'BRAND_NM', name: 'brandNm',
62
 			index: 'BRAND_NM', name: 'brandNm',
63
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
63
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
64
-			width: '13', fixed: false, align: 'center',
64
+			width: '13', fixed: false, align: 'left',
65
 			sortable: false, hidden: false
65
 			sortable: false, hidden: false
66
 		},
66
 		},
67
 		{
67
 		{
68
 			index: 'STORE_NM', name: 'storeNm',
68
 			index: 'STORE_NM', name: 'storeNm',
69
 			label: "매장명", 
69
 			label: "매장명", 
70
-			width: '13', fixed: false, align: 'center',
70
+			width: '13', fixed: false, align: 'left',
71
 			sortable: false, hidden: false
71
 			sortable: false, hidden: false
72
 		},
72
 		},
73
 		{
73
 		{
@@ -79,7 +79,7 @@ const gridColModel = {
79
 		{
79
 		{
80
 			index: 'WHS_NM', name: 'whsNm',
80
 			index: 'WHS_NM', name: 'whsNm',
81
 			label: "창고명", 
81
 			label: "창고명", 
82
-			width: '13', fixed: false, align: 'center',
82
+			width: '13', fixed: false, align: 'left',
83
 			sortable: false, hidden: false
83
 			sortable: false, hidden: false
84
 		},
84
 		},
85
 		{
85
 		{
@@ -111,14 +111,14 @@ const gridColModel = {
111
 		{
111
 		{
112
 			index: 'LOCATION', name: 'location',
112
 			index: 'LOCATION', name: 'location',
113
 			label: "로케이션",
113
 			label: "로케이션",
114
-			width: '10', fixed: false, align: 'center',
114
+			width: '10', fixed: false, align: 'left',
115
 			sortable: false, editable: false, edittype: 'text',
115
 			sortable: false, editable: false, edittype: 'text',
116
 			editrules: {required: true}
116
 			editrules: {required: true}
117
 		},
117
 		},
118
 		{
118
 		{
119
 			index: 'LOCATION_NM', name: 'locationNm',
119
 			index: 'LOCATION_NM', name: 'locationNm',
120
 			label: "로케이션명",
120
 			label: "로케이션명",
121
-			width: '12', fixed: false, align: 'center',
121
+			width: '12', fixed: false, align: 'left',
122
 			sortable: true, editable: false, edittype: 'text',
122
 			sortable: true, editable: false, edittype: 'text',
123
 			editrules: {required: true}
123
 			editrules: {required: true}
124
 		},
124
 		},
@@ -145,14 +145,15 @@ const gridColModel = {
145
 		{
145
 		{
146
 			index: 'LOCATION', name: 'location',
146
 			index: 'LOCATION', name: 'location',
147
 			label: "로케이션",
147
 			label: "로케이션",
148
-			width: '10', fixed: false, align: 'center',
148
+			width: '10', fixed: false, align: 'left',
149
 			sortable: false, editable: true, edittype: 'text',
149
 			sortable: false, editable: true, edittype: 'text',
150
 			editrules: {required: false}
150
 			editrules: {required: false}
151
 		},
151
 		},
152
 		{
152
 		{
153
 			index: 'LOCATION_NM', name: 'locationNm',
153
 			index: 'LOCATION_NM', name: 'locationNm',
154
 			label: "로케이션명",
154
 			label: "로케이션명",
155
-			width: '12', fixed: false, align: 'center',
155
+			width: '12', fixed: false, align: 'left',
156
+			classes: 'input_color',
156
 			sortable: false, editable: true, edittype: 'text',
157
 			sortable: false, editable: true, edittype: 'text',
157
 			editrules: {required: true}
158
 			editrules: {required: true}
158
 		},
159
 		},
@@ -162,6 +163,7 @@ const gridColModel = {
162
 			width: '10', fixed: false, align: 'center',
163
 			width: '10', fixed: false, align: 'center',
163
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
164
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
164
 			editoptions: {value: ITP_COMMON_CD_STCK_DVSN},
165
 			editoptions: {value: ITP_COMMON_CD_STCK_DVSN},
166
+			classes: 'input_color',
165
 			editrules: {required: true}
167
 			editrules: {required: true}
166
 		},
168
 		},
167
 		{
169
 		{
@@ -170,6 +172,7 @@ const gridColModel = {
170
 			width: '10', fixed: false, align: 'center',
172
 			width: '10', fixed: false, align: 'center',
171
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
173
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
172
 			editoptions: {value: ITP_COMMON_CD_LOC_ST_CD},
174
 			editoptions: {value: ITP_COMMON_CD_LOC_ST_CD},
175
+			classes: 'input_color',
173
 			editrules: {required: true}
176
 			editrules: {required: true}
174
 		}
177
 		}
175
 	]
178
 	]