소스 검색

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

dwkim 2 년 전
부모
커밋
c7d2b25d0d

+ 27 - 20
src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -20,35 +20,42 @@
20 20
 								
21 21
 									<div class="form-group">
22 22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
-											<select id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_REQ_DT" class="form-control itp_input" name="serviceDlvReqDt">
24
-												<option value="A">납품요청일*</option>											
23
+											<select id="ITP_FORM_INOUTMNG01010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
24
+												<option value="A">납품요청일</option>											
25 25
 											</select>
26 26
 										</div>
27 27
 										<div class="col-xs-3 itp_ip itp_noMar">
28 28
 											<div class="input-daterange input-group date">
29
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
29
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
30 30
 												<span class="input-group-addon itp_date_to">~</span>
31
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
31
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
32 32
 											</div>
33 33
 										</div>
34
-										
35
-										<div class="col-xs-2 itp_ip itp_noMar">
36
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" />
37
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
34
+										<div class="col-xs-3 itp_ip itp_noMar">
35
+											<div class="input-group">
36
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" readonly/>
37
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
38
+												<span class="input-group-btn">
39
+													<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>
40
+												</span>
41
+											</div>
38 42
 										</div>
39 43
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
40 44
 											<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>
41
-											<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>
42 45
 						                </div>
43 46
 									</div>
44 47
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
45
-										<div class="col-xs-2 itp_ip itp_noMar">
46
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" />
47
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
48
+										<div class="col-xs-3 itp_ip itp_noMar">
49
+											<div class="input-group">
50
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" readonly/>
51
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
52
+												<span class="input-group-btn">
53
+													<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>
54
+												</span>
55
+											</div>
48 56
 										</div>
49 57
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
50 58
 											<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>
51
-											<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>
52 59
 						                </div>
53 60
 										<div class="col-xs-4 itp_ip itp_noMar">
54 61
 											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
@@ -74,8 +81,7 @@
74 81
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_" name="" value="">
75 82
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
76 83
 								<section class="itp_form_sec">
77
-									<h4 class="itp_form_tit">출하지시 기본정보</h4>
78
-									<div class="itp_form_in">
84
+									<div class="itp_form_in border-top">
79 85
 										<div class="form-group">
80 86
 											<label class="col-xs-2 itp_lb">브랜드</label>
81 87
 											<div class="col-xs-4 itp_ip">
@@ -85,12 +91,14 @@
85 91
 											</div>
86 92
 											<label class="col-xs-2 itp_lb">납품일자 *</label>
87 93
 											<div class="col-xs-4 itp_ip">
88
-												<div class="input-daterange input-group date">
89
-													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
94
+												<div class="col-xs-7 itp_in">
95
+													<div class="input-daterange input-group date">
96
+														<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="" readonly>
97
+													</div>
90 98
 												</div>
91 99
 											</div>
92 100
 										</div>
93
-										<div class="form-group border">
101
+										<div class="form-group">
94 102
 											<label class="col-xs-2 itp_lb">납품담당자 *</label>
95 103
 											<div class="col-xs-4 itp_ip">
96 104
 												<div class="col-xs-7 itp_in">
@@ -110,11 +118,10 @@
110 118
 						</div>
111 119
 					</div>
112 120
 					<div class="itp_table fix">
113
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
121
+						<div class="itp_table_head fix" style="background:#fff;">
114 122
 							<h4 class="itp_table_tit">출하지시 품목</h4>
115 123
 						</div>
116 124
 						<div id="ITP_INOUTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
117
-							<div id="ITP_INOUTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
118 125
 							<table id="ITP_INOUTMNG01010_DETAIL_jqGrid"></table>
119 126
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridPager"></div>
120 127
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 22 - 12
src/main/webapp/app/inoutmng/INOUTMNG02010.html

@@ -17,22 +17,28 @@
17 17
 								<input type="hidden" id="ITP_FORM_INOUTMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
18 18
 									<div class="form-group">
19 19
 										<div class="col-xs-2 itp_ip itp_noMar">
20
-                                            <label>출하일자 *</label>
20
+                                            <select id="ITP_FORM_INOUTMNG02010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
21
+												<option value="A">출하일자</option>											
22
+											</select>
21 23
 										</div>
22 24
 										<div class="col-xs-3 itp_ip itp_noMar">
23 25
 											<div class="input-daterange input-group date">
24
-												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
26
+												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
25 27
 												<span class="input-group-addon itp_date_to">~</span>
26
-												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
28
+												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
27 29
 											</div>
