Browse Source

모바일 발주관리 디자인 적용

juney 2 years ago
parent
commit
f173829c13

+ 7 - 207
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -54,15 +54,15 @@
54 54
       </div>
55 55
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
56 56
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
57
+         <!--   검색된 데이터가 없습니다  -->
58
+         <div class="itp_non_data" style="display:none;">
59
+            <div>검색된 데이터가 없습니다.</div>
60
+         </div>
57 61
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
58
-      <!--   검색된 데이터가 없습니다  -->
59
-      	<div class="itp_non_data" style="display:none;">
60
-      		<div>검색된 데이터가 없습니다.</div>
61
-      	</div>
62 62
           <li class="list-row">
63 63
             <div class="left_info">
64 64
               <div class="check_box">
65
-                <div style="display:none;"><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
65
+                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
66 66
               </div>
67 67
               <div class="thick">
68 68
                 <div class="itp_item fnItemNm">품목명</div>
@@ -150,206 +150,6 @@
150 150
             </div>
151 151
         </div>
152 152
     </div>
153
-    <!-- 선불매장결제 -->
154
-    <div id="ITP_POP_MPOMNG01010_AMT_ADV_AREA" class="popup mobile-pop-close" style="display: none;">
155
-        <div class="pop">
156
-            <div class="pop_line">
157
-	            <div class="itp_label_area">
158
-	                <label>납품요청일</label>
159
-	            </div>
160
-	            <div class="itp_info_area">
161
-	                <div class="fnPopDlvReqDt"></div>
162
-	            </div>
163
-            </div>
164
-            <div class="pop_line">
165
-	            <div class="itp_label_area">
166
-              		<label>품목수</label>
167
-	            </div>
168
-   	            <div class="itp_info_area">
169
-                	<div class="fnItemQty"></div>
170
-                </div>
171
-            </div>
172
-            <div class="pop_line">
173
-              	<div class="itp_label_area">
174
-                	<label>구매요청금액 </label>
175
-                </div>
176
-                <div class="itp_info_area">
177
-                	<div class="fnOrdReqAmt"></div>
178
-                </div>
179
-            </div>
180
-            <div class="pop_line">
181
-              	<div class="itp_label_area">
182
-                	<label>구매가능금액 </label>
183
-                </div>
184
-                <div class="itp_info_area">
185
-                	<div class="fnOrdPssblAmt"></div>
186
-                </div>
187
-            </div>
188
-            <div class="pop_line border">
189
-              	<div class="itp_label_area">
190
-                	<label>구매금액 </label>
191
-                </div>
192
-                <div class="itp_info_area">
193
-                	<div class="fnOrdAmt"></div>
194
-                </div>
195
-            </div>
196
-            <div class="pop_msg">   선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다. <br>결재를 하시겠습니까?</div>
197
-            <div class="popup_btn">
198
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
199
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_CONFIRM" class="ok btn-primary COK">결제</button>
200
-            </div>
201
-        </div>
202
-    </div>
203
-    <!-- 구매한도부족 -->
204
-    <div id="ITP_POP_MPOMNG01010_AMT_LMT_AREA" class="popup mobile-pop-close" style="display: none;">
205
-        <div class="pop">
206
-            <div class="pop_line">
207
-	            <div class="itp_label_area">
208
-	                <label>납품요청일</label>
209
-	            </div>
210
-	            <div class="itp_info_area">
211
-	                <div class="fnPopDlvReqDt"></div>
212
-	            </div>
213
-            </div>
214
-            <div class="pop_line">
215
-	            <div class="itp_label_area">
216
-              		<label>품목수</label>
217
-	            </div>
218
-   	            <div class="itp_info_area">
219
-                	<div class="fnItemQty"></div>
220
-                </div>
221
-            </div>
222
-            <div class="pop_line">
223
-              	<div class="itp_label_area">
224
-                	<label>구매요청금액 </label>
225
-                </div>
226
-                <div class="itp_info_area">
227
-                	<div class="fnOrdReqAmt"></div>
228
-                </div>
229
-            </div>
230
-            <div class="pop_line">
231
-              	<div class="itp_label_area">
232
-                	<label>구매가능금액 </label>
233
-                </div>
234
-                <div class="itp_info_area">
235
-                	<div class="fnOrdPssblAmt"></div>
236
-                </div>
237
-            </div>
238
-            <div class="pop_line border">
239
-              	<div class="itp_label_area">
240
-                	<label>구매금액 </label>
241
-                </div>
242
-                <div class="itp_info_area">
243
-                	<div class="fnOrdAmt"></div>
244
-                </div>
245
-            </div>
246
-            <div class="pop_msg">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다.<br> 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>결재를 하시겠습니까?</div>
247
-            <div class="popup_btn">
248
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
249
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_CONFIRM" class="ok btn-primary COK">결제</button>
250
-            </div>
251
-        </div>
252
-    </div>
253
-     <!-- 선불매장- 임시저장 -->
254
-    <div id="ITP_POP_MPOMNG01010_AMT_ADV_SAVE_AREA" class="popup mobile-pop-close" style="display: none;">
255
-        <div class="pop">
256
-            <div class="pop_line">
257
-	            <div class="itp_label_area">
258
-	                <label>납품요청일</label>
259
-	            </div>
260
-	            <div class="itp_info_area">
261
-	                <div class="fnPopDlvReqDt"></div>
262
-	            </div>
263
-            </div>
264
-            <div class="pop_line">
265
-	            <div class="itp_label_area">
266
-              		<label>품목수</label>
267
-	            </div>
268
-   	            <div class="itp_info_area">
269
-                	<div class="fnItemQty"></div>
270
-                </div>
271
-            </div>
272
-            <div class="pop_line">
273
-              	<div class="itp_label_area">
274
-                	<label>구매요청금액 </label>
275
-                </div>
276
-                <div class="itp_info_area">
277
-                	<div class="fnOrdReqAmt"></div>
278
-                </div>
279
-            </div>
280
-            <div class="pop_line">
281
-              	<div class="itp_label_area">
282
-                	<label>구매가능금액 </label>
283
-                </div>
284
-                <div class="itp_info_area">
285
-                	<div class="fnOrdPssblAmt"></div>
286
-                </div>
287
-            </div>
288
-            <div class="pop_line border">
289
-              	<div class="itp_label_area">
290
-                	<label>구매금액 </label>
291
-                </div>
292
-                <div class="itp_info_area">
293
-                	<div class="fnOrdAmt"></div>
294
-                </div>
295
-            </div>
296
-            <div class="pop_msg">선불매장이므로 입금을 하시고,입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다. </div>
297
-            <div class="popup_btn">
298
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_SAVE_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
299
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_SAVE_CONFIRM" class="ok btn-primary COK">결제</button>
300
-            </div>
301
-        </div>
302
-    </div>
303
-    <!-- 구매한도부족- 임시저장 -->
304
-    <div id="ITP_POP_MPOMNG01010_AMT_LMT_SAVE_AREA" class="popup mobile-pop-close" style="display: none;">
305
-        <div class="pop">
306
-            <div class="pop_line">
307
-	            <div class="itp_label_area">
308
-	                <label>납품요청일</label>
309
-	            </div>
310
-	            <div class="itp_info_area">
311
-	                <div class="fnPopDlvReqDt"></div>
312
-	            </div>
313
-            </div>
314
-            <div class="pop_line">
315
-	            <div class="itp_label_area">
316
-              		<label>품목수</label>
317
-	            </div>
318
-   	            <div class="itp_info_area">
319
-                	<div class="fnItemQty"></div>
320
-                </div>
321
-            </div>
322
-            <div class="pop_line">
323
-              	<div class="itp_label_area">
324
-                	<label>구매요청금액 </label>
325
-                </div>
326
-                <div class="itp_info_area">
327
-                	<div class="fnOrdReqAmt"></div>
328
-                </div>
329
-            </div>
330
-            <div class="pop_line">
331
-              	<div class="itp_label_area">
332
-                	<label>구매가능금액 </label>
333
-                </div>
334
-                <div class="itp_info_area">
335
-                	<div class="fnOrdPssblAmt"></div>
336
-                </div>
337
-            </div>
338
-            <div class="pop_line border">
339
-              	<div class="itp_label_area">
340
-                	<label>구매금액 </label>
341
-                </div>
342
-                <div class="itp_info_area">
343
-                	<div class="fnOrdAmt"></div>
344
-                </div>
345
-            </div>
346
-            <div class="pop_msg">구매한도가 부족합니다.<br> 선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.</div>
347
-            <div class="popup_btn">
348
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_SAVE_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
349
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_SAVE_CONFIRM" class="ok btn-primary COK">결제</button>
350
-            </div>
351
-        </div>
352
-    </div>
353 153
     <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
