瀏覽代碼

모바일 수거현황 수정

whakdo963 2 年之前
父節點
當前提交
ff52026261
共有 2 個文件被更改,包括 155 次插入165 次删除
  1. 153 163
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html
  2. 2 2
      src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

+ 153 - 163
src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -5,101 +5,98 @@
5 5
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
7 7
 		  <div class="content">
8
-			<div class="line">
9
-			  <label>수거장소</label>
10
-			  <div class="search_wrap">
8
+			  <div class="content_fix">
9
+			  	<div class="line header">
10
+					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">수거현황</div>
11
+		      	</div>
12
+				<div class="line">
13
+				  <label>수거장소</label>
11 14
 				  <div class="float_left">
12
-					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="수거장소 (매장/창고)">
15
+					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="매장/창고">
13 16
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
17
+					<div class="itp_input_btn">
18
+						<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
19
+					</div>
14 20
 				  </div>
15
-				  <div class="float_left_btn">
16
-					<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
21
+				  <div class="float_right_btn">
17 22
 					<button id="ITP_BTN_MCOLLMNG01010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
18 23
 				  </div>	
19
-			  </div>
20
-			</div>
21
-			<div class="line">
22
-			  <label>수거상태</label>
23
-			  <div class="line_right">
24
-				<select name="srtnOdrStCd" id="ITP_FORM_MCOLLMNG01010_LIST_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD">
25
-				  <option value=""></option>
26
-				</select>
27
-			  </div>
28
-			</div>
29
-			<div class="line">
30
-			  <label>수거일자</label>
31
-			  <div class="date_to">
32
-				  <input type="text" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
33
-				  <div class="at">~</div>
34
-				  <input type="text" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
35
-			  </div>
36
-			</div>
37
-			<div class="line">
38
-				<label>발주번호/품목번호/품목명</label>
39
-			  <div class="search_wrap">
40
-				  <input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
41
-			  </div>
42
-			</div>
43
-			<div class="line" style="height:50px;">
44
-			  <div class="search">
45
-				<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
46
-			  </div>
47
-			</div>
48
-			<div class="table_header">
49
-			  <h1>> 수거수주 내역</h1>
24
+				</div>
25
+				<div class="line">
26
+				  <label>수거상태</label>
27
+				  <div class="float_left">
28
+					<select name="srtnOdrStCd" id="ITP_FORM_MCOLLMNG01010_LIST_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD">
29
+					  <option value=""></option>
30
+					</select>
31
+				  </div>
32
+				</div>
33
+				<div class="line">
34
+				  <label>수거일자</label>
35
+				  <div class="date_to">
36
+					  <input type="text" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
37
+					  <div class="at">~</div>
38
+					  <input type="text" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
39
+				  </div>
40
+				</div>
41
+				<div class="line">
42
+					<label>검색명</label>
43
+				  <div class="float_left name">
44
+					  <input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="발주번호/품목번호/품목명">
45
+				  </div>
46
+				</div>
47
+				<div class="line">
48
+				  <div class="search">
49
+					<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
50
+				  </div>
51
+				</div>
52
+				<div class="table_header">
53
+				  <h1><수거수주 내역></h1>
54
+				</div>
50 55
 			</div>
51 56
 		  </div>
52 57
 			<div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
53
-			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
54
-			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display:none;">
55
-				<li class="history_list list-row">
56
-				  <div class="btn_check">
58
+			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
59
+			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
60
+				<li class="history_list item-row">
61
+				  <div class="">
57 62
 					<div class="left">
58 63
 					  <div class="nomal">
59
-						<label>브랜드명 &nbsp;:</label>
60
-						<div>
61
-						  <div class="fnBrandNm"></div>
62
-						</div>
63
-						<label>반품발주번호&nbsp;:</label>
64
-						<div>
65
-						  <div class="fnRtnPodrUnqNo"></div>
66
-						</div>
64
+						<label>브랜드명</label>
65
+						<span>:</span>
66
+					    <div class="fnBrandNm"></div>
67
+						<label>발주번호</label>
68
+						<span>:</span>
69
+					    <div class="fnPchPodrUnqNo"></div>
67 70
 					  </div>
