浏览代码

모바일 공급업체 관리 수정

juney 2 年之前
父节点
当前提交
e831fc45b7

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

@@ -29,7 +29,7 @@
29
 			<div class="line">
29
 			<div class="line">
30
 				<label>발주번호/품목명</label>
30
 				<label>발주번호/품목명</label>
31
 			  <div class="search_wrap">
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
 			  </div>
33
 			  </div>
34
 			</div>
34
 			</div>
35
 			<div class="line" style="height:45px;">
35
 			<div class="line" style="height:45px;">
@@ -62,7 +62,7 @@
62
 					  <div class="nomal">
62
 					  <div class="nomal">
63
 						<label class="col_0">반품발주항번 &nbsp;:</label>
63
 						<label class="col_0">반품발주항번 &nbsp;:</label>
64
 						<div class="col_5">
64
 						<div class="col_5">
65
-						  <div class="fnRtnPodrNo col_5">1</div>
65
+						  <div class="fnColReqDt col_5">1</div>
66
 						</div>
66
 						</div>
67
 						<label class="col_6">수거요청일 &nbsp;:</label>
67
 						<label class="col_6">수거요청일 &nbsp;:</label>
68
 						<div>
68
 						<div>
@@ -147,12 +147,6 @@
147
 				<div class="fnRtnDodrTotalAmt"></div>
147
 				<div class="fnRtnDodrTotalAmt"></div>
148
 			  </div>      
148
 			  </div>      
149
 			</div>
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
 			<div class="line">
150
 			<div class="line">
157
 			  <label>수거장소</label>
151
 			  <label>수거장소</label>
158
 			  <div class="line_right">
152
 			  <div class="line_right">
@@ -165,11 +159,17 @@
165
 				<div class="fnPickTelNo"></div>
159
 				<div class="fnPickTelNo"></div>
166
 			  </div>      
160
 			  </div>      
167
 			</div>
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
 			<div class="line">
168
 			<div class="line">
169
 			  <label>수거담당자</label>
169
 			  <label>수거담당자</label>
170
 			  <div class="line_right">
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
 			  </div>
173
 			  </div>
174
 			</div>
174
 			</div>
175
 			<div class="table_header">
175
 			<div class="table_header">
@@ -178,7 +178,7 @@
178
 		  </div>
178
 		  </div>
179
 			<div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
179
 			<div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
180
 			  <ul id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWS" class="panel-group"></ul>
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
 				<li class="history_list2 list-row">
182
 				<li class="history_list2 list-row">
183
 				  <div>
183
 				  <div>
184
 					<div class="left">
184
 					<div class="left">
@@ -221,7 +221,7 @@
221
 					  <div class="nomal">
221
 					  <div class="nomal">
222
 						<label>수거수량 &nbsp;:</label>
222
 						<label>수거수량 &nbsp;:</label>
223
 						<div class="">
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
 						</div>
225
 						</div>
226
 						<label>수거구분&nbsp;:</label>
226
 						<label>수거구분&nbsp;:</label>
227
 						<div class="">
227
 						<div class="">
@@ -247,8 +247,8 @@
247
 			</div>
247
 			</div>
248
 		  </div>
248
 		  </div>
249
 		  <div class="button_bar">
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
 		  </div>
252
 		  </div>
253
 	  </form>
253
 	  </form>
254
 	</div>
254
 	</div>

+ 45 - 9
src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

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

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

@@ -1,261 +1,261 @@
1
 <section id="ITP_MOBILE_MORDMNG03010">
1
 <section id="ITP_MOBILE_MORDMNG03010">
2
 	<div id="ITP_AJAX_MORDMNG03010_LIST_CONTAINER" style="display: block;">
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
 					</div>
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
 					</div>
27
 					</div>
19
 				</div>
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
 				</div>
42
 				</div>
28
 			</div>
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>
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">
56
 						<div>
48
 						<div>
