Ver código fonte

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

yhl88 2 anos atrás
pai
commit
61d65d739f
27 arquivos alterados com 545 adições e 480 exclusões
  1. 2 2
      src/main/webapp/app/oper/OPER01010.html
  2. 12 12
      src/main/webapp/app/oper/OPER04010.html
  3. 26 26
      src/main/webapp/app/oper/OPER06010.html
  4. 7 9
      src/main/webapp/app/stinfo/STINFO02010.html
  5. 8 10
      src/main/webapp/app/stinfo/STINFO03010.html
  6. 53 57
      src/main/webapp/app/stinfo/STINFO04010.html
  7. 1 1
      src/main/webapp/bootstrap/dist/css/bootstrap.min.css
  8. 5 1
      src/main/webapp/css/ui.jqgrid-bootstrap.css
  9. 1 1
      src/main/webapp/js/app/locales/locale-ko.js
  10. 0 5
      src/main/webapp/js/app/oper/ITP_OPER01010.js
  11. 0 1
      src/main/webapp/js/app/oper/ITP_OPER02010.js
  12. 5 31
      src/main/webapp/js/app/oper/ITP_OPER03010.js
  13. 0 1
      src/main/webapp/js/app/oper/ITP_OPER04010.js
  14. 0 1
      src/main/webapp/js/app/oper/ITP_OPER06010.js
  15. 22 0
      src/main/webapp/js/app/stinfo/ITP_STINFO04010.js
  16. 4 1
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html
  17. 19 19
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html
  18. 49 10
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html
  19. 4 1
      src/main/webapp/mobile/app/mordmng/MORDMNG01010.html
  20. 6 6
      src/main/webapp/mobile/app/mordmng/MORDMNG02010.html
  21. 236 233
      src/main/webapp/mobile/app/mordmng/MORDMNG03010.html
  22. 9 2
      src/main/webapp/mobile/css/style.css
  23. 8 8
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js
  24. 22 19
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js
  25. 34 18
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js
  26. 5 2
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js
  27. 7 3
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

+ 2 - 2
src/main/webapp/app/oper/OPER01010.html

@@ -233,7 +233,7 @@
233 233
 												<div class="col-xs-5 itp_in fnTelNo"></div>
234 234
 											</div>
235 235
 										</div>
236
-										<div class="form-group border">
236
+										<div class="form-group">
237 237
 											<label class="col-xs-2 itp_lb">마지막 로그인</label>
238 238
 											<div class="col-xs-4 itp_ip">
239 239
 												<div class="col-xs-5 itp_in fnLastLoginDt"></div>
@@ -322,7 +322,7 @@
322 322
 												</div>
323 323
 											</div>
324 324
 										</div>
325
-										<div class="form-group border">
325
+										<div class="form-group">
326 326
 											<label class="col-xs-2 itp_lb">등록일</label>
327 327
 											<div class="col-xs-4 itp_ip">
328 328
 												<div class="col-xs-7 itp_in fnAddDt"></div>

+ 12 - 12
src/main/webapp/app/oper/OPER04010.html

@@ -160,6 +160,18 @@
160 160
 											</div>
161 161
 										</div>	
162 162
 									</div>	
163
+									<div class="itp_form_in itp_modify_dt">
164
+										<div class="form-group">
165
+											<label class="col-xs-2 itp_lb">등록일시</label>
166
+											<div class="col-xs-4 itp_ip">
167
+												<div class="col-xs-5 itp_in fnAddDt"></div>
168
+											</div>
169
+											<label class="col-xs-2 itp_lb">최종수정일시</label>
170
+											<div class="col-xs-4 itp_ip">
171
+												<div class="col-xs-5 itp_in fnChgDt"></div>
172
+											</div>
173
+										</div>
174
+									</div>
163 175
 									<div class="itp_form_in">
164 176
 										<div class="form-group border">
165 177
 											<label class="col-xs-2 itp_lb">주소(*)</label>
@@ -188,18 +200,6 @@
188 200
 											</div>
189 201
 										</div>
190 202
 									</div>
191
-									<div class="itp_form_in itp_modify_dt">
192
-										<div class="form-group border">
193
-											<label class="col-xs-2 itp_lb">등록일시</label>
194
-											<div class="col-xs-4 itp_ip">
195
-												<div class="col-xs-5 itp_in fnAddDt"></div>
196
-											</div>
197
-											<label class="col-xs-2 itp_lb">최종수정일시</label>
198
-											<div class="col-xs-4 itp_ip">
199
-												<div class="col-xs-5 itp_in fnChgDt"></div>
200
-											</div>
201
-										</div>
202
-									</div>
203 203
 								</section>								
204 204
 							</form>
205 205
 						</div>

+ 26 - 26
src/main/webapp/app/oper/OPER06010.html

@@ -225,6 +225,32 @@
225 225
 											</div>
226 226
 										</div>
227 227
 									</div>
228
+									<div class="itp_form_info">
229
+										<div class="itp_form_in">
230
+											<div class="form-group">
231
+												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
232
+												<div class="col-xs-4 itp_ip">
233
+													<div class="col-xs-a itp_in" style="width:auto;">
234
+														<div class="input-group fnRegId" style="padding:5px;"></div>
235
+													</div>
236
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
237
+													<div class="col-xs-a itp_in">
238
+														<div class="input-group fnRegDt" style="padding:5px;"></div>
239
+													</div>
240
+												</div>
241
+												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
242
+												<div class="col-xs-4 itp_ip">
243
+													<div class="col-xs-a itp_in">
244
+														<div class="input-group fnChgId" style="padding:5px;"></div>
245
+													</div>
246
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
247
+													<div class="col-xs-a itp_in">
248
+														<div class="input-group fnChgDt" style="padding:5px;"></div>
249
+													</div>
250
+												</div>
251
+											</div>
252
+										</div>
253
+									</div>
228 254
 									<div class="itp_form_in">
229 255
 										<div class="form-group border">
230 256
 											<label class="col-xs-2 itp_lb">주소</label>
@@ -253,32 +279,6 @@
253 279
 											</div>
254 280
 										</div>
255 281
 									</div>
256
-									<div class="itp_form_info">
257
-										<div class="itp_form_in">
258
-											<div class="form-group border">
259
-												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
260
-												<div class="col-xs-4 itp_ip">
261
-													<div class="col-xs-a itp_in" style="width:auto;">
262
-														<div class="input-group fnRegId" style="padding:5px;"></div>
263
-													</div>
264
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
265
-													<div class="col-xs-a itp_in">
266
-														<div class="input-group fnRegDt" style="padding:5px;"></div>
267
-													</div>
268
-												</div>
269
-												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
270
-												<div class="col-xs-4 itp_ip">
271
-													<div class="col-xs-a itp_in">
272
-														<div class="input-group fnChgId" style="padding:5px;"></div>
273
-													</div>
274
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
275
-													<div class="col-xs-a itp_in">
276
-														<div class="input-group fnChgDt" style="padding:5px;"></div>
277
-													</div>
278
-												</div>
279
-											</div>
280
-										</div>
281
-									</div>
282 282
 								</section>								
283 283
 							</form>
284 284
 						</div>

+ 7 - 9
src/main/webapp/app/stinfo/STINFO02010.html

@@ -78,8 +78,7 @@
78 78
 								<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_BRAND_ID" name="brandId" value="">
79 79
 								<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_STORE_ID" name="storeId" value="">
80 80
 								<section class="itp_form_sec">
81
-									<h4 class="itp_form_tit">매장정보-신규</h4>
82
-									<div class="itp_form_in">
81
+									<div class="itp_form_in border-top">
83 82
 										<div class="form-group">
84 83
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
85 84
 											<div class="col-xs-4 itp_ip">
@@ -114,7 +113,7 @@
114 113
 										<div class="form-group">
115 114
 											<label class="col-xs-2 itp_lb">매장명 *</label>
116 115
 											<div class="col-xs-4 itp_ip">
117
-												<div class="col-xs-9 itp_in">
116
+												<div class="col-xs-6 itp_in">
118 117
 													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" value="">
119 118
 												</div>
120 119
 											</div>
@@ -216,7 +215,7 @@
216 215
 												<div class="col-xs-1 itp_in">
217 216
 													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
218 217
 												</div>
219
-												<div class="col-xs-2 itp_in" style="width:10%;">
218
+												<div class="col-xs-a itp_in">
220 219
 													<button type="button" id="ITP_FORM_STINFO02010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
221 220
 												</div>
222 221
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
@@ -229,7 +228,7 @@
229 228
 										</div>
230 229
 									</div>
231 230
 									<div class="itp_form_in">
232
-										<div class="form-group border">
231
+										<div class="form-group">
233 232
 											<label class="col-xs-2 itp_lb"></label>
234 233
 											<div class="col-xs-10 itp_ip">
235 234
 												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS" value="" />
@@ -261,7 +260,7 @@
261 260
 											</div>
262 261
 										</div>
263 262
 										<div class="itp_form_in">
264
-											<div class="form-group">
263
+											<div class="form-group border">
265 264
 												<label class="col-xs-2 itp_lb">정산타입*</label>
266 265
 												<div class="col-xs-4 itp_ip">
267 266
 													<div class="col-xs-7 itp_in">
@@ -342,7 +341,7 @@
342 341
 											</div>
343 342
 										</div>
344 343
 										<div class="itp_form_in">
345
-											<div class="form-group">
344
+											<div class="form-group border">
346 345
 												<label class="col-xs-2 itp_lb">수정일</label>
347 346
 												<div class="col-xs-4 itp_ip">
348 347
 													<div class="col-xs-12 itp_in fnSysChgDttm"></div>
@@ -366,8 +365,7 @@
366 365
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_VIEW_CD" name="viewCd" value="R">
367 366
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_STORE_ID" name="storeId" value="">
368 367
 								<section class="itp_form_sec">
369
-									<h4 class="itp_form_tit">매장정보-상세</h4>
370
-									<div class="itp_form_in">
368
+									<div class="itp_form_in border-top">
371 369
 										<div class="form-group">
372 370
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
373 371
 											<div class="col-xs-4 itp_ip">

+ 8 - 10
src/main/webapp/app/stinfo/STINFO03010.html

@@ -57,8 +57,7 @@
57 57
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_CORP_FILE_NO" name="bbookCopyFileNo" value="">
58 58
 					
59 59
 								<section class="itp_form_sec">
60
-									<h4 class="itp_form_tit">공급업체정보-신규</h4>
61
-									<div class="itp_form_in">
60
+									<div class="itp_form_in border-top">
62 61
 										<div class="form-group">
63 62
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
64 63
 											<div class="col-xs-4 itp_ip">