68 71
 					</div>
69 72
 					<div class="left">
70 73
 					  <div class="nomal">
71
-						<label>반품발주상태 &nbsp;:</label>
72
-						<div>
73
-						  <div class="fnRtnOdrStNm"></div>
74
-						</div>
75
-						<label>반품발주일자&nbsp;:</label>
76
-						<div>
77
-						  <div class="fnRtnOdrRegDt"></div>
78
-						</div>
74
+						<label class="lit">반품발주상태</label>
75
+						<span>:</span>
76
+					    <div class="lit col_6 fnRtnOdrStNm"></div>
77
+						<label class="lit">반품발주일자</label>
78
+						<span>:</span>
79
+					    <div class="lit fnRtnOdrRegDt"></div>
79 80
 					  </div>
80 81
 					</div>
81 82
 					<div class="left">
82 83
 					  <div class="nomal">
83
-						<label class="col_6">수거요청일 &nbsp;:</label>
84
-						<div>
85
-						  <div class="fnColReqDt"></div>
86
-						</div>
87
-						<label>수거장소&nbsp;:</label>
88
-						<div>
89
-						  <div class="fnRtnWhsNm"></div>
90
-						</div>
84
+						<label class="col_6">수거요청일</label>
85
+						<span>:</span>
86
+					    <div class="fnColReqDt"></div>
87
+						<label>수거장소</label>
88
+						<span>:</span>
89
+					    <div class="fnRtnWhsNm"></div>
91 90
 					  </div>
92 91
 					</div>
93 92
 					<div class="left">
94 93
 					  <div class="nomal">
95
-						<label>수거금액 &nbsp;:</label>
96
-						<div>
97
-						  <div class="fnRtnDodrTotalAmt"></div>
98
-						</div>
99
-						<label>수거품목수&nbsp;:</label>
100
-						<div>
101
-						  <div class="fnRtnDodrItemQty"></div>
102
-						</div>
94
+						<label>수거금액</label>
95
+						<span>:</span>
96
+					    <div class="fnRtnDodrTotalAmt"></div>
97
+						<label>수거품목수</label>
98
+						<span>:</span>
99
+					    <div class="fnRtnDodrItemQty"></div>
103 100
 					  </div>
104 101
 					</div>
105 102
 				  </div>
@@ -108,115 +105,108 @@
108 105
 		  </div>
109 106
 	  </form>
110 107
 	</div>
111
-	<div id="ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER" style="display: block;">
108
+	<div id="ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER" style="display: none;">
112 109
 		<form id="ITP_FORM_MCOLLMNG01010_VIEW" class="form-horizontal" onsubmit="return false;">
113 110
 		<input type="hidden" id="ITP_FORM_MCOLLMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
114 111
 		  <div class="content">