57
-						  <div class="fnDlvShmtUnqNo"></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>
58
+									</div>
59
+								</div>
60
+							</div>
61
+							<div class="left">
62
+								<div class="nomal">
63
+									<label class="col_6">납품서상태 &nbsp;:</label>
64
+									<div>
65
+										<div class="fnDlvStNm"></div>
66
+									</div>
67
+									<label class="col_0">수주일자&nbsp;:</label>
68
+									<div>
69
+										<div class="fnPodrRegDt"></div>
70
+									</div>
71
+								</div>
72
+							</div>
73
+							<div class="left">
74
+								<div class="nomal">
75
+									<label>납품요청일&nbsp;:</label>
76
+									<div>
77
+										<div class="fnDlvReqDt"></div>
78
+									</div>
79
+									<label>납품예정일&nbsp;:</label>
80
+									<div>
81
+										<div class="fnDlvSchDt"></div>
82
+									</div>
83
+								</div>
84
+							</div>
85
+							<div class="left">
86
+								<div class="nomal">
87
+									<label class="col_0">품목수량 &nbsp;:</label>
88
+									<div>
89
+										<div class="fnDlvQty space1"></div>
90
+									</div>
91
+									<label>발주총금액&nbsp;:</label>
92
+									<div>
93
+										<div class="fnPodrAmt"></div>
94
+									</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>
102
+									</div>
103
+									<label>납품담당자&nbsp;:</label>
104
+									<div>
105
+										<div class="fnDlvMgrNm space0"></div>
106
+									</div>
107
+								</div>
108
+							</div>
58
 						</div>
109
 						</div>
59
-					  </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>
60
 					</div>
127
 					</div>
61
-					<div class="left">
62
-					  <div class="nomal">
63
-						<label class="col_6">납품서상태 &nbsp;:</label>
64
-						<div>
65
-						  <div class="fnDlvStNm"></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>
66
 						</div>
165
 						</div>
67
-						<label class="col_0">수주일자&nbsp;:</label>
68
-						<div>
69
-						  <div class="fnPodrRegDt"></div>
166
+						<div class="company_info">
167
+							<label>등록번호&nbsp;:&nbsp;</label>
168
+							<div class="fnDlvBsnsRegno"></div>
70
 						</div>
169
 						</div>
71
-					  </div>
72
-					</div>
73
-					<div class="left">
74
-					  <div class="nomal">
75
-						<label>납품요청일&nbsp;:</label>
76
-						<div>
77
-						  <div class="fnDlvReqDt"></div>
170
+						<div class="company_info">
171
+							<label>상호&nbsp;:&nbsp;</label>
172
+							<div class="fnDlvNm"></div>
78
 						</div>
173
 						</div>
79
-						<label>납품예정일&nbsp;:</label>
80
-						<div>
81
-						  <div class="fnDlvSchDt"></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>
82
 						</div>
181
 						</div>
83
-					  </div>
84
 					</div>
182
 					</div>
85
-					<div class="left">
86
-					  <div class="nomal">
87
-						<label class="col_0">품목수량 &nbsp;:</label>
88
-						<div>
89
-						  <div class="fnDlvQty space1"></div>
183
+					<div class="info_left">
184
+						<div class="weight">
185
+							<label>발주처</label>
90
 						</div>
186
 						</div>
91
-						<label>발주총금액&nbsp;:</label>
92
-						<div>
93
-						  <div class="fnPodrAmt"></div>
187
+						<div class="company_info">
188
+							<label>등록번호&nbsp;:&nbsp;</label>
189
+							<div class="fnPoBsnsRegno"></div>
94
 						</div>
190
 						</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>
191
+						<div class="company_info">
192
+							<label>상호&nbsp;:&nbsp;</label>
193
+							<div class="fnPoNm"></div>
102
 						</div>
194
 						</div>
103
-						<label>납품담당자&nbsp;:</label>
104
-						<div>
105
-						  <div class="fnDlvMgrNm space0"></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>
106
 						</div>
202
 						</div>
107
-					  </div>
108
 					</div>
203
 					</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
-				</div>
182
-			  </div>
183
-			  <div class="info_left">
184
-				<div class="weight">
185
-				  <label>발주처</label>
186
 				</div>
204
 				</div>
187
-				<div class="company_info">
188
-				  <label>등록번호&nbsp;:&nbsp;</label>
189
-				  <div class="fnPoBsnsRegno"></div>
205
+				<div class="table_header">
206
+					<h1>> 납품 상세 내역</h1>
190
 				</div>