@@ -78,7 +77,7 @@
78 77
 										<div class="form-group">
79 78
 											<label class="col-xs-2 itp_lb">공급업체번호</label>
80 79
 											<div class="col-xs-4 itp_ip">
81
-												<div class="col-xs-7 itp_in fnSpplyId" style="top:4px;"></div>
80
+												<div class="col-xs-11 itp_in fnSpplyId" style="top:4px;"></div>
82 81
 												<!--<div class="col-xs-4 itp_in" style="margin-left:5px;">
83 82
 													<button type="button" id="ITP_BTN_STINFO03010_RESET_PW" class="btn btn-danger btn-sm PWC" style="margin: -1px 0px 0px 3px; display:block;">비밀번호 초기화</button>
84 83
 												</div>-->
@@ -96,7 +95,7 @@
96 95
 										<div class="form-group">
97 96
 											<label class="col-xs-2 itp_lb">공급업체명 *</label>
98 97
 											<div class="col-xs-4 itp_ip">
99
-												<div class="col-xs-9 itp_in">
98
+												<div class="col-xs-7 itp_in">
100 99
 													<input type="text" id="ITP_FORM_STINFO03010_DETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" value="">
101 100
 												</div>
102 101
 											</div>
@@ -245,7 +244,7 @@
245 244
 												<div class="col-xs-1 itp_in">
246 245
 													<input type="text" id="ITP_FORM_STINFO03010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
247 246
 												</div>
248
-												<div class="col-xs-2 itp_in" style="width:10%;">
247
+												<div class="col-xs-a itp_in">
249 248
 													<button type="button" id="ITP_FORM_STINFO03010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
250 249
 												</div>
251 250
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
@@ -259,7 +258,7 @@
259 258
 									</div>
260 259
 									<div class="itp_form_info">
261 260
 										<div class="itp_form_in">
262
-											<div class="form-group border">
261
+											<div class="form-group">
263 262
 												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
264 263
 												<div class="col-xs-4 itp_ip">
265 264
 													<div class="col-xs-a itp_in" style="width:auto;">
@@ -305,7 +304,7 @@
305 304
 								</section>				
306 305
 							</form>
307 306
 							<div class="itp_form_in">
308
-								<div class="itp_table_head fix" style="background:#f5f5f5;">
307
+								<div class="itp_table_head fix" style="background:#fff;">
309 308
 									<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
310 309
 									<div class="pull-right itp_cicon">
311 310
 										<button type="button" id="ITP_BTN_STINFO03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
@@ -333,8 +332,7 @@
333 332
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_FILE_NO" name="popFileNo" value="">
334 333
 					
335 334
 								<section class="itp_form_sec">
336
-									<h4 class="itp_form_tit">공급업체정보-상세</h4>
337
-									<div class="itp_form_in">
335
+									<div class="itp_form_in border-top">
338 336
 										<div class="form-group">
339 337
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
340 338
 											<div class="col-xs-4 itp_ip">
@@ -482,7 +480,7 @@
482 480
 								</section>				
483 481
 							</form>
484 482
 							<div class="itp_form_in">
485
-								<div class="itp_table_head fix" style="background:#f5f5f5;">
483
+								<div class="itp_table_head fix" style="background:#fff;">
486 484
 									<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
487 485
 								</div>
488 486
 								<div id="ITP_STINFO03010_VIEW_jqGrid_list" class="itp_tb_list">

+ 53 - 57
src/main/webapp/app/stinfo/STINFO04010.html

@@ -90,17 +90,16 @@
90 90
 								<input type="hidden" id="ITP_FORM_STINFO04010_DETAIL_ITEM_ID" name="itemId" value="">
91 91
 								<input type="hidden" id="ITP_FORM_STINFO04010_DETAIL_FILE_NO" name="itemImageFileNo" value="">
92 92
 								<section class="itp_form_sec">
93
-									<h4 class="itp_form_tit">품목정보-신규</h4>
94
-									<div class="itp_form_in">
93
+									<div class="itp_form_in border-top">
95 94
 										<div class="form-group">
96 95
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
97
-											<div class="col-xs-5 itp_ip">
96
+											<div class="col-xs-4 itp_ip">
98 97
 												<div class="col-xs-6 itp_in fnBrandNm">
99 98
 												</div>
100 99
 											</div>
101 100
 											<label class="col-xs-2 itp_lb">상태 *</label>
102
-											<div class="col-xs-3 itp_ip">
103
-												<div class="col-xs-9 itp_in">
101
+											<div class="col-xs-4 itp_ip">
102
+												<div class="col-xs-6 itp_in">
104 103
 								               		<select id="ITP_FORM_STINFO04010_DETAIL_ITEM_ST_CD" data-select-code="ITEM_ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
105 104
 												</div>
106 105
 											</div>
@@ -136,14 +135,14 @@
136 135
 									<div class="itp_form_in">
137 136
 										<div class="form-group">
138 137
 											<label class="col-xs-2 itp_lb">품목번호</label>
139
-											<div class="col-xs-5 itp_ip fnItemClassMgntNo"></div>
138
+											<div class="col-xs-4 itp_ip fnItemClassMgntNo"></div>
140 139
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
141
-											<div class="col-xs-5 itp_ip">
142
-												<div class="col-xs-9 itp_in">
143
-								                <select id="ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE" data-select-code="ITEM_TYPE" data-check-required="empty" class="form-control itp_input" name="itemType">
144
-													<option value="">소모품</option>
145
-													<option value="">자산용</option>
146
-												</select>
140
+											<div class="col-xs-4 itp_ip">
141
+												<div class="col-xs-6 itp_in">
142
+									                <select id="ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE" data-select-code="ITEM_TYPE" data-check-required="empty" class="form-control itp_input" name="itemType">
143
+														<option value="">소모품</option>
144
+														<option value="">자산용</option>
145
+													</select>
147 146
 												</div>
148 147
 											</div>
149 148
 										</div>
@@ -151,14 +150,14 @@
151 150
 									<div class="itp_form_in">
152 151
 										<div class="form-group">
153 152
 											<label class="col-xs-2 itp_lb">품목명 *</label>
154
-											<div class="col-xs-5 itp_ip">
155
-												<div class="col-xs-9 itp_in">
153
+											<div class="col-xs-4 itp_ip">
154
+												<div class="col-xs-6 itp_in">
156 155
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ITEM_NM" data-check-required="empty" class="form-control itp_input" name="itemNm" value="품목A">
157 156
 												</div>
158 157
 											</div>
159 158
 											<label class="col-xs-2 itp_lb">내외자구분</label>
160
-											<div class="col-xs-5 itp_ip">
161
-												<div class="col-xs-9 itp_in">
159
+											<div class="col-xs-4 itp_ip">
160
+												<div class="col-xs-6 itp_in">
162 161
 									                <select id="ITP_FORM_STINFO04010_DETAIL_IMP_DVSN" data-select-code="IMP_DVSN" class="form-control itp_input" name="impDvsn">
163 162
 														<option value="">국내</option>
164 163
 														<option value="">수입</option>
@@ -170,7 +169,7 @@
170 169
 									<div class="itp_form_in">
171 170
 										<div class="form-group">
172 171
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
173
-											<div class="col-xs-5 itp_ip">
172
+											<div class="col-xs-4 itp_ip">
174 173
 												<div class="col-xs-6 itp_in">
175 174
 													<select id="ITP_FORM_STINFO04010_DETAIL_PODR_PSSBL_DVSN" data-select-code="PODR_PSSBL_DVSN" data-check-required="empty" class="form-control itp_input" name="podrPssblDvsn">
176 175
 														<option value="">발주가능</option>
@@ -179,8 +178,8 @@
179 178
 												</div>
180 179
 											</div>
181 180
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
182
-											<div class="col-xs-5 itp_ip">
183
-												<div class="col-xs-9 itp_in">
181
+											<div class="col-xs-4 itp_ip">
182
+												<div class="col-xs-6 itp_in">
184 183
 									                <select id="ITP_FORM_STINFO04010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input detail_item_unit" name="unit"></select>
185 184
 												</div>
186 185
 											</div>
@@ -189,7 +188,7 @@
189 188
 									<div class="itp_form_in">
190 189
 										<div class="form-group">
191 190
 											<label class="col-xs-2 itp_lb">구매품목여부 *</label>
192
-											<div class="col-xs-5 itp_ip">
191
+											<div class="col-xs-4 itp_ip">
193 192
 												<div class="col-xs-6 itp_in">
194 193
 													<select id="ITP_FORM_STINFO04010_DETAIL_PCH_ITEM_YN" data-check-required="empty" class="form-control itp_input" name="pchItemYn">
195 194
 														<option value="">구매품목여부</option>
@@ -199,8 +198,8 @@
199 198
 												</div>
200 199
 											</div>
201 200
 											<label class="col-xs-2 itp_lb">구매단위</label>
202
-											<div class="col-xs-5 itp_ip">
203
-												<div class="col-xs-9 itp_in">
201
+											<div class="col-xs-4 itp_ip">
202
+												<div class="col-xs-6 itp_in">
204 203
 									                <select id="ITP_FORM_STINFO04010_DETAIL_PCH_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="pchUnit"></select>
205 204
 												</div>
206 205
 											</div>
@@ -209,7 +208,7 @@
209 208
 									<div class="itp_form_in">
210 209
 										<div class="form-group">
211 210
 											<label class="col-xs-2 itp_lb">판매품목여부 *</label>
212
-											<div class="col-xs-5 itp_ip">
211
+											<div class="col-xs-4 itp_ip">
213 212
 												<div class="col-xs-6 itp_in">
214 213
 													<select id="ITP_FORM_STINFO04010_DETAIL_SALE_ITEM_YN" data-check-required="empty" class="form-control itp_input" name="saleItemYn">
215 214
 														<option value="">판매품목여부</option>
@@ -219,8 +218,8 @@
219 218
 												</div>
220 219
 											</div>
221 220
 											<label class="col-xs-2 itp_lb">판매단위</label>
222
-											<div class="col-xs-5 itp_ip">
223
-												<div class="col-xs-9 itp_in">
221
+											<div class="col-xs-4 itp_ip">
222
+												<div class="col-xs-6 itp_in">
224 223
 								      	          	<select id="ITP_FORM_STINFO04010_DETAIL_SALE_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="saleUnit"></select>
225 224
 												</div>
226 225
 											</div>
@@ -229,14 +228,14 @@
229 228
 									<div class="itp_form_in">
230 229
 										<div class="form-group">
231 230
 											<label class="col-xs-2 itp_lb">자산정보</label>
232
-											<div class="col-xs-5 itp_ip">
231
+											<div class="col-xs-4 itp_ip">
233 232
 												<div class="col-xs-6 itp_in">