115
-			<div class="line">
116
-			  <label>브랜드명</label>
117
-			  <div class="line_right">
118
-				<div class="fnBrandNm"></div>
119
-			  </div>      
120
-			</div>
121
-			<div class="line">
122
-			  <label>반품발주번호</label>
123
-			  <div class="line_right">
124
-				<div class="fnRtnPodrUnqNo"></div>
125
-			  </div>      
126
-			</div>
127
-			<div class="line">
128
-			  <label>수거일자</label>
129
-			  <div class="line_right">
130
-				<div class="fnRtnOdrRegDt"></div>
131
-			  </div>      
132
-			</div>
133
-			<div class="line">
134
-			  <label>수거상태</label>
135
-			  <div class="line_right">
136
-				<div class="fnRtnOdrStNm"></div>
137
-			  </div>      
138
-			</div>
139
-			<div class="line">
140
-			  <label>수거장소</label>
141
-			  <div class="line_right">
142
-				<div class="fnRtnWhsNm"></div>
143
-			  </div>      
144
-			</div>
145
-			<div class="line">
146
-			  <label>수거총금액</label>
147
-			  <div class="line_right">
148
-				<div class="fnRtnDodrTotalAmt"></div>
149
-			  </div>      
150
-			</div>
151
-			<div class="line">
152
-			  <label>반품발주담당자</label>
153
-			  <div class="line_right">
154
-				<div class="fnRtnMgrNm"></div>
155
-			  </div>      
156
-			</div>
157
-			<div class="table_header">
158
-			  <h1>> 수거수주 상세 내역</h1>
112
+			 <div class="content_fix">
113
+				<div class="line">
114
+				  <label>브랜드명</label>
115
+				  <div class="line_right">
116
+					<div class="fnBrandNm"></div>
117
+				  </div>      
118
+				</div>
119
+				<div class="line">
120
+				  <label>반품발주번호</label>
121
+				  <div class="line_right">
122
+					<div class="fnRtnPodrUnqNo"></div>
123
+				  </div>      
124
+				</div>
125
+				<div class="line">
126
+				  <label>수거일자</label>
127
+				  <div class="line_right">
128
+					<div class="fnRtnOdrRegDt"></div>
129
+				  </div>      
130
+				</div>
131
+				<div class="line">
132
+				  <label>수거상태</label>
133
+				  <div class="line_right">
134
+					<div class="fnRtnOdrStNm"></div>
135
+				  </div>      
136
+				</div>
137
+				<div class="line">
138
+				  <label>수거장소</label>
139
+				  <div class="line_right">
140
+					<div class="fnRtnWhsNm"></div>
141
+				  </div>      
142
+				</div>
143
+				<div class="line">
144
+				  <label>수거총금액</label>
145
+				  <div class="line_right">
146
+					<div class="fnRtnDodrTotalAmt"></div>
147
+				  </div>      
148
+				</div>
149
+				<div class="line">
150
+				  <label>반품발주담당자</label>
151
+				  <div class="line_right">
152
+					<div class="fnRtnMgrNm"></div>
153
+				  </div>      
154
+				</div>
155
+				<div class="table_header">
156
+				  <h1><수거수주 상세 내역></h1>
157
+				</div>
159 158
 			</div>
160 159
 		  </div>
161 160
 			<div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA" class="scroll_area row-5">
162
-			  <ul id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWS" class="panel-group"></ul>
161
+			  <ul id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
163 162
 			  <div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY" style="display: none;">
164
-				<li class="history_list2 list-row">
163
+				<li class="history_list2 item-row">
165 164
 				  <div>
166 165
 					<div class="left">
167 166
 					  <div class="nomal">
168
-						<label>순번 &nbsp;:</label>
169
-						<div class="space2">
170
-						  <div class="fnRtnPodrDtlNo">1</div>
171
-						</div>
172
-						<label class="col_0">품목아이디&nbsp;:</label>
173
-						<div class="space2">
174
-						  <div class="fnItemId"></div>
175
-						</div>
167
+						<label>순번</label>
168
+						<span>:</span>
169
+					    <div class="fnRtnPodrDtlNo"></div>
170
+						<label class="col_0">품목아이디</label>
171
+						<span>:</span>
172
+					    <div class="fnItemId"></div>
176 173
 					  </div>
177 174
 					</div>
178 175
 					<div class="left">
179 176
 					  <div class="nomal">
180
-						<label>품목명 &nbsp;:</label>
181
-						<div class="space2">
182
-						  <div class="fnItemNm"></div>
183
-						</div>
184
-						<label>가격단위&nbsp;:</label>
185
-						<div class="space2">
186
-						  <div class="fnUnitQty"></div>
187
-						</div>
177
+						<label>품목명</label>
178
+						<span>:</span>
179
+					    <div class="fnItemNm"></div>
180
+						<label>가격단위</label>
181
+						<span>:</span>
182
+				        <div class="fnUnitQty"></div>
188 183
 					  </div>