354 154
         <div class="pop">
355 155
             <div class="header">
@@ -387,7 +187,7 @@
387 187
             </div>
388 188
         </div>
389 189
     </div>
390
-    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
190
+    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
391 191
         <div class="pop">
392 192
             <div class="header">
393 193
                 <div class="header_left">
@@ -409,7 +209,7 @@
409 209
                 </div>
410 210
             </form>
411 211
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
412
-                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0"></ul>
212
+                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
413 213
                 <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
414 214
                      <li class="row_2">
415 215
                         <div class="scroll_left">

+ 10 - 10
src/main/webapp/mobile/app/mpomng/MPOMNG06010.html

@@ -11,9 +11,9 @@
11 11
 				<div class="line">
12 12
 					<label>납품예정일</label>
13 13
 					<div class="date_to">
14
-						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
14
+						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
15 15
 						<div class="at">~</div>
16
-						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
16
+						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
17 17
 					</div>
18 18
 				</div>
19 19
 				<div class="line">
@@ -38,8 +38,8 @@
38 38
 				<div class="line">
39 39
 					<label>납품장소</label>
40 40
 					<div class="float_left">
41
-						<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
42
-						<input type="hidden" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
41
+						<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" class="" name="swhsNm" placeholder="매장명" readonly />
42
+						<input type="hidden" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" class="" name="swhsId" />
43 43
            				<div class="itp_input_btn">