234 233
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ASSET_INFO" class="form-control itp_input" name="assetInfo" value="">
235 234
 												</div>
236 235
 											</div>
237 236
 											<label class="col-xs-2 itp_lb">재고단위</label>
238
-											<div class="col-xs-5 itp_ip">
239
-												<div class="col-xs-9 itp_in">
237
+											<div class="col-xs-4 itp_ip">
238
+												<div class="col-xs-6 itp_in">
240 239
 								      	          	<select id="ITP_FORM_STINFO04010_DETAIL_STCK_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="stckUnit"></select>
241 240
 												</div>
242 241
 											</div>
@@ -245,7 +244,7 @@
245 244
 									<div class="itp_form_in">
246 245
 										<div class="form-group">
247 246
 											<label class="col-xs-2 itp_lb">중량</label>
248
-											<div class="col-xs-5 itp_ip">
247
+											<div class="col-xs-4 itp_ip">
249 248
 												<div class="col-xs-3 itp_in">
250 249
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT" data-check-required="number" class="form-control itp_input" name="weight" value="">
251 250
 												</div>
@@ -254,11 +253,11 @@
254 253
 												</div>
255 254
 											</div>
256 255
 											<label class="col-xs-2 itp_lb">부피</label>
257
-											<div class="col-xs-3 itp_ip">
258
-												<div class="col-xs-5 itp_in">
256
+											<div class="col-xs-4 itp_ip">
257
+												<div class="col-xs-3 itp_in">
259 258
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" class="form-control itp_input" name="volume" value="">
260 259
 												</div>
261
-												<div class="col-xs-6 itp_in">
260
+												<div class="col-xs-4 itp_in">
262 261
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volume_unit"></select>
263 262
 												</div>
264 263
 											</div>
@@ -267,7 +266,7 @@
267 266
 									<div class="itp_form_in">
268 267
 										<div class="form-group">
269 268
 											<label class="col-xs-2 itp_lb">가로</label>
270
-											<div class="col-xs-5 itp_ip">
269
+											<div class="col-xs-4 itp_ip">
271 270
 												<div class="col-xs-3 itp_in">
272 271
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" class="form-control itp_input" name="width" value="">
273 272
 												</div>
@@ -276,11 +275,11 @@
276 275
 												</div>
277 276
 											</div>
278 277
 											<label class="col-xs-2 itp_lb">세로</label>
279
-											<div class="col-xs-3 itp_ip">
280
-												<div class="col-xs-5 itp_in">
278
+											<div class="col-xs-4 itp_ip">
279
+												<div class="col-xs-3 itp_in">
281 280
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" class="form-control itp_input" name="height" value="">
282 281
 												</div>
283
-												<div class="col-xs-6 itp_in">
282
+												<div class="col-xs-4 itp_in">
284 283
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="height_unit"></select>
285 284
 												</div>
286 285
 											</div>
@@ -289,7 +288,7 @@
289 288
 									<div class="itp_form_in">
290 289
 										<div class="form-group">
291 290
 											<label class="col-xs-2 itp_lb">높이</label>
292
-											<div class="col-xs-5 itp_ip">
291
+											<div class="col-xs-4 itp_ip">
293 292
 												<div class="col-xs-3 itp_in">
294 293
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" class="form-control itp_input" name="high" value="">
295 294
 												</div>
@@ -298,8 +297,8 @@
298 297
 												</div>
299 298
 											</div>
300 299
 											<label class="col-xs-2 itp_lb">1Box수량</label>
301
-											<div class="col-xs-5 itp_ip">
302
-												<div class="col-xs-9 itp_in">
300
+											<div class="col-xs-4 itp_ip">
301
+												<div class="col-xs-6 itp_in">
303 302
 								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY" class="form-control itp_input" name="oneBoxQty" value="">
304 303
 												</div>
305 304
 											</div>
@@ -308,7 +307,7 @@
308 307
 									<div class="itp_form_in">
309 308
 										<div class="form-group">
310 309
 											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
311
-											<div class="col-xs-5 itp_ip">
310
+											<div class="col-xs-4 itp_ip">
312 311
 												<div class="col-xs-6 itp_in">
313 312
 													<select id="ITP_FORM_STINFO04010_DETAIL_EXPRY_YN" data-check-required="empty" class="form-control itp_input" name="expryYn">
314 313
 														<option value="">유통기한여부</option>
@@ -318,11 +317,11 @@
318 317
 												</div>
319 318
 											</div>
320 319
 											<label class="col-xs-2 itp_lb">유통가능기간</label>
321
-											<div class="col-xs-3 itp_ip">
322
-												<div class="col-xs-5 itp_in">
320
+											<div class="col-xs-4 itp_ip">
321
+												<div class="col-xs-6 itp_in">
323 322
 								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD" class="form-control itp_input" name="expryPeriod" value="30">
324 323
 												</div>
325
-												<div class="col-xs-5 itp_in">
324
+												<div class="col-xs-a itp_in">
326 325
 													<label class="itp_in">(Day)</label>
327 326
 												</div>
328 327
 											</div>
@@ -331,7 +330,7 @@
331 330
 									<div class="itp_form_in">
332 331
 										<div class="form-group">
333 332
 											<label class="col-xs-2 itp_lb">반품기능여부</label>
334
-											<div class="col-xs-5 itp_ip">
333
+											<div class="col-xs-4 itp_ip">
335 334
 												<div class="col-xs-6 itp_in">
336 335
 													<select id="ITP_FORM_STINFO04010_DETAIL_RTN_PSSBL_YN" class="form-control itp_input" name="rtnPssblYn">
337 336
 														<option value="">반품기능여부</option>
@@ -341,8 +340,8 @@
341 340
 												</div>
342 341
 											</div>
343 342
 											<label class="col-xs-2 itp_lb">반품구분</label>
344
-											<div class="col-xs-5 itp_ip">
345
-												<div class="col-xs-9 itp_in">
343
+											<div class="col-xs-4 itp_ip">
344
+												<div class="col-xs-6 itp_in">
346 345
 													<select id="ITP_FORM_STINFO04010_DETAIL_RTN_DVSN" data-select-code="RTN_DVSN" class="form-control itp_input" name="rtnDvsn">
347 346
 														<option value="">실물반품</option>
348 347
 														<option value="">폐기반품</option>
@@ -413,13 +412,10 @@
413 412
 										<div class="form-group">
414 413
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
415 414
 											<div class="col-xs-12 itp_ip">
416
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:auto;"></div>
417
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
418
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:auto;"></div>
419
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
420
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:auto;"></div>
421
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
422
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:auto;"></div>
415
+												<div class="col-xs-a itp_in itp_noMar fnItemClass1"></div>
416
+												<div class="col-xs-a itp_in itp_noMar fnItemClass2"></div>
417
+												<div class="col-xs-a itp_in itp_noMar fnItemClass3"></div>
418
+												<div class="col-xs-a itp_in itp_noMar fnItemClass4"></div>
423 419
 											</div>
424 420
 										</div>
425 421
 									</div>
@@ -514,9 +510,9 @@
514 510
 											</div>
515 511
 											<label class="col-xs-2 itp_lb">부피</label>
516 512
 											<div class="col-xs-3 itp_ip">
517
-												<div class="col-xs-5 itp_in fnVolume" style="width:auto;">
513
+												<div class="col-xs-3 itp_in fnVolume" style="width:auto;">
518 514
 												</div>
519
-												<div class="col-xs-6 itp_in fnUnit">
515
+												<div class="col-xs-4 itp_in fnUnit">
520 516
 												</div>
521 517
 											</div>
522 518
 										</div>
@@ -532,9 +528,9 @@
532 528
 											</div>
533 529
 											<label class="col-xs-2 itp_lb">세로</label>
534 530
 											<div class="col-xs-3 itp_ip">
535
-												<div class="col-xs-5 itp_in fnHeight" style="width:auto;">
531
+												<div class="col-xs-3 itp_in fnHeight" style="width:auto;">
536 532
 												</div>
537
-												<div class="col-xs-6 itp_in fnUnit">
533
+												<div class="col-xs-4 itp_in fnUnit">
538 534
 												</div>
539 535
 											</div>
540 536
 										</div>

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 5 - 1
src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -767,6 +767,10 @@ a.g-menu-item, a.soptclass, a.clearsearchclass {
767 767
 .ui-jqgrid .ui-jqgrid-view button {
768 768
     /*font-size: 11px*/
769 769
 }
770
+.ui-jqgrid .ui-jqgrid-view input,
771
+.ui-jqgrid .ui-jqgrid-view select {
772
+	background:#FDFDF5;
773
+}
770 774
 .ui-jqgrid .ui-scroll-popup {
771 775
 	width: 100px;
772 776
 }
@@ -1035,4 +1039,4 @@ td.menu_text {
1035 1039
 
1036 1040
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
1037 1041
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
1038
-.table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}
1042
+.table>tbody>tr.success .jqgrid-rownum {background:#FDFDF5 !important;}

+ 1 - 1
src/main/webapp/js/app/locales/locale-ko.js

@@ -395,7 +395,7 @@ const ITP_MSG_LOCALE = (function() {
395 395
 			},
396 396
 			"grid": {
397 397
 				"noData": "등록된 게시물이 없습니다.",
398
-				"noSrh": "검색 결과가 없습니다.<br><u>이전 검색 결과로 돌아가기</u>",
398
+				"noSrh": "검색 결과가 없습니다.",
399 399
 				"noStore": "연결된 매장이 없습니다.",
400 400
 				"noOrder": "주문이 발생한 매장이 없습니다.",
401 401
 				"noOrderSt": "발생된 주문이 없습니다."

+ 0 - 5
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -324,7 +324,6 @@ let pageObj = {
324 324
 						}
325 325
 					});
326 326
 					$((pageObj.pageMode === 'MODIFY') ? OPER01010_NEW_GRID_EMPTY : OPER01010_DETAIL_GRID_EMPTY).hide();
327
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //행 추가할때 2번째 마다 색변경
328 327
 				};
329 328
 				fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
330 329
 			},
@@ -348,8 +347,6 @@ let pageObj = {
348 347
 				url: DOMAIN + API_USERAUTH_GRID_LIST,
349 348
 				multiselect: (this.mode !== 'VIEW'),
350 349
 				loadComplete: function(data) {
351
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
352
-
353 350
 					console.log(data);
354 351
 					itp_fn_grid_load_complete(data, gridId, true, undefined, 'OPER01010_' + this.mode);
355 352
 				},
@@ -434,7 +431,6 @@ let listObj = {
434 431
 					}
435 432
 				},