189 184
 					</div>
190 185
 					<div class="left">
191 186
 					  <div class="nomal">
192
-						<label>단가 &nbsp;:</label>
193
-						<div>
194
-						  <div class="fnUnitAmt"></div>
195
-						</div>
196
-						<label>단위&nbsp;:</label>
197
-						<div>
198
-						  <div class="fnUnit"></div>
199
-						</div>
187
+						<label>단가</label>
188
+						<span>:</span>
189
+					    <div class="fnUnitAmt"></div>
190
+						<label>단위</label>
191
+						<span>:</span>
192
+				        <div class="fnUnit"></div>
200 193
 					  </div>
201 194
 					</div>
202 195
 					<div class="left">
203 196
 					  <div class="nomal">
204
-						<label>수거수량 &nbsp;:</label>
205
-						<div>
206
-						  <div class="fnRtnReqQty"></div>
207
-						</div>
208
-						<label>수거금액&nbsp;:</label>
209
-						<div>
210
-						  <div class="fnRtnAmt"></div>
211
-						</div>
197
+						<label>수거수량</label>
198
+						<span>:</span>
199
+					    <div class="fnRtnReqQty"></div>
200
+						<label>수거금액</label>
201
+						<span>:</span>
202
+				  		<div class="fnRtnAmt"></div>
212 203
 					  </div>
213 204
 					</div>
214 205
 					<div class="left">
215 206
 					  <div class="nomal">
216
-						<label class="col_6">수거요청일 &nbsp;:</label>
217
-						<div>
218
-						  <div class="fnColReqDt"></div>
219
-						</div>
207
+						<label class="col_6">수거요청일</label>
208
+						<span>:</span>
209
+					    <div class="fnColReqDt"></div>
220 210
 					  </div>
221 211
 					</div>
222 212
 				  </div>
@@ -233,7 +223,7 @@
233 223
 		<div class="pop">
234 224
 			<div class="header">
235 225
 				<div class="header_left">
236
-					<label>> 납품장소</label>
226
+					<label>납품장소</label>
237 227
 				</div>
238 228
 				<div class="header_right">
239 229
 					<button type="button" id="ITP_BTN_MCOLLMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -247,16 +237,16 @@
247 237
 					<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
248 238
 				</form>
249 239
 			</div>
250
-			<div class="search_bar">
251
-				<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
240
+			<div class="select_btn">
241
+				<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
252 242
 			</div>
253 243
 			<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_AREA" class="popup_scroll">
254
-				<ul id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
255
-				<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY" style="display:none;">
256
-					<li class="list-row">
244
+				<ul id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
245
+				<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY" style="display: none;">
246
+					<li class="row_2 item-row">
257 247
 						<div class="scroll_left">
258 248
 							<div class="fnWhsNm">브랜드 창고 명A</div>
259
-							<div class="fnLocationNm">(상세위치내용)</div>
249
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
260 250
 						</div>
261 251
 						<div class="scroll_right">
262 252
 							<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 2 - 2
src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

@@ -237,12 +237,12 @@
237 237
 				</form>
238 238
 			</div>
239 239
 			<div class="select_btn">
240
-				<button id="ITP_BTN_MORDMNG01010_POP_WHS_NM" class="btn_red">납품장소</button>
240
+				<button id="ITP_BTN_MORDMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
241 241
 			</div>
242 242
 			<div id="ITP_LIST_MORDMNG01010_POP_WHS_AREA" class="popup_scroll">
243 243
 				<ul id="ITP_LIST_MORDMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
244 244
 				<div id="ITP_LIST_MORDMNG01010_POP_WHS_ROWCOPY" style="display: none;">
245
-					<li class="row_2">
245
+					<li class="row_2 item-row">
246 246
 						<div class="scroll_left">
247 247
 							<div class="fnWhsNm">브랜드 창고 명A</div>
248 248
 							<div class="wichi fnLocationNm">(상세위치내용)</div>