44 44
 							<button id="ITP_BTN_MPOMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
45 45
 						</div>
@@ -67,7 +67,7 @@
67 67
 		<form id="ITP_FORM_MPOMNG06010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
68 68
 			<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_AREA" class="scroll_area row-4">
69 69
 				<ul id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
70
-				<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
70
+				<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
71 71
 					<li class="history_list2">
72 72
 						<div class="left">
73 73
 							<div class="nomal">
@@ -157,7 +157,7 @@
157 157
 			</div>
158 158
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
159 159
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
160
-				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: block;">
160
+				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
161 161
 					<li class="row_2">
162 162
 						<div class="scroll_left">
163 163
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
@@ -194,12 +194,12 @@
194 194
 			</div>
195 195
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
196 196
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
197
-				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: block;">
197
+				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: none;">
198 198
 					<li class="row_2">
199 199
 						<div class="scroll_left">
200
-						  <div class="fnWhsNm">브랜드 창고 명A</div>
201
-						  <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
202
-						  <div class="sub fnLocationNm">누리자 B/D</div>
200
+						  <div class="fnWhsNm"></div>
201
+						  <div class="sub fnLocationNm"></div>
202
+						  <div class="sub fnLocationNm"></div>
203 203
 						</div>
204 204
 						<div class="scroll_right">
205 205
 							<button id="ITP_BTN_MPOMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 4 - 4
src/main/webapp/mobile/app/mpomng/MPOMNG07010.html

@@ -11,9 +11,9 @@
11 11
 	      <div class="line">
12 12
 			  <label>입고일자</label>
13 13
 	        <div class="date_to">
14
-				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
14
+				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
15 15
 				<div class="at">~</div>
16
-				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
16
+				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
17 17
 	        </div>
18 18
 	      </div>
19 19
 	      <div class="line">
@@ -151,7 +151,7 @@
151 151
 			</div>
152 152
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
153 153
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
154
-				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: block;">
154
+				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
155 155
 					<li class="row_2">
156 156
 						<div class="scroll_left">
157 157
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
@@ -188,7 +188,7 @@
188 188
 			</div>
189 189
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
190 190
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
191
-				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: block;">
191
+				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: none;">
192 192
 					<li class="row_2">
193 193
 						<div class="scroll_left">
194 194
 							<div class="fnWhsNm">브랜드 창고 명A</div>