436 433
 				loadComplete: function(data) {
437
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
438 434
 					console.log(data);
439 435
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
440 436
 					var ids = $(OPER01010_GRID_ID).getDataIDs();
@@ -677,7 +673,6 @@ let createObj = {
677 673
 				data: gridData,
678 674
 				multiselect: true,
679 675
 				loadComplete: function(data) {
680
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
681 676
 					_this.clearData();
682 677
 				}
683 678
 			};

+ 0 - 1
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -444,7 +444,6 @@ let listObj = {
444 444
 					}
445 445
 				},
446 446
 				loadComplete: function(data) {
447
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
448 447
 					console.log(data);
449 448
 					itp_fn_grid_load_complete(data, OPER02010_GRID_ID, true, 'number', 'OPER02010', listObj.grid.itp_OPER02010_search, _this.itp_fn_OPER02010_empty, true, data.gridRecords, true);
450 449
 					var ids = $(OPER02010_GRID_ID).getDataIDs();

+ 5 - 31
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -153,8 +153,6 @@ let pageObj = {
153 153
 		this.ui.init();
154 154
 		this.event.init();
155 155
 	},
156
-	itp_OPER03010_param: {},
157
-	itp_OPER03010_search: false,
158 156
 	ui: {
159 157
 		init: function () {
160 158
 			this.view();
@@ -191,7 +189,7 @@ let pageObj = {
191 189
 		},
192 190
 		grid: function() {
193 191
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
194
-			listObj.empty.init();
192
+			//listObj.empty.init();
195 193
 			itp_fn_fire_window_resize();
196 194
 		},
197 195
 		ready: function() {
@@ -316,7 +314,6 @@ let pageObj = {
316 314
 						}
317 315
 					});
318 316
 					$(OPER03010_DETAIL_GRID_EMPTY).hide();
319
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
320 317
 				};
321 318
 				fn_call_popup('biz', 'BIZPOP_APPL_SALES_USER_SCH', '#ITP_ASIDE', popFn, null, 'S');
322 319
 			},
@@ -332,7 +329,6 @@ let pageObj = {
332 329
 				data: gridData,
333 330
 				multiselect: (this.mode !== 'VIEW'),
334 331
 				loadComplete: function(data) {
335
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
336 332
 					$(_this.mode === 'VIEW' ? OPER03010_VIEW_GRID_LIST : OPER03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
337 333
 					data.records === 0 ? _this.clearData() : $(this.mode === 'VIEW' ? OPER03010_VIEW_GRID_EMPTY : OPER03010_DETAIL_GRID_EMPTY).hide();
338 334
 				}
@@ -374,33 +370,18 @@ let listObj = {
374 370
 	},
375 371
 	empty: {
376 372
 		init: function() {
377
-			var _this = this;
378 373
 			this.push();
379
-			$(OPER03010_GRID_EMPTY).on('click', function() {
380
-				_this.back();
381
-				_this.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
382
-				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_OPER03010_param)}).trigger('reloadGrid');
383
-			});
384 374
 		},
385
-		itp_OPER03010_param: {},
386 375
 		push: function() {
387
-			let param = $('#ITP_FORM_OPER03010_SEARCH').serializeObject();
388
-			pageObj.itp_OPER03010_param = param;
389 376
 		},
390 377
 		back: function() {
391
-			$('#ITP_FORM_OPER03010_SEARCH_FROM_DT').val(pageObj.itp_OPER03010_param.fromDt);
392
-			$('#ITP_FORM_OPER03010_SEARCH_TO_DT').val(pageObj.itp_OPER03010_param.toDt);
393
-			$('#ITP_FORM_OPER03010_SEARCH_AFFL_SHOP_NM').val(pageObj.itp_OPER03010_param.safflShopNm);
394
-			$('#ITP_FORM_OPER03010_SEARCH_ST_CD').val(pageObj.itp_OPER03010_param.sstCd);
395 378
 		}
396 379
 	},
397 380
 	grid: {
398 381
 		init: function () {
399 382
 			// 데이터 없을때
400
-			listObj.empty.push();
401 383
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
402 384
 			itp_fn_fire_window_resize();
403
-			this.reload();
404 385
 			this.search();
405 386
 		},
406 387
 		colModel: gridColModel.list,
@@ -430,9 +411,9 @@ let listObj = {
430 411
 					}
431 412
 				},