207
 				</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
 			</div>
208
 			</div>
208
-		  </div>
209
 			<div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
209
 			<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>
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">
245
 						<div>
213
 						<div>
246
-						  <div class="fnDlvQty"></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>
245
+									<div>
246
+										<div class="fnDlvQty"></div>
247
+									</div>
248
+								</div>
249
+							</div>
247
 						</div>
250
 						</div>
248
-					  </div>
249
-					</div>
250
-				  </div>
251
-				</li>
251
+					</li>
252
+				</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>-->
252
 			</div>
257
 			</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>
258
+		</form>
259
 	</div>
259
 	</div>
260
 	<div id="ITP_MOBILE_JS"></div>
260
 	<div id="ITP_MOBILE_JS"></div>
261
 	<div id="ITP_POP_MORDMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
261
 	<div id="ITP_POP_MORDMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
@@ -295,4 +295,4 @@
295
 			</div>
295
 			</div>
296
 		</div>
296
 		</div>
297
 	</div>
297
 	</div>
298
-  </section>
298
+</section>

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

@@ -173,7 +173,7 @@ let mobContentObj = {
173
 			const param = {
173
 			const param = {
174
 				'brandId': fn_make_user_info.get('brandId'),
174
 				'brandId': fn_make_user_info.get('brandId'),
175
 				'spplyId': fn_make_user_info.get('userId'),
175
 				'spplyId': fn_make_user_info.get('userId'),
176
-				'pchPodrUnqNo': item.pchPodrUnqNo
176
+				'rtnPodrUnqNo': item.rtnPodrUnqNo
177
 			};
177
 			};
178
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
178
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
179
 		},
179
 		},