28 30
 										</div>
29
-										<div class="col-xs-2 itp_ip itp_noMar">
30
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
31
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
31
+										<div class="col-xs-3 itp_ip itp_noMar">
32
+											<div class="input-group">
33
+												<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
34
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
35
+												<span class="input-group-btn">
36
+													<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>
37
+												</span>
38
+											</div>
32 39
 										</div>
33 40
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
34 41
 											<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>
35
-											<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>
36 42
 						                </div>
37 43
 									</div>
38 44
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -41,13 +47,17 @@
41 47
 												<option value="">출하상태</option>											
42 48
 											</select>
43 49
 										</div>
44
-										<div class="col-xs-2 itp_ip itp_noMar">
45
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" />
46
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
50
+										<div class="col-xs-3 itp_ip itp_noMar">
51
+											<div class="input-group">
52
+												<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" readonly/>
53
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
54
+												<span class="input-group-btn">
55
+													<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>
56
+												</span>
57
+											</div>
47 58
 										</div>
48
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
59
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
49 60
 											<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>
50
-											<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>
51 61
 						                </div>
52 62
 										<div class="col-xs-4 itp_ip itp_noMar">
53 63
 											<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

+ 23 - 19
src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -25,32 +25,38 @@
25 25
 										</div>
26 26
 										<div class="col-xs-3 itp_ip itp_noMar">
27 27
 											<div class="input-daterange input-group date">
28
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
28
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
29 29
 												<span class="input-group-addon itp_date_to">~</span>
30
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
30
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
31 31
 											</div>
32 32
 										</div>
33
-										<div class="col-xs-2 itp_ip itp_noMar">
34
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" />
35
-											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
33
+										<div class="col-xs-3 itp_ip itp_noMar">
34
+											<div class="input-group">
35
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" readonly/>
36
+												<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
37
+												<span class="input-group-btn">
38
+													<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>
39
+												</span>
40
+											</div>
36 41
 										</div>
37 42
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
38 43
 											<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>
39
-											<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>
40 44
 						                </div>
41
-										
42
-										
43 45
 									</div>
44 46
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
45
-										<div class="col-xs-2 itp_ip itp_noMar">
46
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" />
47
+										<div class="col-xs-3 itp_ip itp_noMar">
48
+											<div class="input-group">
49
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
47 50
 											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
51
+												<span class="input-group-btn">
52
+													<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>
53
+												</span>
54
+											</div>
48 55
 										</div>
49
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
56
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
50 57
 											<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>
51
-											<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>
52 58
 						                </div>
53
-										<div class="col-xs-3 itp_ip itp_noMar">
59
+										<div class="col-xs-4 itp_ip itp_noMar">
54 60
 											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
55 61
 										</div>
56 62
 									</div>
@@ -74,8 +80,7 @@
74 80
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_" name="" value="">
75 81
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
76 82
 								<section class="itp_form_sec">
77
-									<h4 class="itp_form_tit">수거지시 기본정보</h4>
78
-									<div class="itp_form_in">
83
+									<div class="itp_form_in border-top">
79 84
 										<div class="form-group">
80 85
 											<label class="col-xs-2 itp_lb">브랜드</label>
81 86
 											<div class="col-xs-4 itp_ip">
@@ -87,12 +92,12 @@
87 92
 											<div class="col-xs-4 itp_ip">
88 93
 												<div class="col-xs-7 itp_in">
89 94
 													<div class="input-daterange input-group date">
90
-														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
95
+														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="" readonly>
91 96
 													</div>
92 97
 												</div>
93 98
 											</div>
94 99
 										</div>
95
-										<div class="form-group border">
100
+										<div class="form-group">
96 101
 											<label class="col-xs-2 itp_lb">수거담당자 *</label>
97 102
 											<div class="col-xs-4 itp_ip">
98 103
 												<div class="col-xs-7 itp_in">
@@ -112,11 +117,10 @@
112 117
 						</div>
113 118
 					</div>
114 119
 					<div class="itp_table fix">
115
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
120
+						<div class="itp_table_head fix" style="background:#fff;">
116 121
 							<h4 class="itp_table_tit">수거지시 품목</h4>
117 122
 						</div>
118 123
 						<div id="ITP_INOUTMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
119
-							<div id="ITP_INOUTMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
120 124
 							<table id="ITP_INOUTMNG03010_DETAIL_jqGrid"></table>
121 125
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridPager"></div>
122 126
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 19 - 11
src/main/webapp/app/inoutmng/INOUTMNG04010.html