432 413
 				loadComplete: function(data) {
433
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
434
-					console.log(data);
435
-					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
414
+					console.log("loadComplete=======================");
415
+					console.log(listObj.itp_OPER03010_search);
416
+					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', listObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
436 417
 					var ids = $(OPER03010_GRID_ID).getDataIDs();
437 418
 					$.each(ids, function(idx, rowId) {
438 419
 						$(OPER03010_GRID_ID).jqGrid('setCell', rowId, 'afflShopNm', '', ITP_GRID_COL_STYLE.link);
@@ -441,17 +422,10 @@ let listObj = {
441 422
 			};
442 423
 			itp_fn_grid_make_remote(option);
443 424
 		},
444
-		reload : function() {
445
-			var _this = this;
446
-			$(OPER03010_GRID_EMPTY).off('click').on('click', function() {
447
-				pageObj.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
448
-				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(pageObj.itp_OPER03010_param)}).trigger('reloadGrid');
449
-			});
450
-		},
451 425
 		clearData : function() {
452 426
 			$(OPER03010_GRID_ID).jqGrid('clearGridData', true);
453 427
 			$(OPER03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
454
-			$(OPER03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
428
+			$(OPER03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noSrh);
455 429
 			$(OPER03010_GRID_EMPTY).show();
456 430
 		},
457 431
 		unload : function() {

+ 0 - 1
src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -248,7 +248,6 @@ let listObj = {
248 248
                     }
249 249
                 },
250 250
                 loadComplete: function(data) {
251
-                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
252 251
                     // console.log(data);
253 252
                     itp_fn_grid_load_complete(data, OPER04010_GRID_ID, true, 'number', 'OPER04010', listObj.itp_OPER04010_search, listObj.empty, true, data.gridRecords, true);
254 253
                     var ids = $(OPER04010_GRID_ID).getDataIDs();

+ 0 - 1
src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -337,7 +337,6 @@ let listObj = {
337 337
                     }
338 338
                 },
339 339
                 loadComplete: function(data) {
340
-                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경ㄴ
341 340
                     console.log(data);
342 341
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
343 342
                     var ids = $(OPER06010_GRID_ID).getDataIDs();

+ 22 - 0
src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -411,6 +411,28 @@ let viewObj = {
411 411
         pageObj.switchScreen('VIEW');
412 412
         $('#ITP_FORM_STINFO04010_VIEW #ITP_FORM_STINFO04010_VIEW_ITEM_ID').val(result.itemId);
413 413
         $('#ITP_FORM_STINFO04010_VIEW .fnStCd').text(result.itemStNm);
414
+        var itemClassNm = ""; //itemClassNm 값 없음
415
+		
416
+		if (result.itemClass1Nm != null && result.itemClass1Nm != "")//itemclass1Nm 값이 있을때
417
+		{
418
+			var itemClassNm = result.itemClass1Nm;  //itemClassNm 에 itemClass1Nm 값 넣음
419
+		}
420
+		
421
+		if (result.itemClass2Nm != null && result.itemClass2Nm != "")//itemclass2Nm 값이 있을때
422
+		{
423
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass2Nm;	//itemClassNm 에 itemClassNm + > + itemClass2Nm 값 넣음
424
+		}
425
+		
426
+		if (result.itemClass3Nm != null && result.itemClass3Nm != "")//itemclass3Nm 값이 있을때
427
+		{
428
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass3Nm;	//itemClassNm 에 itemClassNm + > + itemClass3Nm 값 넣음		
429
+		}
430
+		
431
+		if (result.itemClass4Nm != null && result.itemClass4Nm != "")//itemclass4Nm 값이 있을때
432
+		{
433
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass4Nm;	//itemClassNm 에 itemClassNm + > + itemClass4Nm 값 넣음
434
+
435
+		}
414 436
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1Nm);
415 437
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2Nm);
416 438
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);

+ 4 - 1
src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -53,7 +53,10 @@
53 53
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
54 54
 			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display:none;">
55 55
 				<li class="history_list list-row">
56
-				  <div>
56
+				  <div class="scroll_btn">
57
+			  		<input type="checkbox">
58
+			  	  </div>
59
+				  <div class="btn_check">
57 60
 					<div class="left">
58 61
 					  <div class="nomal">
59 62
 						<label>브랜드명 &nbsp;:</label>

+ 19 - 19
src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html

@@ -29,7 +29,7 @@
29 29
 			<div class="line">
30 30
 				<label>발주번호/품목명</label>
31 31
 			  <div class="search_wrap">
32
-				<input id="ITP_FORM_MCOLLMNG02010_LIST_ITEM_NM" name="ITEM_NM" style="width: 262px;" type="text" placeholder="검색어입력">
32
+				<input id="ITP_FORM_MCOLLMNG02010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
33 33
 			  </div>
34 34
 			</div>
35 35
 			<div class="line" style="height:45px;">
@@ -43,9 +43,12 @@
43 43
 		  </div>
44 44
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
45 45
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
46
-			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
46
+			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
47 47
 				<li class="history_list3 list-row">
48
-				  <div>
48
+				  <div class="scroll_btn">
49
+			  		<input type="checkbox">
50
+			  	  </div>
51
+				  <div class="btn_check">
49 52
 					<div class="left">
50 53
 					  <div class="nomal">
51 54
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -62,7 +65,7 @@
62 65
 					  <div class="nomal">
63 66
 						<label class="col_0">반품발주항번 &nbsp;:</label>
64 67
 						<div class="col_5">
65
-						  <div class="fnRtnPodrNo col_5">1</div>
68
+						  <div class="fnColReqDt col_5">1</div>
66 69
 						</div>
67 70
 						<label class="col_6">수거요청일 &nbsp;:</label>
68 71
 						<div>
@@ -104,9 +107,6 @@
104 107
 						<div>
105 108
 						  <div class="fnRtnDodrTotalAmt space0"></div>
106 109
 						</div>
107
-						<div class="scroll_btn">
108
-						  <button id="ITP_BTN_MCOLLMNG02010_LIST_CHOICE">선택</button>
109
-						</div>
110 110
 					  </div>
111 111
 					</div>
112 112
 				  </div>
@@ -147,12 +147,6 @@
147 147
 				<div class="fnRtnDodrTotalAmt"></div>
148 148
 			  </div>      
149 149
 			</div>
150
-			<div class="line">
151
-			<label class="col_6">수거일자</label>
152
-			  <div class="line_right">
153
-				  <input id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="year" type="date">
154
-			  </div>
155
-			</div>
156 150
 			<div class="line">
157 151
 			  <label>수거장소</label>
158 152
 			  <div class="line_right">
@@ -165,11 +159,17 @@
165 159
 				<div class="fnPickTelNo"></div>
166 160
 			  </div>      
167 161
 			</div>
162
+			<div class="line">
163
+			  <label class="col_6">수거일자</label>
164
+			  <div class="line_right">
165
+				  <input id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="year" type="date">
166
+			  </div>
167
+			</div>
168 168
 			<div class="line">
169 169
 			  <label>수거담당자</label>
170 170
 			  <div class="line_right">
171
-				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM" name="rtnMgrNm" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
172
-				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO" name="rtnMgrTelNo" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
171
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM" name="pickMgrNm" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
172
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO" name="pickMgrTelNo" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
173 173
 			  </div>
174 174
 			</div>
175 175
 			<div class="table_header">
@@ -178,7 +178,7 @@
178 178
 		  </div>
179 179
 			<div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
180 180
 			  <ul id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWS" class="panel-group"></ul>
181
-			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: bl;">
181
+			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
182 182
 				<li class="history_list2 list-row">
183 183
 				  <div>
184 184
 					<div class="left">
@@ -221,7 +221,7 @@
221 221
 					  <div class="nomal">
222 222
 						<label>수거수량 &nbsp;:</label>
223 223
 						<div class="">
224
-						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="coltQty">
224
+						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
225 225
 						</div>
226 226
 						<label>수거구분&nbsp;:</label>
227 227
 						<div class="">
@@ -247,8 +247,8 @@
247 247
 			</div>
248 248
 		  </div>
249 249
 		  <div class="button_bar">
250
-			<button id="ITP_BTN_MCOLLMNG02010_LIST_COL_ADD" class="ok col_12 btn-primary CRT">생성</button>
251
-			<!--<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
250
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD" class="btn_col_6 btn-primary CRT">생성</button>
251
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
252 252
 		  </div>
253 253
 	  </form>
254 254
 	</div>

+ 49 - 10
src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

@@ -46,7 +46,10 @@
46 46
 			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
47 47
 			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
48 48
 				<li class="history_list3 list-row">
49
-				  <div>
49
+				  <div class="scroll_btn">
50
+			  		<input type="checkbox">
51
+			  	  </div>
52
+				  <div class="btn_check">
50 53
 					<div class="left">
51 54
 					  <div class="nomal">
52 55
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -99,7 +102,7 @@
99 102
 					  <div class="nomal">
100 103
 						<label class="col_0">수거장소 &nbsp;:</label>
101 104
 						<div>
102
-						  <div class="fnWhsAddr space1"></div>
105
+						  <div class="fnWhsNm space1"></div>
103 106
 						</div>
104 107
 						<label>수거담당자&nbsp;:</label>
105 108
 						<div>
@@ -111,22 +114,20 @@
111 114
 				</li>
112 115
 			</div>
113 116
 			<div class="button_bar">
114
-			  <button id="ITP_BTN_MCOLLMNG03010_LIST_DLV_VIEW" class="btn_col_6 btn-primary IVDETAIL">납품서보기</button>
117
+			  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-primary IVDETAIL">수거서보기</button>
115 118
 			  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
116 119
 			</div>
117 120
 		  </div>
118 121
 	  </form>
119 122
 	</div>
120
-	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: block;">
123
+	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">
121 124
 		<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
122 125
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
123 126
 		  <div class="detail_content">
124 127
 			<div class="detail_header">
125
-			  <div class="detail_logo">
126
-				<img src="../img/naver.png" alt="">
127
-			  </div>
128
+			  <div class="detail_logo"></div>
128 129
 			  <div class="detail_ok">
129
-				<label>납품 확인서</label>
130
+				<label>수거 확인서</label>
130 131
 			  </div>
131 132
 			</div>
132 133
 			<div class="detail_confirmation">
@@ -148,7 +149,7 @@
148 149
 			  <div class="detail_col">
149 150
 				<label>수거담당자</label>
150 151
 				<i>:</i>
151
-				<div class="fnColMgrNm">홍길동(010-1234-1548)</div>
152
+				<div class="fnPickMgrNm"></div>
152 153
 			  </div>
153 154
 			  <div class="detail_col">
154 155
 				<label>수거장소</label>
@@ -211,7 +212,7 @@
211 212
 		  </div>
212 213
 			<div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
213 214
 				 <ul id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
214
-				 <div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY" style="display: block;">
215
+				 <div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;">
215 216
 				<li class="history_list5 list-row">
216 217
 				  <div>
217 218
 					<div class="left">
@@ -259,4 +260,42 @@
259 260
 		  </div>
260 261
 	  </form>
261 262
 	</div>
263
+	<div id="ITP_MOBILE_JS"></div>
264
+	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
265
+		<div class="pop">
266
+			<div class="header">
267
+				<div class="header_left">
268
+					<label>> 납품장소</label>
269
+				</div>
270
+				<div class="header_right">
271
+					<button type="button" id="ITP_BTN_MCOLLMNG03010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
272
+				</div>
273
+			</div>
274
+			<div class="search_bar">
275
+				<form id="ITP_FORM_MCOLLMNG03010_POP_WHS" class="form-horizontal" onsubmit="return false;">
276
+					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
277
+					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
278
+					<input id="ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
279
+					<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
280
+				</form>
281
+			</div>
282
+			<div class="search_bar">
283
+				<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
284
+			</div>
285
+			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
286
+				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
287
+				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display:none;">
288
+					<li class="list-row">
289
+						<div class="scroll_left">
290
+							<div class="fnWhsNm">브랜드 창고 명A</div>
291
+							<div class="fnLocationNm">(상세위치내용)</div>
292
+						</div>
293
+						<div class="scroll_right">
294
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
295
+						</div>
296
+					</li>
297
+				</div>
298
+			</div>
299
+		</div>
300
+	</div>
262 301
   </section>

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

@@ -55,7 +55,10 @@
55 55
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
56 56
 			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
57 57
 				<li class="history_list list-row">
58
-				  <div>
58
+				  <div class="scroll_btn">
59
+			  		<input type="checkbox">
60
+			  	  </div>
61
+				  <div class="btn_check">
59 62
 					<div class="left">
60 63
 					  <div class="nomal">
61 64
 						<label>브랜드명 &nbsp;:</label>

+ 6 - 6
src/main/webapp/mobile/app/mordmng/MORDMNG02010.html

@@ -49,9 +49,12 @@
49 49
 		  </div>
50 50
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
51 51
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
52
-			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display:none;">
52
+			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
53 53
 				<li class="history_list3 list-row">
54
-				  <div>
54
+			 	  <div class="scroll_btn">
55
+				  	<input type="checkbox">
56
+				  </div>
57
+				  <div class="btn_check">
55 58
 					<div class="left">
56 59
 					  <div class="nomal">
57 60
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -110,9 +113,6 @@
110 113
 						<div>
111 114
 						  <div class="fnPodrAmt space0"></div>
112 115
 						</div>
113
-						<!--<div class="scroll_btn">
114
-						  <button id="ITP_BTN_MORDMNG02010_LIST_CHOICE">선택</button>
115
-						</div>-->
116 116
 					  </div>
117 117
 					</div>
118 118
 				  </div>
@@ -184,7 +184,7 @@
184 184
 		  </div>
185 185
 			<div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
186 186
 			  <ul id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWS" class="panel-group"></ul>
187
-			  <div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
187
+			  <div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY" style="display: block;">
188 188
 				<li class="history_list2 list-row">
189 189
 				  <div>
190 190
 					<div class="left">

+ 236 - 233
src/main/webapp/mobile/app/mordmng/MORDMNG03010.html

@@ -1,261 +1,264 @@
1 1
 <section id="ITP_MOBILE_MORDMNG03010">
2 2
 	<div id="ITP_AJAX_MORDMNG03010_LIST_CONTAINER" style="display: block;">
3
-	  <form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
4
-		  <input type="hidden" id="ITP_FORM_MORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
5
-		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6
-		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
7
-		  <div class="content">
8
-			<div class="line">
9
-			  <label>납품장소</label>
10
-				<div class="search_wrap">
11
-					<div class="float_left">
12
-						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
13
-						<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
3
+		<form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
4
+			<input type="hidden" id="ITP_FORM_MORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
5
+			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6
+			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
7
+			<div class="content">
8
+				<div class="line">
9
+					<label>납품장소</label>
10
+					<div class="search_wrap">
11
+						<div class="float_left">
12
+							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
13
+							<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
14
+						</div>
15
+						<div class="float_left_btn">
16
+							<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
17
+							<button type="button" id="ITP_BTN_MORDMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
18
+						</div>
14 19
 					</div>
15
-					<div class="float_left_btn">
16
-						<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
17
-						<button type="button" id="ITP_BTN_MORDMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
20
+				</div>
21
+				<div class="line">
22
+					<label>납품일자</label>
23
+					<div class="date_to">
24
+						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
25
+						<div class="at">~</div>
26
+						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
18 27
 					</div>
19 28
 				</div>
20
-			</div>
21
-			<div class="line">
22
-			  <label>납품일자</label>
23
-				<div class="date_to">
24
-					<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
25
-					<div class="at">~</div>
26
-					<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
29
+				<div class="line">
30
+					<label>발주번호/품목명</label>
31
+					<div class="search_wrap">
32
+						<input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
33
+					</div>
34
+				</div>
35
+				<div class="line" style="height:45px;">
36
+					<div class="search">
37
+						<button id="ITP_BTN_MORDMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
38
+					</div>
39
+				</div>
40
+				<div class="table_header">
41
+					<h1>> 수주 내역</h1>
27 42
 				</div>
28 43
 			</div>
29
-			<div class="line">
30
-				<label>발주번호/품목명</label>
31
-			  <div class="search_wrap">
32
-				  <input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
33
-			  </div>
34
-			</div>
35
-			<div class="line" style="height:45px;">
36
-			  <div class="search">
37
-				<button id="ITP_BTN_MORDMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
38
-			  </div>
39
-			</div>
40
-			<div class="table_header">
41
-			  <h1>> 수주 내역</h1>
42
-			</div>
43
-		  </div>
44
-		  <div id="ITP_LIST_MORDMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
45
-			  <ul id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
46
-			  <div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display:none;">
47
-				<li class="history_list3 list-row">
48
-				  <div>
49
-					<div class="left">
50
-					  <div class="nomal">
51
-						<label class="col_0">브랜드명 &nbsp;:</label>
52
-						<div>
53
-						  <div class="fnBrandNm space1"></div>
54
-						</div>
55
-						<label>납품서번호&nbsp;:</label>
56
-						<div>
57
-						  <div class="fnDlvShmtUnqNo"></div>
44
+			<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
45
+				<ul id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
46
+				<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display:none;">
47
+					<li class="history_list3 list-row">
48
+					<div class="scroll_btn">
49
+				  		<input type="checkbox">
50
+				  	</div>
51
+						<div class="btn_check">
52
+							<div class="left">
53
+								<div class="nomal">
54
+									<label class="col_0">브랜드명 &nbsp;:</label>
55
+									<div>
56
+										<div class="fnBrandNm space1"></div>
57
+									</div>
58
+									<label>납품서번호&nbsp;:</label>
59
+									<div>
60
+										<div class="fnDlvShmtUnqNo"></div>
61
+									</div>
62
+								</div>
63
+							</div>
64
+							<div class="left">
65
+								<div class="nomal">
66
+									<label class="col_6">납품서상태 &nbsp;:</label>
67
+									<div>
68
+										<div class="fnDlvStNm"></div>
69
+									</div>
70
+									<label class="col_0">수주일자&nbsp;:</label>
71
+									<div>
72
+										<div class="fnPodrRegDt"></div>
73
+									</div>
74
+								</div>
75
+							</div>
76
+							<div class="left">
77
+								<div class="nomal">
78
+									<label>납품요청일&nbsp;:</label>
79
+									<div>
80
+										<div class="fnDlvReqDt"></div>
81
+									</div>
82
+									<label>납품예정일&nbsp;:</label>
83
+									<div>
84
+										<div class="fnDlvSchDt"></div>
85
+									</div>
86
+								</div>
87
+							</div>
88
+							<div class="left">
89
+								<div class="nomal">
90
+									<label class="col_0">품목수량 &nbsp;:</label>
91
+									<div>
92
+										<div class="fnDlvQty space1"></div>
93
+									</div>
94
+									<label>발주총금액&nbsp;:</label>
95
+									<div>
96
+										<div class="fnPodrAmt"></div>
97
+									</div>
98
+								</div>
99
+							</div>
100
+							<div class="left">
101
+								<div class="nomal">
102
+									<label class="col_0">납품장소 &nbsp;:</label>
103
+									<div>
104
+										<div class="fnWhsNm space1"></div>
105
+									</div>
106
+									<label>납품담당자&nbsp;:</label>
107
+									<div>
108
+										<div class="fnDlvMgrNm space0"></div>
109
+									</div>
110
+								</div>
111
+							</div>
58 112
 						</div>
59
-					  </div>
113
+					</li>
114
+				</div>
115
+				<div class="button_bar">
116
+					<button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-primary IVDETAIL">납품서보기</button>
117
+					<!--<button id="ITP_BTN_MORDMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
118
+				</div>
119
+			</div>
120
+		</form>
121
+	</div>
122
+	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
123
+		<form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
124
+			<input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
125
+			<div class="detail_content">
126
+				<div class="detail_header">
127
+					<div class="detail_logo"></div>
128
+					<div class="detail_ok">
129
+						<label>납품 확인서</label>
60 130
 					</div>
61
-					<div class="left">
62
-					  <div class="nomal">
63
-						<label class="col_6">납품서상태 &nbsp;:</label>
64
-						<div>
65
-						  <div class="fnDlvStNm"></div>
131
+				</div>
132
+				<div class="detail_confirmation">
133
+					<div class="detail_col">
134
+						<label>발행일</label>
135
+						<i>:</i>
136
+						<div class="fnDlvRegDt"></div>
137
+					</div>
138
+					<div class="detail_col">
139
+						<label>납품서확인번호</label>
140
+						<i>:</i>
141
+						<div class="fnDlvSttmtUnqNo"></div>
142
+					</div>
143
+					<div class="detail_col">
144
+						<label>납품일</label>
145
+						<i>:</i>
146
+						<div class="fnDlvSchDt"></div>
147
+					</div>
148
+					<div class="detail_col">
149
+						<label>납품담당자</label>
150
+						<i>:</i>
151
+						<div class="fnDlvMgrNm"></div>
152
+					</div>
153
+					<div class="detail_col">
154
+						<label>납품장소</label>
155
+						<i>:</i>
156
+						<div class="fnWhsAddr"></div>
157
+					</div>
158
+					<div class="detail_col">
159
+						<label>전화번호</label>
160
+						<i>:</i>
161
+						<div class="fnWhsMgrTelNo"></div>
162
+					</div>
163
+				</div>
164
+				<div class="detail_company_info">
165
+					<div class="info_left">
166
+						<div class="weight">
167
+							<label>공급처</label>
66 168
 						</div>
67
-						<label class="col_0">수주일자&nbsp;:</label>
68
-						<div>
69
-						  <div class="fnPodrRegDt"></div>
169
+						<div class="company_info">
170
+							<label>등록번호&nbsp;:&nbsp;</label>
171
+							<div class="fnDlvBsnsRegno"></div>
70 172
 						</div>
71
-					  </div>
72
-					</div>
73
-					<div class="left">
74
-					  <div class="nomal">
75
-						<label>납품요청일&nbsp;:</label>
76
-						<div>
77
-						  <div class="fnDlvReqDt"></div>
173
+						<div class="company_info">
174
+							<label>상호&nbsp;:&nbsp;</label>
175
+							<div class="fnDlvNm"></div>
78 176
 						</div>
79
-						<label>납품예정일&nbsp;:</label>
80
-						<div>
81
-						  <div class="fnDlvSchDt"></div>
177
+						<div class="company_info">
178
+							<label>성명&nbsp;:&nbsp;</label>
179
+							<div class="fnDlvOwnerNm"></div>
180
+						</div>
181
+						<div class="company_info">
182
+							<label>주소&nbsp;:&nbsp;</label>
183
+							<div class="fnDlvAddr"></div>
82 184
 						</div>
83
-					  </div>
84 185
 					</div>
85
-					<div class="left">
86
-					  <div class="nomal">
87
-						<label class="col_0">품목수량 &nbsp;:</label>
88
-						<div>
89
-						  <div class="fnDlvQty space1"></div>
186
+					<div class="info_left">
187
+						<div class="weight">
188
+							<label>발주처</label>
90 189
 						</div>
91
-						<label>발주총금액&nbsp;:</label>
92
-						<div>
93
-						  <div class="fnPodrAmt"></div>
190
+						<div class="company_info">
191
+							<label>등록번호&nbsp;:&nbsp;</label>
192
+							<div class="fnPoBsnsRegno"></div>
94 193
 						</div>
95
-					  </div>
96
-					</div>
97
-					<div class="left">
98
-					  <div class="nomal">
99
-						<label class="col_0">납품장소 &nbsp;:</label>
100
-						<div>
101
-						  <div class="fnWhsNm space1"></div>
194
+						<div class="company_info">
195
+							<label>상호&nbsp;:&nbsp;</label>
196
+							<div class="fnPoNm"></div>
102 197
 						</div>
103
-						<label>납품담당자&nbsp;:</label>
104
-						<div>
105
-						  <div class="fnDlvMgrNm space0"></div>
198
+						<div class="company_info">
199
+							<label>성명&nbsp;:&nbsp;</label>
200
+							<div class="fnPoOwnerNm"></div>
201
+						</div>
202
+						<div class="company_info">
203
+							<label>주소&nbsp;:&nbsp;</label>
204
+							<div class="fnPoAddr"></div>
106 205
 						</div>
107
-					  </div>
108 206
 					</div>
109
-				  </div>
110
-				</li>
111
-			</div>
112
-			<div class="button_bar">
113
-			  <button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-primary IVDETAIL">납품서보기</button>
114
-			  <!--<button id="ITP_BTN_MORDMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
115
-			</div>
116
-		  </div>
117
-	  </form>
118
-	</div>
119
-	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
120
-	  <form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
121
-		  <input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
122
-		  <div class="detail_content">
123
-			<div class="detail_header">
124
-			  <div class="detail_logo"></div>
125
-			  <div class="detail_ok">
126
-				<label>납품 확인서</label>
127
-			  </div>
128
-			</div>
129
-			<div class="detail_confirmation">
130
-			  <div class="detail_col">
131
-				<label>발행일</label>
132
-				<i>:</i>
133
-				<div class="fnDlvRegDt"></div>
134
-			  </div>
135
-			  <div class="detail_col">
136
-				<label>납품서확인번호</label>
137
-				<i>:</i>
138
-				<div class="fnDlvSttmtUnqNo"></div>
139
-			  </div>
140
-			  <div class="detail_col">
141
-				<label>납품일</label>
142
-				<i>:</i>
143
-				<div class="fnDlvSchDt"></div>
144
-			  </div>
145
-			  <div class="detail_col">
146
-				<label>납품담당자</label>
147
-				<i>:</i>
148
-				<div class="fnDlvMgrNm"></div>
149
-			  </div>
150
-			  <div class="detail_col">
151
-				<label>납품장소</label>
152
-				<i>:</i>
153
-				<div class="fnWhsAddr"></div>
154
-			  </div>
155
-			  <div class="detail_col">
156
-				<label>전화번호</label>
157
-				<i>:</i>
158
-				<div class="fnWhsMgrTelNo"></div>
159
-			  </div>
160
-			</div>
161
-			<div class="detail_company_info">
162
-			  <div class="info_left">
163
-				<div class="weight">
164
-				  <label>공급처</label>
165
-				</div>
166
-				<div class="company_info">
167
-				  <label>등록번호&nbsp;:&nbsp;</label>
168
-				  <div class="fnDlvBsnsRegno"></div>
169
-				</div>
170
-				<div class="company_info">
171
-				  <label>상호&nbsp;:&nbsp;</label>
172
-				  <div class="fnDlvNm"></div>
173
-				</div>
174
-				<div class="company_info">
175
-				  <label>성명&nbsp;:&nbsp;</label>
176
-				  <div class="fnDlvOwnerNm"></div>
177
-				</div>
178
-				<div class="company_info">
179
-				  <label>주소&nbsp;:&nbsp;</label>
180
-				  <div class="fnDlvAddr"></div>
181 207
 				</div>
182
-			  </div>
183
-			  <div class="info_left">
184
-				<div class="weight">
185
-				  <label>발주처</label>
208
+				<div class="table_header">
209
+					<h1>> 납품 상세 내역</h1>
186 210
 				</div>
187
-				<div class="company_info">
188
-				  <label>등록번호&nbsp;:&nbsp;</label>
189
-				  <div class="fnPoBsnsRegno"></div>
190
-				</div>
191
-				<div class="company_info">
192
-				  <label>상호&nbsp;:&nbsp;</label>
193
-				  <div class="fnPoNm"></div>
194
-				</div>
195
-				<div class="company_info">
196
-				  <label>성명&nbsp;:&nbsp;</label>
197
-				  <div class="fnPoOwnerNm"></div>
198
-				</div>
199
-				<div class="company_info">
200
-				  <label>주소&nbsp;:&nbsp;</label>
201
-				  <div class="fnPoAddr"></div>
202
-				</div>
203
-			  </div>
204
-			</div>
205
-			<div class="table_header">
206
-			  <h1>> 납품 상세 내역</h1>
207 211
 			</div>
208
-		  </div>
209 212
 			<div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
210
-				 <ul id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
211
-				 <div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWCOPY" style="display:none;">
212
-				<li class="history_list5 list-row">
213
-				  <div>
214
-					<div class="left">
215
-					  <div class="nomal">
216
-						<label>발주번호 &nbsp;:</label>
217
-						<div class="space2">
218
-						  <div class="fnPchPodrUnqNo"></div>
219
-						</div>
220
-						<label class="col_0">품목아이디&nbsp;:</label>
221
-						<div class="space2">
222
-						  <div class="fnItemId"></div>
223
-						</div>
224
-					  </div>
225
-					</div>
226
-					<div class="left">
227
-					  <div class="nomal">
228
-						<label>품목명 &nbsp;:</label>
229
-						<div class="space2">
230
-						  <div class="fnItemNm"></div>
231
-						</div>
232
-						<label>유통기한&nbsp;:</label>
233
-						<div class="space2">
234
-						  <div class="fnExpryDate"></div>
235
-						</div>
236
-					  </div>
237
-					</div>
238
-					<div class="left">
239
-					  <div class="nomal">
240
-						<label>발주수량 &nbsp;:</label>
241
-						<div class="space2">
242
-						  <div class="fnPodrQty"></div>
243
-						</div>
244
-						<label>납품수량&nbsp;:</label>
213
+				<ul id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
214
+				<div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWCOPY" style="display:none;">
215
+					<li class="history_list5 list-row">
245 216
 						<div>
246
-						  <div class="fnDlvQty"></div>
217
+							<div class="left">
218
+								<div class="nomal">
219
+									<label>발주번호 &nbsp;:</label>
220
+									<div class="space2">
221
+										<div class="fnPchPodrUnqNo"></div>
222
+									</div>
223
+									<label class="col_0">품목아이디&nbsp;:</label>
224
+									<div class="space2">
225
+										<div class="fnItemId"></div>
226
+									</div>
227
+								</div>
228
+							</div>
229
+							<div class="left">
230
+								<div class="nomal">
231
+									<label>품목명 &nbsp;:</label>
232
+									<div class="space2">
233
+										<div class="fnItemNm"></div>
234
+									</div>
235
+									<label>유통기한&nbsp;:</label>
236
+									<div class="space2">
237
+										<div class="fnExpryDate"></div>
238
+									</div>
239
+								</div>
240
+							</div>
241
+							<div class="left">
242
+								<div class="nomal">
243
+									<label>발주수량 &nbsp;:</label>
244
+									<div class="space2">
245
+										<div class="fnPodrQty"></div>
246
+									</div>
247
+									<label>납품수량&nbsp;:</label>
248
+									<div>
249
+										<div class="fnDlvQty"></div>
250
+									</div>
251
+								</div>
252
+							</div>
247 253
 						</div>
248
-					  </div>
249
-					</div>
250
-				  </div>
251
-				</li>
254
+					</li>
255
+				</div>
256
+			</div>
257
+			<div class="button_bar">
258
+				<button id="ITP_BTN_MORDMNG03010_VIEW_CONFIRM" class="ok col_12 btn-gray COK">확인</button>
259
+				<!--<button id="ITP_BTN_MORDMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
252 260
 			</div>
253
-		  </div>
254
-		  <div class="button_bar">
255
-			<button id="ITP_BTN_MORDMNG03010_VIEW_CONFIRM" class="ok col_12 btn-gray COK">확인</button>
256
-			  <!--<button id="ITP_BTN_MORDMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
257
-		  </div>
258
-	  </form>
261
+		</form>
259 262
 	</div>
260 263
 	<div id="ITP_MOBILE_JS"></div>
261 264
 	<div id="ITP_POP_MORDMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
@@ -295,4 +298,4 @@
295 298
 			</div>
296 299
 		</div>
297 300
 	</div>
298
-  </section>
301
+</section>

+ 9 - 2
src/main/webapp/mobile/css/style.css

@@ -333,6 +333,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
333 333
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
334 334
 .scroll_area li .left_info .history input{width: 150px;}
335 335
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
336
+.scroll_area li.history_list .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
337
+.scroll_area li.history_list .scroll_btn {width:10%; height:130px; margin-top:-5px; display:inline-flex;}
338
+
339
+
336 340
 .scroll_area li.history_list4 .button_right {float: right; display: grid;}
337 341
 .scroll_area li.history_list4 .button_right button {width: 65px; height: 75px; font-size: 1rem; margin: 0; border-radius: 0;}
338 342
 
@@ -340,6 +344,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
340 344
 .scroll_area li.history_list2 {height: 165px; padding-top:5px;}
341 345
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
342 346
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
347
+.scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
343 348
 .scroll_area li.history_list4 {height: 150px;}
344 349
 .scroll_area li.history_list5 {height: 100px; padding-top:5px;}
345 350
 .scroll_area li .history_info {width: auto;}
@@ -366,9 +371,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
366 371
 .scroll_area li .left .nomal .half {width:50%; float:left;}
367 372
 .scroll_area li .left .nomal .half label {font-weight:100;}
368 373
 .scroll_area li .left .nomal  input{width: 85px; height:30px;}
369
-.scroll_area li .left .nomal .scroll_btn {margin-bottom: 10px; min-width: 0;}
370
-.scroll_area li .left .nomal .scroll_btn button{top: 120px; position: absolute; width: 50px; height: 40px; font-size: 0.8rem; padding: 0; border-radius: 10px; background: rgb(198, 170, 250);}
371 374
 
375
+.scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
376
+
377
+.scroll_area li .scroll_btn input {width:15px; margin:auto 10px;}
378
+.scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
372 379
 .scroll_area li .left .nomal span {margin:0 10px;}
373 380
 
374 381
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}