+ 6 - 2
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -72,6 +72,7 @@ let mobPageObj = {
72 72
 
73 73
 let mobContObj = {
74 74
 	init: function() {
75
+		this.list.empty();
75 76
 		this.data.load();
76 77
 	},
77 78
 	data: {
@@ -132,6 +133,7 @@ let mobContObj = {
132 133
 				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
133 134
 				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
134 135
 			}
136
+			this.empty();
135 137
 		},
136 138
 		detachRow: function () {
137 139
 			if($('#ITP_LIST_MPOMNG01010_ITEM_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
@@ -144,11 +146,11 @@ let mobContObj = {
144 146
 				});
145 147
 				this.pchReqAmtTot();
146 148
 			}
149
+			this.empty();
147 150
 		},
148 151
 		actPlus: function(elem) {
149 152
 			var $div = $(elem).siblings('div');
150 153
 			var num = Number($div.text());
151
-			console.log('actPlus ===> ' + num);
152 154
 			$($div).text((num + 1).toString());
153 155
 			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
154 156
 			this.pchReqAmtTot();
@@ -156,7 +158,6 @@ let mobContObj = {
156 158
 		actMinus: function(elem) {
157 159
 			var $div = $(elem).siblings('div');
158 160
 			var num = Number($div.text());
159
-			console.log('actMinus ===> ' + num);
160 161
 			if(num <= 1) {
161 162
 				alert('주문수량을 확인하세요.');
162 163
 			} else {
@@ -173,6 +174,9 @@ let mobContObj = {
173 174
 				reqAmt += Number(qty) * amt;
174 175
 			});
175 176
 			$('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
177
+		},
178
+		empty: function() {
179
+			($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS li').length > 0) ? $('.itp_non_data').hide() :  $('.itp_non_data').show();
176 180
 		}
177 181
 	},
178 182
 	cancel: function () {

+ 1 - 1
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG05010.js

@@ -133,7 +133,7 @@ let mobContentObj = {
133 133
 				_this.totPage = result.gridTotal;
134 134
 				$.each(result.gridRows, function (i, item) {
135 135
 					$('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY').html());
136
-					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .list-row:last');
136
+					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .history_list2:last');
137 137
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
138 138
 					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
139 139
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);

+ 13 - 16
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -35,8 +35,9 @@ let mobPageObj = {
35 35
 			});
36 36
 
37 37
 			// 조회일자 지정
38
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
39
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
38
+			$('#ITP_MOBILE_MPOMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
40
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40 41
 		},
41 42
 		info: function() {
42 43
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -61,6 +62,10 @@ let mobPageObj = {
61 62
 				return false;
62 63
 			});
63 64
 
65
+			$(document).on('click', '#ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS li button', function() {
66
+				mobPopObj.popSpply.choice($(this));
67
+			});
68
+
64 69
 			$(document).on('click', '#ITP_LIST_MPOMNG06010_POP_WHS_ROWS li button', function() {
65 70
 				mobPopObj.popWhsNm.choice($(this));
66 71
 			});
@@ -128,12 +133,12 @@ let mobContentObj = {
128 133
 				_this.totPage = result.gridTotal;
129 134
 				$.each(result.gridRows, function (i, item) {
130 135
 					$('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY').html());
131
-					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .list-row:last');
136
+					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .history_list2:last');
132 137
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
133 138
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
134 139
 					$li.find('.fnSpplyNm').text(item.spplyNm);
135 140
 					$li.find('.fnWhsNm').text(item.whsNm);
136
-					$li.find('.fnItemNm').text(item.itemNm + '(' + item.podrQty + item.unit + ')');
141
+					$li.find('.fnItemNm').text(item.itemNm);
137 142
 					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
138 143
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
139 144
 					$li.find('.fnWhsQty').val(item.whsQty);
@@ -144,9 +149,6 @@ let mobContentObj = {
144 149
 			const param = $('#ITP_FORM_MPOMNG06010_LIST_SEARCH').serializeObject();
145 150
 			param.gridPage = ++this.listPage;
146 151
 			param.gridSize = this.listSize;
147
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
148
-			param.toDt = CommonObj.onlyNumber(param.toDt);
149
-			console.log(JSON.stringify(param));
150 152
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
151 153
 		},
152 154
 		save: function() {
@@ -209,7 +211,7 @@ let mobPopObj = {
209 211
 			this.rows = gridRows;
210 212
 			$.each(gridRows, function (i, item) {
211 213
 				$('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY').html());
212
-				var $li = $('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group > .list-row:last');
214
+				var $li = $('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group > .row_2:last');
213 215
 				$li.find('.fnSpplyNm').text(item.spplyNm);
214 216
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
215 217
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -273,7 +275,7 @@ let mobPopObj = {
273 275
 			this.rows = gridRows;
274 276
 			$.each(gridRows, function (i, item) {
275 277
 				$('#ITP_LIST_MPOMNG06010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY').html());
276
-				var $li = $('#ITP_LIST_MPOMNG06010_POP_WHS_AREA .panel-group > .list-row:last');
278
+				var $li = $('#ITP_LIST_MPOMNG06010_POP_WHS_AREA .panel-group > .row_2:last');
277 279
 				$li.find('.fnWhsNm').text(item.whsNm);
278 280
 				$li.find('.fnLocationNm').text(item.locationNm);
279 281
 				$li.find('.fnWhsId').data('whs-id', item.whsId);
@@ -304,13 +306,8 @@ let mobPopObj = {
304 306
 			});
305 307
 		},
306 308
 		delete: function() {
307
-			if(_this.popMode === 'RTN_WHS') {
308
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val('');
309
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val('');
310
-			} else {
311
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
312
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
313
-			}
309
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID').val('');
310
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM').val('');
314 311
 		},
315 312
 		close: function() {
316 313
 			this.rows.length = 0;

+ 8 - 10
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG07010.js

@@ -35,8 +35,9 @@ let mobPageObj = {
35 35
 			});
36 36
 
37 37
 			// 조회일자 지정
38
-			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
39
-			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
38
+			$('#ITP_MOBILE_MPOMNG07010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
+			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
40
+			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40 41
 		},
41 42
 		info: function() {
42 43
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -132,15 +133,15 @@ let mobContentObj = {
132 133
 				_this.totPage = result.gridTotal;
133 134
 				$.each(result.gridRows, function (i, item) {
134 135
 					$('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG07010_LIST_ITEM_ROWCOPY').html());
135
-					var $li = $('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group > .list-row:last');
136
+					var $li = $('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group > .history_list2:last');
136 137
 					$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo);
137 138
 					$li.find('.fnDlvCmpltDt').text(item.dlvCmpltDt);
138 139
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
139 140
 					$li.find('.fnSpplyNm').text(item.spplyNm);
140 141
 					$li.find('.fnWhsNm').text(item.whsNm);
141 142
 					$li.find('.fnItemNm').text(item.itemNm);
142
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty) + item.unit);
143
-					$li.find('.fnWhsQty').text(CommonObj.comma.set(item.dlvQty) + item.unit);
143
+					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty,  item.unit));
144
+					$li.find('.fnWhsQty').text(CommonObj.comma.set(item.dlvQty,  item.unit));
144 145
 					_this.rows.push(item);
145 146
 				});
146 147
 			};
@@ -148,9 +149,6 @@ let mobContentObj = {
148 149
 			const param = $('#ITP_FORM_MPOMNG07010_LIST_SEARCH').serializeObject();
149 150
 			param.gridPage = ++this.listPage;
150 151
 			param.gridSize = this.listSize;
151
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
152
-			param.toDt = CommonObj.onlyNumber(param.toDt);
153
-			console.log(JSON.stringify(param));
154 152
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
155 153
 		}
156 154
 	}
@@ -180,7 +178,7 @@ let mobPopObj = {
180 178
 			this.rows = gridRows;
181 179
 			$.each(gridRows, function (i, item) {
182 180
 				$('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY').html());
183
-				var $li = $('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group > .list-row:last');
181
+				var $li = $('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group > .row_2:last');
184 182
 				$li.find('.fnSpplyNm').text(item.spplyNm);
185 183
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
186 184
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -244,7 +242,7 @@ let mobPopObj = {
244 242
 			this.rows = gridRows;
245 243
 			$.each(gridRows, function (i, item) {
246 244
 				$('#ITP_LIST_MPOMNG07010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY').html());
247
-				var $li = $('#ITP_LIST_MPOMNG07010_POP_WHS_AREA .panel-group > .list-row:last');
245
+				var $li = $('#ITP_LIST_MPOMNG07010_POP_WHS_AREA .panel-group > .row_2:last');
248 246
 				$li.find('.fnWhsNm').text(item.whsNm);
249 247
 				$li.find('.fnLocationNm').text(item.locationNm);
250 248
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

+ 11 - 2
src/main/webapp/mobile/js/config.js

@@ -508,6 +508,16 @@ function itp_fn_modal_confirm(msg, fn, args) {
508 508
 	}
509 509
 }
510 510
 
511
+function itp_fn_modal_empty(msg) {
512
+	$('#ITP_MODAL_NOT_INPUT').hide();
513
+	$('#ITP_MODAL_NOT_INPUT').modal('show');
514
+	$('#ITP_MODAL_NOT_INPUT').find('.fnNotInput').html(msg);
515
+	$('#ITP_MODAL_NOT_INPUT_CONFIRM').off('click');
516
+	$('#ITP_MODAL_NOT_INPUT_CONFIRM').on('click', function() {
517
+		$('#ITP_MODAL_NOT_INPUT').modal('hide');
518
+	});
519
+};
520
+
511 521
 let itp_fn_form_validate = function(form, element, arry, msg, type) {
512 522
 	var error = function(txt) {
513 523
 		if (type != 'ONLYCHK') {
@@ -663,8 +673,7 @@ let itp_fn_form_event = {
663 673
 				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined, alertMsg);
664 674
 				if(!isValid) {
665 675
 					if(alertMsg && alertMsg.length > 0) {
666
-						itp_fn_modal_alert($(this).data('alert-msg'));
667
-						// alert($(this).data('alert-msg'));
676
+						itp_fn_modal_empty($(this).data('alert-msg'));
668 677
 					}
669 678
 					return false;
670 679
 				}