@@ -181,17 +181,17 @@ let mobContentObj = {
181
 			var _this = this;
181
 			var _this = this;
182
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
182
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
183
 			$(id).find('.fnBrandNm').text(result.brandNm);
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
 			$.each(result.rtnOdrDtlList, function (i, item) {
190
 			$.each(result.rtnOdrDtlList, function (i, item) {
191
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
191
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
192
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
192
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
193
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
193
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
194
-				$li.find('.fnItemid').text(item.itemId);
194
+				$li.find('.fnItemId').text(item.itemId);
195
 				$li.find('.fnItemNm').text(item.itemNm);
195
 				$li.find('.fnItemNm').text(item.itemNm);
196
 				$li.find('.fnUnitQty').text(item.unitQty);
196
 				$li.find('.fnUnitQty').text(item.unitQty);
197
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
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
 		info: function() {
41
 		info: function() {
42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -63,13 +63,13 @@ let mobPageObj = {
63
 			$('button[id^="ITP_BTN_MCOLLMNG02010_VIEW"]').on('click', function() {
63
 			$('button[id^="ITP_BTN_MCOLLMNG02010_VIEW"]').on('click', function() {
64
 				var id = $(this).attr('id');
64
 				var id = $(this).attr('id');
65
 				switch (id) {
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
 				return false;
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
 				var item = mobContentObj.list.rows[$(this).index()];
73
 				var item = mobContentObj.list.rows[$(this).index()];
74
 				mobContentObj.view.init(item);
74
 				mobContentObj.view.init(item);
75
 			});
75
 			});
@@ -196,8 +196,8 @@ let mobContentObj = {
196
 			var _this = this;
196
 			var _this = this;
197
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
197
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
198
 			$(id).find('.fnBrandNm').text(result.brandNm);
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
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
201
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
202
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
202
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
203
 			$(id).find('.fnPickTelNo').text(result.pickTelNo);
203
 			$(id).find('.fnPickTelNo').text(result.pickTelNo);
@@ -222,18 +222,18 @@ let mobContentObj = {
222
 			var _this = this;
222
 			var _this = this;
223
 			var param = {};
223
 			var param = {};
224
 			var colSchDt = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT').val();
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
 			if(colSchDt.length < 1) {
227
 			if(colSchDt.length < 1) {
228
-				alert('수거수량을 입력해 주세요.');
228
+				alert('수거일자를 입력해 주세요.');
229
 				return false;
229
 				return false;
230
 			}
230
 			}
231
-			if(colMgrNm.length < 1) {
232
-				alert('발주담당자를 입력해 주세요.');
231
+			if(pickMgrNm.length < 1) {
232
+				alert('수거담당자를 입력해 주세요.');
233
 				return false;
233
 				return false;
234
 			}
234
 			}
235
-			if(colMgrTelNo.length < 1) {
236
-				alert('발주담당자 연락처를 입력해 주세요.');
235
+			if(pickMgrTelNo.length < 1) {
236
+				alert('수거담당자 연락처를 입력해 주세요.');
237
 				return false;
237
 				return false;
238
 			}
238
 			}
239
 			var gridInsertData = [];
239
 			var gridInsertData = [];
@@ -243,19 +243,22 @@ let mobContentObj = {
243
 				var item = {
243
 				var item = {
244
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
244
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
245
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
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
 					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
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
 					alert('수거수량을 입력해 주세요.');
251
 					alert('수거수량을 입력해 주세요.');
252
 					return false;
252
 					return false;
253
 				}
253
 				}
254
-				if(row.rtnOdrQty < item.coltQty) {
254
+				if(item.colQty > row.rtnOdrQty) {
255
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
255
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
256
 					return false;
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
 				gridInsertData.push(item);
262
 				gridInsertData.push(item);
260
 				isValid = true;
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
 /*API URL*/
8
 /*API URL*/
9
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/spply-pick-grid-list';	// 목록
9
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/spply-pick-grid-list';	// 목록
10
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
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
 const PAGE_MODE_LIST				= "LIST";
13
 const PAGE_MODE_LIST				= "LIST";
14
 const PAGE_MODE_VIEW				= "VIEW";
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
 		info: function() {
40
 		info: function() {
41
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
41
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -51,9 +51,10 @@ let mobPageObj = {
51
 			$('button[id^="ITP_BTN_MCOLLMNG03010_LIST"]').on('click', function() {
51
 			$('button[id^="ITP_BTN_MCOLLMNG03010_LIST"]').on('click', function() {
52
 				var id = $(this).attr('id');
52
 				var id = $(this).attr('id');
53
 				switch (id) {
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
 				return false;
59
 				return false;
59
 			});
60
 			});
@@ -61,15 +62,16 @@ let mobPageObj = {
61
 			$('button[id^="ITP_BTN_MCOLLMNG03010_VIEW"]').on('click', function() {
62
 			$('button[id^="ITP_BTN_MCOLLMNG03010_VIEW"]').on('click', function() {
62
 				var id = $(this).attr('id');
63
 				var id = $(this).attr('id');
63
 				switch (id) {
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
 				return false;
68
 				return false;
68
 			});
69
 			});
69
 
70
 
70
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS li', function() {
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
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS li button', function() {
77
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS li button', function() {
@@ -118,6 +120,7 @@ let mobContentObj = {
118
 		totPage: 0,
120
 		totPage: 0,
119
 		isSearch: false,
121
 		isSearch: false,
120
 		rows: [],
122
 		rows: [],
123
+		iChoice: -1,
121
 		init: function() {
124
 		init: function() {
122
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
125
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
123
 			this.search();
126
 			this.search();
@@ -126,6 +129,7 @@ let mobContentObj = {
126
 			this.listPage = 0;
129
 			this.listPage = 0;
127
 			this.totPage = 0;
130
 			this.totPage = 0;
128
 			this.rows.length = 0;
131
 			this.rows.length = 0;
132
+			this.iChoice = -1;
129
 			$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS').empty();
133
 			$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS').empty();
130
 			this.load();
134
 			this.load();
131
 		},
135
 		},
@@ -147,7 +151,7 @@ let mobContentObj = {
147
 					$li.find('.fnColSchDt').text(item.colSchDt);
151
 					$li.find('.fnColSchDt').text(item.colSchDt);
148
 					$li.find('.fnColReqQty').text(CommonObj.currency.add(item.colReqQty, '개'));
152
 					$li.find('.fnColReqQty').text(CommonObj.currency.add(item.colReqQty, '개'));
149
 					$li.find('.fnColReqAmt').text(CommonObj.currency.add(item.colReqAmt));
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
 					$li.find('.fnPickMgrNm').text(item.pickMgrNm);
155
 					$li.find('.fnPickMgrNm').text(item.pickMgrNm);
152
 					_this.rows.push(item);
156
 					_this.rows.push(item);
153
 				});
157
 				});
@@ -159,13 +163,20 @@ let mobContentObj = {
159
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
163
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
160
 			param.toDt = CommonObj.onlyNumber(param.toDt);
164
 			param.toDt = CommonObj.onlyNumber(param.toDt);
161
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
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
 	view: {
175
 	view: {
165
 		rows: [],
176
 		rows: [],
166
 		init: function(item) {
177
 		init: function(item) {
167
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
178
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
168
-			this.cancel();
179
+			this.reset();
169
 			this.search(item);
180
 			this.search(item);
170
 		},
181
 		},
171
 		search: function(item) {
182
 		search: function(item) {
@@ -176,10 +187,9 @@ let mobContentObj = {
176
 			};
187
 			};
177
 			const param = {
188
 			const param = {
178
 				'brandId': fn_make_user_info.get('brandId'),
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
 		view: function(result) {
194
 		view: function(result) {
185
 			var _this = this;
195
 			var _this = this;
@@ -187,7 +197,7 @@ let mobContentObj = {
187
 			$(id).find('.fnColRegDt').text(result.colRegDt);
197
 			$(id).find('.fnColRegDt').text(result.colRegDt);
188
 			$(id).find('.fnColPickUnqNo').text(result.colPickUnqNo);
198
 			$(id).find('.fnColPickUnqNo').text(result.colPickUnqNo);
189
 			$(id).find('.fnColSchDt').text(result.colSchDt);
199
 			$(id).find('.fnColSchDt').text(result.colSchDt);
190
-			$(id).find('.fnColMgrNm').text(result.colMgrNm + '('+ result.pndrTelNo + ')');
200
+			$(id).find('.fnPickMgrNm').text(result.pickMgrNm);
191
 			$(id).find('.fnWhsAddr').text(result.whsAddr);
201
 			$(id).find('.fnWhsAddr').text(result.whsAddr);
192
 			$(id).find('.fnPndrTelNo').text(result.pndrTelNo);
202
 			$(id).find('.fnPndrTelNo').text(result.pndrTelNo);
193
 
203
 
@@ -196,7 +206,7 @@ let mobContentObj = {
196
 			$(id).find('.fnRtnOwnerNm').text(result.rtnOwnerNm);
206
 			$(id).find('.fnRtnOwnerNm').text(result.rtnOwnerNm);
197
 			$(id).find('.fnRtnAddr').text(result.rtnAddr);
207
 			$(id).find('.fnRtnAddr').text(result.rtnAddr);
198
 
208
 
199
-			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegNo);
209
+			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegno);
200
 			$(id).find('.fnColNm').text(result.colNm);
210
 			$(id).find('.fnColNm').text(result.colNm);
201
 			$(id).find('.fnColOwnerNm').text(result.colOwnerNm);
211
 			$(id).find('.fnColOwnerNm').text(result.colOwnerNm);
202
 			$(id).find('.fnColAddr').text(result.colAddr);
212
 			$(id).find('.fnColAddr').text(result.colAddr);
@@ -211,8 +221,11 @@ let mobContentObj = {
211
 				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
221
 				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
212
 				_this.rows.push(item);
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
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
229
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
217
 			$(id).find('.fnColRegDt').text('');
230
 			$(id).find('.fnColRegDt').text('');
218
 			$(id).find('.fnColPickUnqNo').text('');
231
 			$(id).find('.fnColPickUnqNo').text('');
@@ -231,6 +244,9 @@ let mobContentObj = {
231
 			$(id).find('.fnColOwnerNm').text('');
244
 			$(id).find('.fnColOwnerNm').text('');
232
 			$(id).find('.fnColAddr').text('');
245
 			$(id).find('.fnColAddr').text('');
233
 			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').empty();
246
 			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').empty();
247
+		},
248
+		cancel: function () {
249
+			this.reset();
234
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
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
 			this.item = item;
185
 			this.item = item;
186
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
186
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
187
 			$('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val(itp_fn_date_add('M', 0));
187
 			$('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val(itp_fn_date_add('M', 0));
188
-			this.cancel();
188
+			this.reset();
189
 			this.search(item);
189
 			this.search(item);
190
 		},
190
 		},
191
 		search: function(item) {
191
 		search: function(item) {
@@ -287,7 +287,7 @@ let mobContentObj = {
287
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
287
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
288
 			}
288
 			}
289
 		},
289
 		},
290
-		cancel: function () {
290
+		reset: function() {
291
 			var id = '#ITP_AJAX_MORDMNG02010_VIEW_CONTAINER';
291
 			var id = '#ITP_AJAX_MORDMNG02010_VIEW_CONTAINER';
292
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val('');
292
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val('');
293
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_NM').val('');
293
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_NM').val('');
@@ -302,6 +302,9 @@ let mobContentObj = {
302
 			$(id).find('.fnPodrAmt').text('');
302
 			$(id).find('.fnPodrAmt').text('');
303
 			$(id).find('.fnDlvReqDt').text('');
303
 			$(id).find('.fnDlvReqDt').text('');
304
 			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').empty();
304
 			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').empty();
305
+		},
306
+		cancel: function () {
307
+			this.reset();
305
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
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
 			$('button[id^="ITP_BTN_MORDMNG03010_VIEW"]').on('click', function() {
62
 			$('button[id^="ITP_BTN_MORDMNG03010_VIEW"]').on('click', function() {
63
 				var id = $(this).attr('id');
63
 				var id = $(this).attr('id');
64
 				switch (id) {
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
 					case 'ITP_BTN_MORDMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
66
 					case 'ITP_BTN_MORDMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
67
 				}
67
 				}
68
 				return false;
68
 				return false;
@@ -83,6 +83,7 @@ let mobPageObj = {
83
 		$('#ITP_MOBILE_MORDMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
83
 		$('#ITP_MOBILE_MORDMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
84
 			$(this).hide();
84
 			$(this).hide();
85
 		});
85
 		});
86
+		console.log(mode);
86
 		if(mode === PAGE_MODE_LIST) {
87
 		if(mode === PAGE_MODE_LIST) {
87
 			$('#ITP_AJAX_MORDMNG03010_LIST_CONTAINER').show();
88
 			$('#ITP_AJAX_MORDMNG03010_LIST_CONTAINER').show();
88
 			this.moreView(true);
89
 			this.moreView(true);
@@ -176,7 +177,7 @@ let mobContentObj = {
176
 		rows: [],
177
 		rows: [],
177
 		init: function(item) {
178
 		init: function(item) {
178
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
179
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
179
-			this.cancel();
180
+			this.reset();
180
 			this.search(item);
181
 			this.search(item);
181
 		},
182
 		},
182
 		search: function(item) {
183
 		search: function(item) {
@@ -225,7 +226,7 @@ let mobContentObj = {
225
 				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
226
 				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
226
 			});
227
 			});
227
 		},
228
 		},
228
-		cancel: function () {
229
+		reset: function() {
229
 			var id = '#ITP_AJAX_MORDMNG03010_VIEW_CONTAINER';
230
 			var id = '#ITP_AJAX_MORDMNG03010_VIEW_CONTAINER';
230
 			$(id).find('.fnDlvRegDt').text('');
231
 			$(id).find('.fnDlvRegDt').text('');
231
 			$(id).find('.fnDlvSttmtUnqNo').text('');
232
 			$(id).find('.fnDlvSttmtUnqNo').text('');
@@ -244,6 +245,9 @@ let mobContentObj = {
244
 			$(id).find('.fnPoOwnerNm').text('');
245
 			$(id).find('.fnPoOwnerNm').text('');
245
 			$(id).find('.fnPoAddr').text('');
246
 			$(id).find('.fnPoAddr').text('');
246
 			$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').empty();
247
 			$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').empty();
248
+		},
249
+		cancel: function () {
250
+			this.reset();
247
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
251
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
248
 		}
252
 		}
249
 	}
253
 	}