+ 8 - 8
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -173,7 +173,7 @@ let mobContentObj = {
173 173
 			const param = {
174 174
 				'brandId': fn_make_user_info.get('brandId'),
175 175
 				'spplyId': fn_make_user_info.get('userId'),
176
-				'pchPodrUnqNo': item.pchPodrUnqNo
176
+				'rtnPodrUnqNo': item.rtnPodrUnqNo
177 177
 			};
178 178
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
179 179
 		},
@@ -181,17 +181,17 @@ let mobContentObj = {
181 181
 			var _this = this;
182 182
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
183 183
 			$(id).find('.fnBrandNm').text(result.brandNm);
184
-			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
185
-			$(id).find('.fnPodrDt').text(result.podrDt);
186
-			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
187
-			$(id).find('.fnWhsNm').text(result.whsNm);
188
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
189
-			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
184
+			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
185
+			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
186
+			$(id).find('.fnRtnOdrStNm').text(result.rtnOdrStNm);
187
+			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
188
+			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
189
+			$(id).find('.fnRtnMgrNm').text(result.rtnMgrNm);
190 190
 			$.each(result.rtnOdrDtlList, function (i, item) {
191 191
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
192 192
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
193 193
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
194
-				$li.find('.fnItemid').text(item.itemId);
194
+				$li.find('.fnItemId').text(item.itemId);
195 195
 				$li.find('.fnItemNm').text(item.itemNm);
196 196
 				$li.find('.fnUnitQty').text(item.unitQty);
197 197
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));

+ 22 - 19
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -35,8 +35,8 @@ let mobPageObj = {
35 35
 			});