@@ -23,18 +23,22 @@
23 23
 										</div>
24 24
 										<div class="col-xs-3 itp_ip itp_noMar">
25 25
 											<div class="input-daterange input-group date">
26
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
26
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
27 27
 												<span class="input-group-addon itp_date_to">~</span>
28
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
28
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
29 29
 											</div>
30 30
 										</div>
31
-										<div class="col-xs-2 itp_ip itp_noMar">
32
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장" />
33
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장"/>
31
+										<div class="col-xs-3 itp_ip itp_noMar">
32
+											<div class="input-group">
33
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장" readonly/>
34
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장"/>
35
+												<span class="input-group-btn">
36
+													<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>
37
+												</span>
38
+											</div>
34 39
 										</div>
35 40
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
36 41
 											<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>
37
-											<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>
38 42
 						                </div>
39 43
 									</div>
40 44
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -43,13 +47,17 @@
43 47
 												<option value="">수거상태</option>											
44 48
 											</select>
45 49
 										</div>
46
-										<div class="col-xs-2 itp_ip itp_noMar">
47
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
48
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" />
50
+										<div class="col-xs-3 itp_ip itp_noMar">
51
+											<div class="input-group">
52
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" readonly/>
53
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
54
+												<span class="input-group-btn">
55
+													<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>
56
+												</span>
57
+											</div>
49 58
 										</div>
50
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
59
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
51 60
 											<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>
52
-											<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>
53 61
 						                </div>
54 62
 										<div class="col-xs-3 itp_ip itp_noMar">
55 63
 											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