36 36
 
37 37
 			// 조회일자 지정
38
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
39
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
38
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
39
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
40 40
 		},
41 41
 		info: function() {
42 42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -63,13 +63,13 @@ let mobPageObj = {
63 63
 			$('button[id^="ITP_BTN_MCOLLMNG02010_VIEW"]').on('click', function() {
64 64
 				var id = $(this).attr('id');
65 65
 				switch (id) {
66
-					case 'ITP_BTN_MCOLLMNG02010_VIEW_ADD'			: mobContentObj.view.add();	break;
67
-					case 'ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();	break;
66
+					case 'ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD'		: mobContentObj.view.add();			break;
67
+					case 'ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();		break;
68 68
 				}
69 69
 				return false;
70 70
 			});
71 71
 
72
-			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li', function() {
72
+			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li button', function() {
73 73
 				var item = mobContentObj.list.rows[$(this).index()];
74 74
 				mobContentObj.view.init(item);
75 75
 			});
@@ -196,8 +196,8 @@ let mobContentObj = {
196 196
 			var _this = this;
197 197
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
198 198
 			$(id).find('.fnBrandNm').text(result.brandNm);
199
-			$(id).find('.fnRtnPodrDtlNo').text(result.rtnPodrUnqNo);
200
-			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
199
+			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
200
+			$(id).find('.fnColReqDt').text(result.colReqDt);
201 201
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
202 202
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
203 203
 			$(id).find('.fnPickTelNo').text(result.pickTelNo);
@@ -222,18 +222,18 @@ let mobContentObj = {
222 222
 			var _this = this;
223 223
 			var param = {};
224 224
 			var colSchDt = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT').val();
225
-			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val();
226
-			var colMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val();
225
+			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM').val();
226
+			var pickMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO').val();
227 227
 			if(colSchDt.length < 1) {
228
-				alert('수거수량을 입력해 주세요.');
228
+				alert('수거일자를 입력해 주세요.');
229 229
 				return false;
230 230
 			}
231
-			if(colMgrNm.length < 1) {
232
-				alert('발주담당자를 입력해 주세요.');
231
+			if(pickMgrNm.length < 1) {
232
+				alert('수거담당자를 입력해 주세요.');
233 233
 				return false;
234 234
 			}
235
-			if(colMgrTelNo.length < 1) {
236
-				alert('발주담당자 연락처를 입력해 주세요.');
235
+			if(pickMgrTelNo.length < 1) {
236
+				alert('수거담당자 연락처를 입력해 주세요.');
237 237
 				return false;
238 238
 			}
239 239
 			var gridInsertData = [];
@@ -243,19 +243,22 @@ let mobContentObj = {
243 243
 				var item = {
244 244
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
245 245
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
246
-					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
247
-					'rtnRsnDvsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(),
246
+					'colQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
247
+					'rtnRsnDvsn': $(this).find("#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN option:selected").val(),
248 248
 					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
249 249
 				};
250
-				if(item.coltQty.length < 1) {
250
+				if(item.colQty.length < 1) {
251 251
 					alert('수거수량을 입력해 주세요.');
252 252
 					return false;
253 253
 				}
254
-				if(row.rtnOdrQty < item.coltQty) {
254
+				if(item.colQty > row.rtnOdrQty) {
255 255
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
256 256
 					return false;
257 257
 				}
258
-				item.expryDate = item.expryDate.replace(/-/g, ".");
258
+				if(item.rtnRsnDvsn.length < 1) {
259
+					alert('수거사유를 선택해 주세요.');
260
+					return false;
261
+				}
259 262
 				gridInsertData.push(item);
260 263
 				isValid = true;
261 264
 			});

+ 34 - 18
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -8,7 +8,7 @@ require(['config'], function() {
8 8
 /*API URL*/
9 9
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/spply-pick-grid-list';	// 목록
10 10
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
11
-const API_POP_INV_PICK 				= '/api/pomng/inoutmng/info-inv';
11
+const API_POP_INFO_PICK 			= '/api/rtnmng/inoutmng/info-pick';
12 12
 
13 13
 const PAGE_MODE_LIST				= "LIST";
14 14
 const PAGE_MODE_VIEW				= "VIEW";
@@ -34,8 +34,8 @@ let mobPageObj = {
34 34
 			});
35 35
 
36 36
 			// 조회일자 지정
37
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
38
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
37
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
38
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
39 39
 		},
40 40
 		info: function() {
41 41
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -51,9 +51,10 @@ let mobPageObj = {
51 51
 			$('button[id^="ITP_BTN_MCOLLMNG03010_LIST"]').on('click', function() {
52 52
 				var id = $(this).attr('id');
53 53
 				switch (id) {
54
-					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
55
-					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
56
-					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH'			: mobContentObj.list.search();	break;
54
+					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
55
+					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
56
+					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH'		: mobContentObj.list.search();		break;
57
+					case 'ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW'		: mobContentObj.list.colPrint();	break;
57 58
 				}
58 59
 				return false;
59 60
 			});
@@ -61,15 +62,16 @@ let mobPageObj = {
61 62
 			$('button[id^="ITP_BTN_MCOLLMNG03010_VIEW"]').on('click', function() {
62 63
 				var id = $(this).attr('id');
63 64
 				switch (id) {
64
-					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
65
-					case 'ITP_BTN_MCOLLMNG03010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();	break;
65
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
66
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
66 67
 				}
67 68
 				return false;
68 69
 			});
69 70
 
70 71
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS li', function() {
71
-				var item = mobContentObj.list.rows[$(this).index()];
72
-				mobContentObj.view.init(item);
72
+				// var item = mobContentObj.list.rows[$(this).index()];
73
+				// mobContentObj.view.init(item);
74
+				mobContentObj.list.iChoice = $(this).index();
73 75
 			});
74 76
 
75 77
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS li button', function() {
@@ -118,6 +120,7 @@ let mobContentObj = {
118 120
 		totPage: 0,
119 121
 		isSearch: false,
120 122
 		rows: [],
123
+		iChoice: -1,
121 124
 		init: function() {
122 125
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
123 126
 			this.search();
@@ -126,6 +129,7 @@ let mobContentObj = {
126 129
 			this.listPage = 0;
127 130
 			this.totPage = 0;
128 131
 			this.rows.length = 0;
132
+			this.iChoice = -1;
129 133
 			$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS').empty();
130 134
 			this.load();
131 135
 		},
@@ -147,7 +151,7 @@ let mobContentObj = {
147 151
 					$li.find('.fnColSchDt').text(item.colSchDt);
148 152
 					$li.find('.fnColReqQty').text(CommonObj.currency.add(item.colReqQty, '개'));
149 153
 					$li.find('.fnColReqAmt').text(CommonObj.currency.add(item.colReqAmt));
150
-					$li.find('.fnWhsAddr').text(item.whsAddr);
154
+					$li.find('.fnWhsNm').text(item.whsNm);
151 155
 					$li.find('.fnPickMgrNm').text(item.pickMgrNm);
152 156
 					_this.rows.push(item);
153 157
 				});
@@ -159,13 +163,20 @@ let mobContentObj = {
159 163
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
160 164
 			param.toDt = CommonObj.onlyNumber(param.toDt);
161 165
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
166
+		},
167
+		colPrint: function() {
168
+			if(this.iChoice < 0) {
169
+				alert("수거서를 선택해주세요 (대표 수거서번호)");
170
+				return;
171
+			}
172
+			mobContentObj.view.init(this.rows[this.iChoice]);
162 173
 		}
163 174
 	},
164 175
 	view: {
165 176
 		rows: [],
166 177
 		init: function(item) {
167 178
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
168
-			this.cancel();
179
+			this.reset();
169 180
 			this.search(item);
170 181
 		},
171 182
 		search: function(item) {
@@ -176,10 +187,9 @@ let mobContentObj = {
176 187
 			};
177 188
 			const param = {
178 189
 				'brandId': fn_make_user_info.get('brandId'),
179
-				'spplyId': fn_make_user_info.get('userId'),
180
-				'pchPodrUnqNo': item.pchPodrUnqNo
190
+				'colPickUnqNo': item.colPickUnqNo
181 191
 			};
182
-			fn_ajax_call(API_POP_INV_PICK, param, callbackFn, 'GET');
192
+			fn_ajax_call(API_POP_INFO_PICK, JSON.stringify(param), callbackFn, 'POST');
183 193
 		},
184 194
 		view: function(result) {
185 195
 			var _this = this;
@@ -187,7 +197,7 @@ let mobContentObj = {
187 197
 			$(id).find('.fnColRegDt').text(result.colRegDt);
188 198
 			$(id).find('.fnColPickUnqNo').text(result.colPickUnqNo);
189 199
 			$(id).find('.fnColSchDt').text(result.colSchDt);
190
-			$(id).find('.fnColMgrNm').text(result.colMgrNm + '('+ result.pndrTelNo + ')');
200
+			$(id).find('.fnPickMgrNm').text(result.pickMgrNm);
191 201
 			$(id).find('.fnWhsAddr').text(result.whsAddr);
192 202
 			$(id).find('.fnPndrTelNo').text(result.pndrTelNo);
193 203
 
@@ -196,7 +206,7 @@ let mobContentObj = {
196 206
 			$(id).find('.fnRtnOwnerNm').text(result.rtnOwnerNm);
197 207
 			$(id).find('.fnRtnAddr').text(result.rtnAddr);
198 208
 
199
-			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegNo);
209
+			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegno);
200 210
 			$(id).find('.fnColNm').text(result.colNm);
201 211
 			$(id).find('.fnColOwnerNm').text(result.colOwnerNm);
202 212
 			$(id).find('.fnColAddr').text(result.colAddr);
@@ -211,8 +221,11 @@ let mobContentObj = {
211 221
 				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
212 222
 				_this.rows.push(item);
213 223
 			});
224
+			$.each(result.fileLogNoList, function (i, item) {
225
+				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
226
+			});
214 227
 		},
215
-		cancel: function () {
228
+		reset: function() {
216 229
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
217 230
 			$(id).find('.fnColRegDt').text('');
218 231
 			$(id).find('.fnColPickUnqNo').text('');
@@ -231,6 +244,9 @@ let mobContentObj = {
231 244
 			$(id).find('.fnColOwnerNm').text('');
232 245
 			$(id).find('.fnColAddr').text('');
233 246
 			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').empty();
247
+		},
248
+		cancel: function () {
249
+			this.reset();
234 250
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
235 251
 		}
236 252
 	}

+ 5 - 2
src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -185,7 +185,7 @@ let mobContentObj = {
185 185
 			this.item = item;
186 186
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
187 187
 			$('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val(itp_fn_date_add('M', 0));
188
-			this.cancel();
188
+			this.reset();
189 189
 			this.search(item);
190 190
 		},
191 191
 		search: function(item) {
@@ -287,7 +287,7 @@ let mobContentObj = {
287 287
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
288 288
 			}
289 289
 		},
290
-		cancel: function () {
290
+		reset: function() {
291 291
 			var id = '#ITP_AJAX_MORDMNG02010_VIEW_CONTAINER';
292 292
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val('');
293 293
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_NM').val('');
@@ -302,6 +302,9 @@ let mobContentObj = {
302 302
 			$(id).find('.fnPodrAmt').text('');
303 303
 			$(id).find('.fnDlvReqDt').text('');
304 304
 			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').empty();
305
+		},
306
+		cancel: function () {
307
+			this.reset();
305 308
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
306 309
 		}
307 310
 	}

+ 7 - 3
src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -62,7 +62,7 @@ let mobPageObj = {
62 62
 			$('button[id^="ITP_BTN_MORDMNG03010_VIEW"]').on('click', function() {
63 63
 				var id = $(this).attr('id');
64 64
 				switch (id) {
65
-					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
65
+					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
66 66
 					case 'ITP_BTN_MORDMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
67 67
 				}
68 68
 				return false;
@@ -83,6 +83,7 @@ let mobPageObj = {
83 83
 		$('#ITP_MOBILE_MORDMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
84 84
 			$(this).hide();
85 85
 		});
86
+		console.log(mode);
86 87
 		if(mode === PAGE_MODE_LIST) {
87 88
 			$('#ITP_AJAX_MORDMNG03010_LIST_CONTAINER').show();
88 89
 			this.moreView(true);
@@ -176,7 +177,7 @@ let mobContentObj = {
176 177
 		rows: [],
177 178
 		init: function(item) {
178 179
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
179
-			this.cancel();
180
+			this.reset();
180 181
 			this.search(item);
181 182
 		},
182 183
 		search: function(item) {
@@ -225,7 +226,7 @@ let mobContentObj = {
225 226
 				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
226 227
 			});
227 228
 		},
228
-		cancel: function () {
229
+		reset: function() {
229 230
 			var id = '#ITP_AJAX_MORDMNG03010_VIEW_CONTAINER';
230 231
 			$(id).find('.fnDlvRegDt').text('');
231 232
 			$(id).find('.fnDlvSttmtUnqNo').text('');
@@ -244,6 +245,9 @@ let mobContentObj = {
244 245
 			$(id).find('.fnPoOwnerNm').text('');
245 246
 			$(id).find('.fnPoAddr').text('');
246 247
 			$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').empty();
248
+		},
249
+		cancel: function () {
250
+			this.reset();
247 251
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
248 252
 		}
249 253
 	}