+ 14 - 3
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -47,31 +47,35 @@ const gridColModel = {
47 47
 		{
48 48
 			index: 'BRAND_NM', name: 'brandNm',
49 49
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
50
-			width: '10', fixed: false, align: 'center',
50
+			width: '10', fixed: false, align: 'left',
51
+			minwidth: 100,
51 52
 			sortable: false, hidden: false
52 53
 		},
53 54
 		{
54 55
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
55 56
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
56 57
 			width: '10', fixed: false, align: 'center',
58
+			minwidth: 140,
57 59
 			sortable: false, hidden: false
58 60
 		},
59 61
 		{
60 62
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
61 63
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
62
-			width: '10', fixed: false, align: 'center',
64
+			width: '10', fixed: false, align: 'right',
63 65
 			sortable: false, hidden: false
64 66
 		},
65 67
 		{
66 68
 			index: 'ITEM_ID', name: 'itemId',
67 69
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
68 70
 			width: '10', fixed: false, align: 'center',
71
+			minwidth: 140,
69 72
 			sortable: false, hidden: false
70 73
 		},
71 74
 		{
72 75
 			index: 'ITEM_NM', name: 'itemNm',
73 76
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
74 77
 			width: '10', fixed: false, align: 'left',
78
+			minwidth: 100,
75 79
 			sortable: false, hidden: false
76 80
 		},
77 81
 		{
@@ -84,6 +88,7 @@ const gridColModel = {
84 88
 			index: 'WHS_NM', name: 'whsNm',
85 89
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
86 90
 			width: '15', fixed: false, align: 'left',
91
+			minwidth: 220,
87 92
 			sortable: false, hidden: false
88 93
 		},
89 94
 		{
@@ -96,6 +101,7 @@ const gridColModel = {
96 101
 			index: 'UNIT_AMT', name: 'unitAmt',
97 102
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
98 103
 			width: '6', fixed: false, align: 'right',
104
+			minwidth: 80,
99 105
 			sortable: false, hidden: false,
100 106
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
101 107
 		},
@@ -124,6 +130,7 @@ const gridColModel = {
124 130
 			index: 'EXPRY_YN', name: 'expryYn',
125 131
 			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
126 132
 			width: '10', fixed: false, align: 'center',
133
+			minwidth: 100,
127 134
 			sortable: false, hidden: false
128 135
 		},
129 136
 		{
@@ -151,6 +158,7 @@ const gridColModel = {
151 158
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
152 159
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
153 160
 			width: '10', fixed: false, align: 'center',
161
+			minwidth: 100,
154 162
 			sortable: false, hidden: false
155 163
 		},
156 164
 		{
@@ -168,7 +176,8 @@ const gridColModel = {
168 176
 		{
169 177
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
170 178
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
171
-			width: '10', fixed: false, align: 'center',
179
+			width: '10', fixed: false, align: 'left',
180
+			minwidth: 220,
172 181
 			sortable: false, hidden: false
173 182
 		}
174 183
 	],
@@ -451,6 +460,8 @@ let pageObj = {
451 460
 		});
452 461
 		if(mode == 'LIST') { // 목록
453 462
 			$('#ITP_AJAX_INOUTMNG01010_LIST_CONTAINER').show();
463
+			$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').show();
464
+			$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').show();
454 465
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_SRH', '#ITP_BTN_INOUTMNG01010_OUC']);
455 466
 			$('#ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
456 467
 		} else if(mode == 'DETAIL') { // 출하지시 상세

+ 18 - 8
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -31,30 +31,34 @@ const gridColModel = {
31 31
 		{
32 32
 			index: 'BRAND_NM', name: 'brandNm',
33 33
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
34
-			width: '10', fixed: false, align: 'center',
34
+			minwidth: 100,
35
+			width: '10', fixed: false, align: 'left',
35 36
 			sortable: false, hidden: false
36 37
 		},
37 38
 		{
38 39
 			index: 'SHMT_REQ_UNQ_NO', name: 'shmtReqUnqNo',
39 40
 			label: ITP_MSG_LOCALE.label.shmtReqUnqNo,			// 출하지시번호
41
+			minwidth: 140,
40 42
 			width: '10', fixed: false, align: 'center',
41 43
 			sortable: false, hidden: false
42 44
 		},
43 45
 		{
44 46
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
45 47
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo,			// 발주번호
48
+			minwidth: 140,
46 49
 			width: '10', fixed: false, align: 'center',
47 50
 			sortable: false, hidden: false
48 51
 		},
49 52
 		{
50 53
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
51 54
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo,			// 발주항번
52
-			width: '8', fixed: false, align: 'center',
55
+			width: '8', fixed: false, align: 'right',
53 56
 			sortable: false, hidden: false
54 57
 		},
55 58
 		{
56 59
 			index: 'SHMT_REQ_ST_CD', name: 'shmtReqStCd',
57 60
 			label: ITP_MSG_LOCALE.label.shmtReqStCd,			// 출하상태코드
61
+			minwidth: 120,
58 62
 			width: '10', fixed: false, align: 'center',
59 63
 			sortable: false, hidden: false, formatter: 'select', edittype: 'select',
60 64
 			editoptions: {value: ITP_PODR_DTL_ST_CD}
@@ -62,55 +66,61 @@ const gridColModel = {
62 66
 		{
63 67
 			index: 'ITEM_ID', name: 'itemId',
64 68
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
69
+			minwidth: 140,
65 70
 			width: '10', fixed: false, align: 'center',
66 71
 			sortable: false, hidden: false
67 72
 		},
68 73
 		{
69 74
 			index: 'ITEM_NM', name: 'itemNm',
70 75
 			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
71
-			width: '10', fixed: false, align: 'center',
76
+			width: '10', fixed: false, align: 'left',
77
+			minwidth: 100,
72 78
 			sortable: false, hidden: false
73 79
 		},
74 80
 		{
75 81
 			index: 'WHS_NM', name: 'whsNm',
76 82
 			label: ITP_MSG_LOCALE.label.whsNm,					// 납품장소
77
-			width: '10', fixed: false, align: 'center',
83
+			width: '10', fixed: false, align: 'left',
84
+			minwidth: 160,
78 85
 			sortable: false, hidden: false
79 86
 		},
80 87
 		{
81 88
 			index: 'SHMT_QTY', name: 'shmtQty',
82 89
 			label: ITP_MSG_LOCALE.label.shmtQty,				// 출하수량
83
-			width: '8', fixed: false, align: 'center',
90
+			width: '8', fixed: false, align: 'right',
84 91
 			sortable: false, hidden: false
85 92
 		},
86 93
 		{
87 94
 			index: 'SHMT_AMT', name: 'shmtAmt',
88 95
 			label: ITP_MSG_LOCALE.label.shmtAmt,				// 출하금액
89
-			width: '8', fixed: false, align: 'center',
96
+			width: '8', fixed: false, align: 'right',
97
+			minwidth: 80,
90 98
 			sortable: false, hidden: false
91 99
 		},
92 100
 		{
93 101
 			index: 'WHS_QTY', name: 'whsQty',
94 102
 			label: ITP_MSG_LOCALE.label.whsQty,					// 입고수량
95
-			width: '8', fixed: false, align: 'center',
103
+			width: '8', fixed: false, align: 'right',
96 104
 			sortable: false, hidden: false
97 105
 		},
98 106
 		{
99 107
 			index: 'WHS_AMT', name: 'whsAmt',
100 108
 			label: ITP_MSG_LOCALE.label.whsAmt,					// 입고금액
101
-			width: '8', fixed: false, align: 'center',
109
+			width: '8', fixed: false, align: 'right',
102 110
 			sortable: false, hidden: false
103 111
 		},
104 112
 		{
105 113
 			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
106 114
 			label: ITP_MSG_LOCALE.label.whsCnfmNm,				// 입고확인자
107 115
 			width: '10', fixed: false, align: 'center',
116
+			minwidth: 100,
108 117
 			sortable: false, hidden: false
109 118
 		},
110 119
 		{
111 120
 			index: 'WHS_DT', name: 'whsDt',
112 121
 			label: ITP_MSG_LOCALE.label.whsDt,					// 입고일
113 122
 			width: '10', fixed: false, align: 'center',
123
+			minwidth: 100,
114 124
 			sortable: false, hidden: false
115 125
 		},
116 126
 		{

+ 11 - 3
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -46,19 +46,21 @@ const gridColModel = {
46 46
 		{
47 47
 			index: 'BRAND_NM', name: 'brandNm',
48 48
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
49
-			width: '10', fixed: false, align: 'center',
49
+			width: '10', fixed: false, align: 'left',
50
+			minwidth: 100,
50 51
 			sortable: false, hidden: false
51 52
 		},
52 53
 		{
53 54
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
54 55
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
55 56
 			width: '10', fixed: false, align: 'center',
57
+			minwidth: 140,
56 58
 			sortable: false, hidden: false
57 59
 		},
58 60
 		{
59 61
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
60 62
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, //반품발주항번
61
-			width: '10', fixed: false, align: 'center',
63
+			width: '10', fixed: false, align: 'right',
62 64
 			sortable: false, hidden: false
63 65
 		},
64 66
 		{
@@ -77,12 +79,14 @@ const gridColModel = {
77 79
 			index: 'ITEM_ID', name: 'itemId',
78 80
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
79 81
 			width: '10', fixed: false, align: 'center',
82
+			minwidth: 140,
80 83
 			sortable: false, hidden: false
81 84
 		},
82 85
 		{
83 86
 			index: 'ITEM_NM', name: 'itemNm',
84 87
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
85 88
 			width: '10', fixed: false, align: 'left',
89
+			minwidth: 100,
86 90
 			sortable: false, hidden: false
87 91
 		},
88 92
 		{
@@ -100,7 +104,7 @@ const gridColModel = {
100 104
 		{
101 105
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
102 106
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
103
-			width: '15', fixed: false, align: 'center',
107
+			width: '15', fixed: false, align: 'left',
104 108
 			sortable: false, hidden: false
105 109
 		},
106 110
 		{
@@ -108,6 +112,7 @@ const gridColModel = {
108 112
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
109 113
 			width: '6', fixed: false, align: 'right',
110 114
 			sortable: false, hidden: false,
115
+			minwidth: 60,
111 116
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
112 117
 		},
113 118
 		{
@@ -180,6 +185,7 @@ const gridColModel = {
180 185
 			index: 'BRAND_NM', name: 'brandNm',
181 186
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
182 187
 			width: '10', fixed: false, align: 'center',
188
+			minwidth: 100,
183 189
 			sortable: false, hidden: false
184 190
 		},
185 191
 		{
@@ -446,6 +452,8 @@ let pageObj = {
446 452
 		});
447 453
 		if(mode == 'LIST') { // 목록
448 454
 			$('#ITP_AJAX_INOUTMNG03010_LIST_CONTAINER').show();
455
+			$('#ITP_FORM_INOUTMNG03010_DELETE_WHS_NM').show();
456
+			$('#ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM').show();
449 457
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_SRH', '#ITP_BTN_INOUTMNG03010_CUC']);
450 458
 			$('#ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
451 459
 		} else if(mode == 'DETAIL') { // 출하지시 상세

+ 15 - 2
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -38,30 +38,35 @@ const gridColModel = {
38 38
 			index: 'BRAND_NM', name: 'brandNm',
39 39
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
40 40
 			width: '10', fixed: false, align: 'center',
41
+			minwidth: 100,
41 42
 			sortable: false, hidden: false
42 43
 		},
43 44
 		{
44 45
 			index: 'SHMT_REQ_UNQ_NO', name: 'colCmdUnqNo',
45 46
 			label: ITP_MSG_LOCALE.label.colCmdUnqNo,			// 수거지시번호
46 47
 			width: '10', fixed: false, align: 'center',
48
+			minwidth: 140,
47 49
 			sortable: false, hidden: false
48 50
 		},
49 51
 		{
50 52
 			index: 'PCH_PODR_UNQ_NO', name: 'colCmdDtlNo',
51 53
 			label: ITP_MSG_LOCALE.label.colCmdDtlNo,			// 수거지시항번
52 54
 			width: '10', fixed: false, align: 'center',
55
+			minwidth: 100,
53 56
 			sortable: false, hidden: false
54 57
 		},
55 58
 		{
56 59
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrUnqNo',
57 60
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo,			// 반품발주번호
58 61
 			width: '8', fixed: false, align: 'center',
62
+			minwidth: 140,
59 63
 			sortable: false, hidden: false
60 64
 		},
61 65
 		{
62 66
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrDtlNo',
63 67
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo,			// 반품발주항번
64 68
 			width: '8', fixed: false, align: 'center',
69
+			minwidth: 100,
65 70
 			sortable: false, hidden: false
66 71
 		},
67 72
 		{
@@ -75,18 +80,21 @@ const gridColModel = {
75 80
 			index: 'ITEM_ID', name: 'itemId',
76 81
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
77 82
 			width: '10', fixed: false, align: 'center',
83
+			minwidth: 140,
78 84
 			sortable: false, hidden: false
79 85
 		},
80 86
 		{
81 87
 			index: 'ITEM_NM', name: 'itemNm',
82 88
 			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
83 89
 			width: '10', fixed: false, align: 'left',
90
+			minwidth: 120,
84 91
 			sortable: false, hidden: false
85 92
 		},
86 93
 		{
87 94
 			index: 'WHS_NM', name: 'rtnWhsNm',
88
-			label: ITP_MSG_LOCALE.label.rtnWhsNm,					// 반품장소
95
+			label: ITP_MSG_LOCALE.label.rtnWhsNm,			// 반품장소
89 96
 			width: '10', fixed: false, align: 'left',
97
+			minwidth: 200,
90 98
 			sortable: false, hidden: false
91 99
 		},
92 100
 		{
@@ -98,7 +106,7 @@ const gridColModel = {
98 106
 		},
99 107
 		{
100 108
 			index: 'WHS_QTY', name: 'colQty',
101
-			label: ITP_MSG_LOCALE.label.colQty,					// 수거수량
109
+			label: ITP_MSG_LOCALE.label.colQty,		// 수거수량
102 110
 			width: '8', fixed: false, align: 'rigth',
103 111
 			sortable: false, hidden: false,
104 112
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -107,6 +115,7 @@ const gridColModel = {
107 115
 			index: 'SHMT_AMT', name: 'colAmt',
108 116
 			label: ITP_MSG_LOCALE.label.colAmt,				// 수거금액
109 117
 			width: '8', fixed: false, align: 'rigth',
118
+			minwidth: 80,
110 119
 			sortable: false, hidden: false,
111 120
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
112 121
 		},
@@ -114,12 +123,14 @@ const gridColModel = {
114 123
 			index: 'WHS_DT', name: 'colDt',
115 124
 			label: ITP_MSG_LOCALE.label.colDt,					// 수거일
116 125
 			width: '10', fixed: false, align: 'center',
126
+			minwidth: 100,
117 127
 			sortable: false, hidden: false
118 128
 		},
119 129
 		{
120 130
 			index: 'WHS_CNFM_NM', name: 'colCnfmNm',
121 131
 			label: ITP_MSG_LOCALE.label.colCnfmNm,				// 수거확인자
122 132
 			width: '10', fixed: false, align: 'center',
133
+			minwidth: 100,
123 134
 			sortable: false, hidden: false
124 135
 		},
125 136
 		{
@@ -199,6 +210,8 @@ let pageObj = {
199 210
         if(mode == 'LIST') { // 목록
200 211
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG04010_PRINT', '#ITP_BTN_INOUTMNG04010_SRH']);
201 212
             $('#ITP_AJAX_INOUTMNG04010_LIST_CONTAINER').show();
213
+            $('#ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID').show();
214
+            $('#ITP_BTN_INOUTMNG04010_DELETE_WHS_ID').show();
202 215
             $('#ITP_FORM_INOUTMNG04010_SEARCH #ITP_FORM_INOUTMNG04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
203 216
         } 
204 217
     },