Pārlūkot izejas kodu

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

yhl88 2 gadi atpakaļ
vecāks
revīzija
1026f772cf

+ 1 - 1
src/main/webapp/mobile/app/login.html

@@ -36,7 +36,7 @@
36 36
           <input type="text" name="bsnsRegNo" id="ITP_FORM_LOGIN_BSNS_REG_NO" required value="1">
37 37
           <label for="ITP_FORM_LOGIN_BSNS_REG_NO">사업자번호</label>
38 38
           <div class="itp_del_btn reg_no">
39
-	          <button type="button" id="ITP_FORM_LOGIN_DEL_BSNS_REG_NO">
39
+	          <button type="button" id="ITP_FORM_DEL_LOGIN_BSNS_REG_NO">
40 40
   				<img src="../img/close.png" alt="로고" class=" ">
41 41
 	          </button>
42 42
           </div>

+ 3 - 3
src/main/webapp/mobile/app/main.html

@@ -125,7 +125,6 @@
125 125
 				</div>
126 126
 			</div>
127 127
 		</div>
128
-
129 128
 		<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal" style="">
130 129
 			<div class="modal-dialog modal-sm">
131 130
 				<div class="modal-content">
@@ -151,7 +150,9 @@
151 150
 						<h5 class="modal-title">알림</h5>
152 151
 					</div>
153 152
 					<div class="modal-body">
154
-						<div><div class="text-center itp_alert_txt">미입력칸 제목</div>칸 은 필수 입력란 입니다.</div>
153
+						<div class="">
154
+							<div style="display:contents" class="fnNotInput">미입력칸 제목</div>&nbsp;입력란 은 필수 입력란입니다.
155
+						</div>
155 156
 					</div>
156 157
 					<div class="modal-footer">
157 158
 						<button type="button" class="btn btn-primary" id="ITP_MODAL_NOT_INPUT_CONFIRM">확인</button>
@@ -160,7 +161,6 @@
160 161
 			</div>
161 162
 		</div>
162 163
 	</footer>
163
-
164 164
 	<aside id="ITP_ASIDE"></aside>
165 165
 </div>
166 166
 </body>

+ 242 - 14
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -52,7 +52,7 @@
52 52
           </div>
53 53
         </div>
54 54
       </div>
55
-      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-3">
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 57
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
58 58
       <!--   검색된 데이터가 없습니다  -->
@@ -99,19 +99,48 @@
99 99
     </form>
100 100
   </div>
101 101
   <div id="ITP_MOBILE_JS"></div>
102
-    <div id="ITP_POP_MPOMNG01010_REQ_AREA" class="popup mobile-pop-close" style="display: block;">
102
+  	<!-- 구매요청팝업 -->
103
+    <div id="ITP_POP_MPOMNG01010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
103 104
         <div class="pop">
104 105
             <div class="pop_line">
105
-                <label>납품요청일 &nbsp;&nbsp;:</label>
106
-                <div class="fnPopDlvReqDt"></div>
106
+	            <div class="itp_label_area">
107
+	                <label>납품요청일</label>
108
+	            </div>
109
+	            <div class="itp_info_area">
110
+	                <div class="fnPopDlvReqDt"></div>
111
+	            </div>
107 112
             </div>
108 113
             <div class="pop_line">
109
-                <label>품목수&nbsp;&nbsp; :</label>
110
-                <div class="fnItemQty"></div>
114
+	            <div class="itp_label_area">
115
+              		<label>품목수</label>
116
+	            </div>
117
+   	            <div class="itp_info_area">
118
+                	<div class="fnItemQty"></div>
119
+                </div>
120
+            </div>
121
+            <div class="pop_line">
122
+              	<div class="itp_label_area">
123
+                	<label>구매요청금액 </label>
124
+                </div>
125
+                <div class="itp_info_area">
126
+                	<div class="fnOrdReqAmt"></div>
127
+                </div>
111 128
             </div>
112 129
             <div class="pop_line">
113
-                <label>구매금액 &nbsp;&nbsp;:</label>
114
-                <div class="fnOrdAmt"></div>
130
+              	<div class="itp_label_area">
131
+                	<label>구매가능금액 </label>
132
+                </div>
133
+                <div class="itp_info_area">
134
+                	<div class="fnOrdPssblAmt"></div>
135
+                </div>
136
+            </div>
137
+            <div class="pop_line border">
138
+              	<div class="itp_label_area">
139
+                	<label>구매금액 </label>
140
+                </div>
141
+                <div class="itp_info_area">
142
+                	<div class="fnOrdAmt"></div>
143
+                </div>
115 144
             </div>
116 145
             <!--<label class="pop_label msg_save">구매요청 하시겠습니까?</label>-->
117 146
             <div class="pop_msg">구매요청 하시겠습니까?</div>
@@ -121,6 +150,206 @@
121 150
             </div>
122 151
         </div>
123 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>
124 353
     <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
125 354
         <div class="pop">
126 355
             <div class="header">
@@ -140,16 +369,15 @@
140 369
                 </form>
141 370
             </div>
142 371
             <div class="select_btn">
143
-                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소 V</button>
372
+                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소 </button>
144 373
             </div>    
145 374
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
146 375
                 <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
147 376
                 <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display: none;">
148 377
                     <li class="row_2">
149 378
                         <div class="scroll_left">
150
-                            <div class="fnWhsNm"></div>
151
-                            <div class="sub fnLocationNm"></div>
152
-                            <div class="sub fnLocationNm"></div>
379
+                            <div class="con_2 fnWhsNm"></div>
380
+                            <div class="con_2 sub fnLocationNm"></div>
153 381
                         </div>
154 382
                         <div class="scroll_right">
155 383
                             <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -159,7 +387,7 @@
159 387
             </div>
160 388
         </div>
161 389
     </div>
162
-    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
390
+    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
163 391
         <div class="pop">
164 392
             <div class="header">
165 393
                 <div class="header_left">
@@ -177,7 +405,7 @@
177 405
                     <button id="ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
178 406
                 </div>
179 407
                 <div class="select_btn">
180
-                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명 V</button>
408
+                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명 </button>
181 409
                 </div>
182 410
             </form>
183 411
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">

+ 11 - 11
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -10,9 +10,9 @@
10 10
         <div class="line">
11 11
           <label>구매요청일</label>
12 12
 	        <div class="date_to date">
13
-	          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
13
+	          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
14 14
 	          <div class="at">~</div>
15
-	          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" pattern="\d{4}.\d{2}.\d{2}">
15
+	          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
16 16
 	        </div>
17 17
 		</div>
18 18
       <div class="line">
@@ -46,17 +46,17 @@
46 46
       </div>
47 47
       </form>
48 48
     </div>
49
-    <div id="ITP_LIST_MPOMNG02010_LIST_AREA" class="scroll_area row-1">
50
-      <ul id="ITP_LIST_MPOMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
51
-      <div id="ITP_LIST_MPOMNG02010_LIST_ROWCOPY" style="display: block;">
49
+    <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-1">
50
+      <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
51
+      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
52 52
         <li class="history_list">
53 53
           <div class="left">
54 54
             <div class="nomal">
55 55
               <label>구매요청일 </label>
56 56
               <span>:</span>
57 57
               <div class="history">
58
-                <div class="fnPchReqDt">2022.10.01</div>
59
-                (<div class="fnPchReqMgrNm">홍길동 점주</div>)
58
+                <div class="fnPchReqDt"></div>
59
+                (<div class="fnPchReqMgrNm"></div>)
60 60
               </div>
61 61
             </div>
62 62
           </div>
@@ -66,14 +66,14 @@
66 66
                   <label>구매상태</label>
67 67
                   <span>:</span>
68 68
                   <div class="history">
69
-                    <div class="fnPchReqStNm">대기</div>
69
+                    <div class="fnPchReqStNm"></div>
70 70
                   </div>
71 71
               </div>
72 72
               <div class="half">
73 73
                   <label>납품장소명 </label>
74 74
                   <span>:</span>
75 75
                   <div class="history">
76
-                    <div class="fnWhsLocationNm">A매장내</div>
76
+                    <div class="fnWhsLocationNm"></div>
77 77
                   </div>
78 78
               </div>
79 79
             </div>
@@ -83,7 +83,7 @@
83 83
               <label>구매요청 정보</label>
84 84
               <span>:</span>
85 85
               <div class="history">
86
-                <div class="fnPchReqItemQty">품목수(3)</div>
86
+                <div class="fnPchReqItemQty"></div>
87 87
                 <i>- </i>
88 88
                 <div class="fnPchReqTotalAmt"></div> 원
89 89
               </div>
@@ -94,7 +94,7 @@
94 94
               <label>결재정보 </label>
95 95
               <span>:</span>
96 96
               <div class="history">
97
-                <div class="fnPchReqRjctNm">결제완료</div>
97
+                <div class="fnPchReqRjctNm"></div>
98 98
               </div>
99 99
             </div>
100 100
           </div>

+ 110 - 102
src/main/webapp/mobile/app/mpomng/MPOMNG04010.html

@@ -1,82 +1,9 @@
1
-<section id="ITP_MOBILE_MPOMNG04010">  
2
-	<div id="ITP_POP_MPOMNG04010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
3
-	  <div class="pop">
4
-		  <div class="header">
5
-			  <div class="header_left">
6
-				  <label>공급업체</label>
7
-			  </div>
8
-			  <div class="header_right">
9
-				  <button type="button" id="ITP_BTN_MPOMNG04010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
10
-			  </div>
11
-		  </div>
12
-		  <div class="search_bar">
13
-			  <form id="ITP_FORM_MPOMNG04010_POP_SPPLY" class="form-horizontal" onsubmit="return false;">
14
-				  <input type="hidden" id="ITP_FORM_MPOMNG04010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
15
-				  <input type="hidden" id="ITP_FORM_MPOMNG04010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
16
-				  <input id="ITP_FORM_MPOMNG04010_POP_SPPLY_KEYWORD" type="text" name="sSpplyNm" placeholder="공급업체명">
17
-				  <button id="ITP_BTN_MPOMNG04010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
18
-			  </form>
19
-		  </div>
20
-		  <div class="select_btn">
21
-			  <button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
22
-		  </div>
23
-		  <div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
24
-			  <ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
25
-			  <div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: block;">
26
-				  <li class="row_2">
27
-					  <div class="scroll_left">
28
-						  <div class="con_2 fnSpplyNm">공급업체 명A</div>
29
-						  <div class="con_2 sub fnStNm">($)</div>
30
-					  </div>
31
-					  <div class="scroll_right">
32
-						  <button id="ITP_BTN_MPOMNG04010_POP_SPPLY_CHOICE" class="fnSpplyId">선택</button>
33
-					  </div>
34
-				  </li>
35
-			  </div>
36
-		  </div>
37
-	  </div>
38
-	</div>
39
-    <div id="ITP_POP_MPOMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
40
-		  <div class="pop">
41
-			  <div class="header">
42
-				  <div class="header_left">
43
-					  <label>납품장소</label>
44
-				  </div>
45
-				  <div class="header_right">
46
-					  <button type="button" id="ITP_BTN_MPOMNG04010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
47
-				  </div>
48
-			  </div>
49
-			  <div class="search_bar">
50
-				  <form id="ITP_FORM_MPOMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
51
-					  <input type="hidden" id="ITP_FORM_MPOMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
52
-					  <input type="hidden" id="ITP_FORM_MPOMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
53
-					  <input id="ITP_FORM_MPOMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
54
-					  <button id="ITP_BTN_MPOMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
55
-				  </form>
56
-			  </div>
57
-			  <div class="select_btn">
58
-				  <button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
59
-			  </div>
60
-			  <div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
61
-				  <ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
62
-				  <div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: block;">
63
-					  <li class="row_2">
64
-						  <div class="scroll_left">
65
-							  <div class="fnWhsNm">브랜드 창고 명A</div>
66
-							  <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
67
-							  <div class="sub fnLocationNm">누리자 B/D</div>
68
-						  </div>
69
-						  <div class="scroll_right">
70
-							  <button id="ITP_BTN_MPOMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
71
-						  </div>
72
-					  </li>
73
-				  </div>
74
-			  </div>
75
-		  </div>
76
-	  </div>
1
+<section id="ITP_MOBILE_MPOMNG04010">
77 2
 	<div id="ITP_AJAX_MPOMNG04010_LIST_CONTAINER" style="display: none;">
78
-		<form id="ITP_FORM_MPOMNG04010_LIST" class="form-horizontal" onsubmit="return false;">
79
-		<input type="hidden" id="ITP_FORM_MPOMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
3
+		<form id="ITP_FORM_MPOMNG04010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
4
+		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5
+		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6
+		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_IDX" name="sidx" value="0">
80 7
 		  <div class="content">
81 8
 			<div class="line header">
82 9
 			  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매발주현황</div>
@@ -84,15 +11,15 @@
84 11
 			<div class="line">
85 12
 			  <label>발주일자</label>
86 13
 			  <div class="date_to date">
87
-				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" type="date">
14
+				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" type="text" class="itp_input date">
88 15
 				<div class="at">~</div>
89
-				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT" name="toDt" type="date">
16
+				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT" name="toDt" type="text" class="itp_input date">
90 17
 			  </div>
91 18
 			</div>
92 19
 			<div class="line">
93 20
 			  <label>발주상태</label>
94 21
 			  <div class="float_left">
95
-				<select name="spchOdrStCd" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_PCH_ORD_ST_CD">
22
+				<select name="spchOdrStCd" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_PCH_ORD_ST_CD" data-select-code="PCH_ODR_ST_CD">
96 23
 				  <option value=""></option>
97 24
 				</select>
98 25
 				</div>   
@@ -136,14 +63,14 @@
136 63
 		  </div>
137 64
 		<div id="ITP_LIST_MPOMNG04010_LIST_ITEM_AREA" class="scroll_area row-3">
138 65
 		  <ul id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
139
-			  <div id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY" style="display: block;">
66
+			  <div id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
140 67
 				<li class="list-row2">
141 68
 				  <div class="left">
142 69
 					<div class="nomal">
143 70
 					  <label>발주일자 &nbsp;:</label>
144 71
 					  <div class="history">
145
-						<div class="fnPodrDt">2022.10.01</div> 
146
-						(<div class="fnOwnerNm">홍길동 점주</div>)
72
+						<div class="fnPodrDt"></div>
73
+						(<div class="fnPodrMgrNm"></div>)
147 74
 					  </div>
148 75
 					</div>
149 76
 				  </div>
@@ -151,11 +78,11 @@
151 78
 					<div class="nomal">
152 79
 					  <label>발주상태 &nbsp;:</label>
153 80
 					  <div class="history">
154
-						<div class="fnPodrStCd">대기</div>
81
+						<div class="fnPchodrStCd"></div>
155 82
 					  </div>
156 83
 					  <label>납품장소명&nbsp;:</label>
157 84
 					  <div class="history">
158
-						<div class="fnDlvPlaceNm">A매장내</div>
85
+						<div class="fnLocationNm"></div>
159 86
 					  </div>
160 87
 					</div>
161 88
 				  </div>
@@ -163,9 +90,9 @@
163 90
 					<div class="nomal">
164 91
 					  <label>발주정보 &nbsp;:</label>
165 92
 					  <div class="history">
166
-						<div class="fnItemQty">품목수(3)</div> 
93
+						<div class="fnItemQty">품목수($)</div>
167 94
 						<i>-</i>
168
-						<div class="fnItemAtm">1,200,000</div>원
95
+						<div class="fnPodrTotalAmt"></div>원
169 96
 					  </div>
170 97
 					</div>
171 98
 				  </div>
@@ -173,7 +100,7 @@
173 100
 					<div class="nomal">
174 101
 					  <label>공급업체 &nbsp;:</label>
175 102
 					  <div class="history">
176
-						<div class="fnSpplyNm">A공급업체</div> 
103
+						<div class="fnSpplyNm"></div>
177 104
 					  </div>
178 105
 					</div>
179 106
 				  </div>
@@ -189,25 +116,31 @@
189 116
 			<div class="line">
190 117
 			  <label>발주일자</label>
191 118
 			  <div class="line_right">
192
-				<div class="fnPodrDt">2022.10.10</div>
119
+				<div class="fnPodrDt"></div>
193 120
 			  </div>      
194 121
 			</div>
195 122
 			<div class="line">
196 123
 			  <label>발주금액</label>
197 124
 			  <div class="line_right">
198
-				<div class="fnPodrAmt">424,000원</div>
125
+				<div class="fnPodrTotalAmt"></div>
126
+			  </div>
127
+			</div>
128
+			<div class="line">
129
+			  <label>납기요청일자</label>
130
+			  <div class="line_right">
131
+				  <div class="fnDlvReqDt"></div>
199 132
 			  </div>
200 133
 			</div>
201 134
 			<div class="line">
202 135
 			  <label>납품장소</label>
203 136
 			  <div class="line_right">
204
-				<div class="fnDlvPlace">A매장내</div>
137
+				<div class="fnShmtWhsNm"></div>
205 138
 			  </div>
206 139
 			</div>
207 140
 			<div class="line">
208 141
 			  <label>공급업체</label>
209 142
 			  <div class="line_right">
210
-				<div class="fnSpplyNm">A공급업체</div>
143
+				<div class="fnWhsNm"></div>
211 144
 			  </div>
212 145
 			</div>
213 146
 			<div class="table_header">
@@ -216,13 +149,13 @@
216 149
 		  </div>
217 150
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-2">
218 151
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
219
-			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display:block;">
152
+			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display:none;">
220 153
 				<li class="list-row2">
221 154
 				  <div class="left">
222 155
 					<div class="nomal">
223 156
 					  <label>품목명</label>
224 157
 					  <span>:</span>
225
-					  <div class="fnItemNm">품목명</div>
158
+					  <div class="fnItemNm"></div>
226 159
 					</div>
227 160
 				  </div>
228 161
 				  <div class="left">
@@ -230,11 +163,11 @@
230 163
 					  <label>수량</label>
231 164
 					  <span>:</span>
232 165
 					  <div class="history">
233
-						<div class="fnQty">대기</div>
166
+						<div class="fnPodrQty"></div>
234 167
 					  </div>
235 168
 					  <label class="sub_info">금액&nbsp;:</label>
236 169
 					  <div class="history">
237
-						<div class="fnAmt">A매장내</div>
170
+						<div class="fnUnitAmt"></div>
238 171
 					  </div>
239 172
 					</div>
240 173
 				  </div>
@@ -243,26 +176,101 @@
243 176
 					  <label>구매가 </label>
244 177
 					  <div class="history">
245 178
 					  <span>:</span>
246
-					  <div class="fnPchActAmt">품목수(3)</div> 
179
+					  <div class="fnPodrAmt"></div>
247 180
 					  </div>
248 181
 					</div>
249 182
 				  </div>
250
-				  <div class="left">
183
+				  <!--<div class="left">
251 184
 					<div class="nomal">
252 185
 					  <label>납기요청일가 </label>
253 186
 					  <div class="history">
254 187
 					  	<span>:</span>
255
-						<div class="fnDlvReqDt">A공급업체</div> 
188
+						<div class="fnDlvReqDt"></div>
256 189
 					  </div>
257 190
 					</div>
258
-				  </div>
191
+				  </div>-->
259 192
 				</li>
260 193
 			</div>
261 194
 		  </div>
262 195
 		  <div class="button_bar">
263
-			<button id="ITP_BTN_MPOMNG04010_VIEW_CANCEL" class="col_12 btn-gray CLB">취소</button>
196
+			<button id="ITP_BTN_MPOMNG04010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
264 197
 		  </div>
265 198
 	  </form>
266 199
 	</div>
267 200
 	<div id="ITP_MOBILE_JS"></div>
201
+	<div id="ITP_POP_MPOMNG04010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
202
+		<div class="pop">
203
+			<div class="header">
204
+				<div class="header_left">
205
+					<label>공급업체</label>
206
+				</div>
207
+				<div class="header_right">
208
+					<button type="button" id="ITP_BTN_MPOMNG04010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
209
+				</div>
210
+			</div>
211
+			<div class="search_bar">
212
+				<form id="ITP_FORM_MPOMNG04010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
213
+					<input type="hidden" id="ITP_FORM_MPOMNG04010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
214
+					<input type="hidden" id="ITP_FORM_MPOMNG04010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
215
+					<input id="ITP_FORM_MPOMNG04010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
216
+					<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
217
+				</form>
218
+			</div>
219
+			<div class="select_btn">
220
+				<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
221
+			</div>
222
+			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
223
+				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
224
+				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: none;">
225
+					<li class="row_2">
226
+						<div class="scroll_left">
227
+							<div class="con_2 fnSpplyNm">공급업체 명A</div>
228
+							<div class="con_2 sub fnStNm">($)</div>
229
+						</div>
230
+						<div class="scroll_right">
231
+							<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_CHOICE" class="fnSpplyId">선택</button>
232
+						</div>
233
+					</li>
234
+				</div>
235
+			</div>
236
+		</div>
237
+	</div>
238
+	<div id="ITP_POP_MPOMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
239
+		<div class="pop">
240
+			<div class="header">
241
+				<div class="header_left">
242
+					<label>납품장소</label>
243
+				</div>
244
+				<div class="header_right">
245
+					<button type="button" id="ITP_BTN_MPOMNG04010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
246
+				</div>
247
+			</div>
248
+			<div class="search_bar">
249
+				<form id="ITP_FORM_MPOMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
250
+					<input type="hidden" id="ITP_FORM_MPOMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
251
+					<input type="hidden" id="ITP_FORM_MPOMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
252
+					<input id="ITP_FORM_MPOMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
253
+					<button id="ITP_BTN_MPOMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
254
+				</form>
255
+			</div>
256
+			<div class="select_btn">
257
+				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
258
+			</div>
259
+			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
260
+				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
261
+				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: none;">
262
+					<li class="row_2">
263
+						<div class="scroll_left">
264
+							<div class="fnWhsNm"></div>
265
+							<div class="sub fnLocationNm"></div>
266
+							<div class="sub fnLocationNm"></div>
267
+						</div>
268
+						<div class="scroll_right">
269
+							<button id="ITP_BTN_MPOMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
270
+						</div>
271
+					</li>
272
+				</div>
273
+			</div>
274
+		</div>
275
+	</div>
268 276
   </section>

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

@@ -16,9 +16,9 @@
16 16
 						<option value="4">납품완료일</option>
17 17
 					</select>
18 18
 					<div class="date_to">
19
-						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
19
+						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
20 20
 						<div class="at">~</div>
21
-						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
21
+						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
22 22
 					</div>
23 23
 				</div>
24 24
 				<div class="line">
@@ -148,7 +148,7 @@
148 148
 			</div>
149 149
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
150 150
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
151
-				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: block;">
151
+				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
152 152
 					<li class="row_2">
153 153
 						<div class="scroll_left">
154 154
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
@@ -185,12 +185,12 @@
185 185
 			</div>
186 186
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
187 187
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
188
-				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: block;">
188
+				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: none;">
189 189
 					<li class="row_2">
190 190
 						<div class="scroll_left">
191
-							<div class="fnWhsNm">브랜드 창고 명A</div>
192
-							<div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
193
-							<div class="sub fnLocationNm">누리자 B/D</div>
191
+							<div class="fnWhsNm"></div>
192
+							<div class="sub fnLocationNm"></div>
193
+							<div class="sub fnLocationNm"></div>
194 194
 						</div>
195 195
 						<div class="scroll_right">
196 196
 							<button id="ITP_BTN_MPOMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -11,14 +11,17 @@ body .login {position:fixed;}
11 11
 .color-gray {color:#aaa;}
12 12
 /* 팝업 */
13 13
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
14
-section .popup .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 250px; padding-top: 30px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
14
+section .popup .pop {position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
15 15
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
16
-section .popup .pop div.pop_msg {position:relative; top:10px; font-size: 16px;}
17
-section .popup .pop .pop_line { width: 100%; height: 30px;}
18
-section .popup .pop .pop_line label { font-size: 16px; margin-left: 20px; float: left; width: auto; text-align: left;}
19
-section .popup .pop .pop_line div {text-align: right; float: right; font-size: 16px; margin-right: 20px; width: auto;}
16
+section .popup .pop div.pop_msg {padding:0 5%; text-align:left; position:relative; top:10px; font-size: 16px;}
17
+section .popup .pop .pop_line {width: 90%; margin:0 5%; display:flex; border:1px solid #aaa; border-bottom:none;}
18
+section .popup .pop .pop_line.border {border-bottom:1px solid #aaa;}
19
+section .popup .pop .pop_line .itp_label_area {height:35px; padding:8px; width:100px; margin:0; background:#eee; border-right:1px solid #aaa;}
20
+section .popup .pop .pop_line .itp_label_area label {margin:0;font-size: 14px; text-align:left; float: left; min-width: 100px;}
21
+section .popup .pop .pop_line .itp_info_area {width:calc(100% - 100px); margin:0; padding:6px;}
22
+section .popup .pop .pop_line div {text-align: right; float: right; font-size: 16px; margin-right: 10px; width: auto;}
20 23
 section .popup .pop .popup_btn { position: absolute; background-color: #ccc; bottom: 0; width: 100%; height: 51px; border-top: 2px solid #000;}
21
-section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 50px; font-size: 18px; font-weight: 100; border-radius: 0px; border: none;}
24
+section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 50px; margin:0; font-size: 18px; font-weight: 100; border-radius: 0px; border: none;}
22 25
 section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #000;}
23 26
 section .popup .pop .popup_btn button.cancel {width: 36%;}
24 27
 

+ 7 - 0
src/main/webapp/mobile/js/app/login.js

@@ -14,6 +14,13 @@ require(['config'], function() {
14 14
 			$th.val($th.val().replace(/(<([^>]+)>)/ig, function() {return '';}));
15 15
 		});
16 16
 
17
+		$('button[id^="ITP_FORM_DEL_LOGIN"]').on('click', function() {
18
+			$(this).closest('.input_area').find('input').val('');
19
+			if($(this).attr('id') === 'ITP_FORM_DEL_LOGIN_BSNS_REG_NO') {
20
+				$('#ITP_FORM_LOGIN_BRAND_ID').empty();
21
+			}
22
+		});
23
+
17 24
 		$('#ITP_BTN_LOGIN_BSNS_REG_NO').on('click', function() {
18 25
 			itp_fn_login_reg_no();
19 26
 		});

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

@@ -169,7 +169,7 @@ let mobContentObj = {
169 169
 				_this.totPage = result.gridTotal;
170 170
 				$.each(result.gridRows, function (i, item) {
171 171
 					$('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_ITEM_ROWCOPY').html());
172
-					var $li = $('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group > .list-row:last');
172
+					var $li = $('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group > .history_list:last');
173 173
 					$li.find('.fnPchReqDt').text(item.pchReqDt);
174 174
 					$li.find('.fnPchReqMgrNm').text(item.pchReqMgrNm);
175 175
 					$li.find('.fnPchReqStNm').text(item.pchReqStNm);
@@ -188,7 +188,7 @@ let mobContentObj = {
188 188
 		},
189 189
 		action: function () {
190 190
 			var _this = this;
191
-			$(document).on('click', '#ITP_LIST_MPOMNG02010_LIST_ROWS li', function() {
191
+			$(document).on('click', '#ITP_LIST_MPOMNG02010_ITEM_ROWS li', function() {
192 192
 				var index = $(this).index();
193 193
 				var item = _this.rows[index];
194 194
 				(item.pchReqStCd === PCH_REQ_ST_CD_TEMP_SAVE) ? mobContentObj.modify.init(item) : mobContentObj.detail.init(item);

+ 15 - 18
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG04010.js

@@ -25,7 +25,6 @@ let mobPageObj = {
25 25
 	ui: {
26 26
 		init: function () {
27 27
 			this.view();
28
-			this.info();
29 28
 		},
30 29
 		view: function() {
31 30
 			// 공통코드 표시
@@ -36,10 +35,10 @@ let mobPageObj = {
36 35
 			});
37 36
 
38 37
 			// 조회일자 지정
39
-			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
40
-			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
41
-		},
42
-		info: function() {
38
+			$('#ITP_MOBILE_MPOMNG04010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
+			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
40
+			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
41
+
43 42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
44 43
 			$('input:hidden[id$="_STORE_ID"]').val(fn_make_user_info.get('storeId'));
45 44
 		}
@@ -74,7 +73,7 @@ let mobPageObj = {
74 73
 				mobContentObj.view.init(item);
75 74
 			});
76 75
 
77
-			$(document).on('click', '#ITP_POP_MPOMNG04010_LIST_SPPLY_ROWS li button', function() {
76
+			$(document).on('click', '#ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS li button', function() {
78 77
 				mobPopObj.popSpply.choice($(this));
79 78
 			});
80 79
 
@@ -144,11 +143,12 @@ let mobContentObj = {
144 143
 				_this.totPage = result.gridTotal;
145 144
 				$.each(result.gridRows, function (i, item) {
146 145
 					$('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY').html());
147
-					var $li = $('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group > .list-row:last');
146
+					var $li = $('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group > .list-row2:last');
148 147
 					$li.find('.fnPodrDt').text(item.podrDt);
149 148
 					$li.find('.fnPodrMgrNm').text(item.podrMgrNm);
150 149
 					$li.find('.fnPchodrStCd').text(item.pchOdrStNm);
151
-					$li.find('.fnLocationNm').text(item.whsNm + ' - ' + item.locationNm);
150
+					$li.find('.fnLocationNm').text(item.whsNm);
151
+					// $li.find('.fnLocationNm').text(item.whsNm + ' - ' + item.locationNm);
152 152
 					$li.find('.fnItemQty').text($li.find('.fnItemQty').text().replace('$', item.podrItemQty));
153 153
 					$li.find('.fnPodrTotalAmt').text(CommonObj.comma.set(item.podrTotalAmt));
154 154
 					$li.find('.fnSpplyNm').text(item.spplyNm);
@@ -159,8 +159,6 @@ let mobContentObj = {
159 159
 			const param = $('#ITP_FORM_MPOMNG04010_LIST_SEARCH').serializeObject();
160 160
 			param.gridPage = ++this.listPage;
161 161
 			param.gridSize = this.listSize;
162
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
163
-			param.toDt = CommonObj.onlyNumber(param.toDt);
164 162
 			console.log(JSON.stringify(param));
165 163
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
166 164
 		}
@@ -184,13 +182,12 @@ let mobContentObj = {
184 182
 			var id = '#ITP_AJAX_MPOMNG04010_VIEW_CONTAINER';
185 183
 			$(id).find('.fnPodrDt').text(result.podrDt);
186 184
 			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
187
-			$(id).find('.fnShmtWhsDvsnNm').text(result.shmtWhsDvsnNm);
188
-			$(id).find('.fnSpplyNm').text(result.spplyNm);
185
+			$(id).find('.fnShmtWhsNm').text(result.shmtWhsNm);
186
+			$(id).find('.fnWhsNm').text(result.whsNm);
189 187
 			$(id).find('.fnDlvReqDt').text(result.dlvReqDt);
190 188
 			$.each(result.pchOdrDtlList, function (i, item) {
191 189
 				$('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY').html());
192
-				var $li = $('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group > .list-row:last');
193
-				console.log(item);
190
+				var $li = $('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group > .list-row2:last');
194 191
 				$li.find('.fnItemNm').text(item.itemNm);
195 192
 				$li.find('.fnUnit').text(item.unit);
196 193
 				$li.find('.fnPodrQty').text(CommonObj.currency.add(item.podrQty));
@@ -222,7 +219,7 @@ let mobPopObj = {
222 219
 		},
223 220
 		search: function() {
224 221
 			var _this = this;
225
-			$('#ITP_POP_MPOMNG04010_LIST_SPPLY_AREA .panel-group').empty();
222
+			$('#ITP_POP_MPOMNG04010_SPPLY_AREA .panel-group').empty();
226 223
 			var callbackFn = function(result) {
227 224
 				console.log(result);
228 225
 				_this.view(result.gridRows);
@@ -233,8 +230,8 @@ let mobPopObj = {
233 230
 		view: function(gridRows) {
234 231
 			this.rows = gridRows;
235 232
 			$.each(gridRows, function (i, item) {
236
-				$('#ITP_POP_MPOMNG04010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG04010_LIST_SPPLY_ROWCOPY').html());
237
-				var $li = $('#ITP_POP_MPOMNG04010_LIST_SPPLY_AREA .panel-group > .list-row:last');
233
+				$('#ITP_POP_MPOMNG04010_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY').html());
234
+				var $li = $('#ITP_POP_MPOMNG04010_SPPLY_AREA .panel-group > .row_2:last');
238 235
 				$li.find('.fnSpplyNm').text(item.spplyNm);
239 236
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
240 237
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -298,7 +295,7 @@ let mobPopObj = {
298 295
 			this.rows = gridRows;
299 296
 			$.each(gridRows, function (i, item) {
300 297
 				$('#ITP_LIST_MPOMNG04010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY').html());
301
-				var $li = $('#ITP_LIST_MPOMNG04010_POP_WHS_AREA .panel-group > .list-row:last');
298
+				var $li = $('#ITP_LIST_MPOMNG04010_POP_WHS_AREA .panel-group > .row_2:last');
302 299
 				$li.find('.fnWhsNm').text(item.whsNm);
303 300
 				$li.find('.fnLocationNm').text(item.locationNm);
304 301
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

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

@@ -35,8 +35,9 @@ let mobPageObj = {
35 35
 			});
36 36
 
37 37
 			// 조회일자 지정
38
-			$('#ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
39
-			$('#ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
38
+			$('#ITP_MOBILE_MPOMNG05010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
+			$('#ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
40
+			$('#ITP_FORM_MPOMNG05010_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'));
@@ -180,7 +181,7 @@ let mobPopObj = {
180 181
 			this.rows = gridRows;
181 182
 			$.each(gridRows, function (i, item) {
182 183
 				$('#ITP_POP_MPOMNG05010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY').html());
183
-				var $li = $('#ITP_POP_MPOMNG05010_LIST_SPPLY_AREA .panel-group > .list-row:last');
184
+				var $li = $('#ITP_POP_MPOMNG05010_LIST_SPPLY_AREA .panel-group > .row_2:last');
184 185
 				$li.find('.fnSpplyNm').text(item.spplyNm);
185 186
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
186 187
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -244,7 +245,7 @@ let mobPopObj = {
244 245
 			this.rows = gridRows;
245 246
 			$.each(gridRows, function (i, item) {
246 247
 				$('#ITP_LIST_MPOMNG05010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY').html());
247
-				var $li = $('#ITP_LIST_MPOMNG05010_POP_WHS_AREA .panel-group > .list-row:last');
248
+				var $li = $('#ITP_LIST_MPOMNG05010_POP_WHS_AREA .panel-group > .row_2:last');
248 249
 				$li.find('.fnWhsNm').text(item.whsNm);
249 250
 				$li.find('.fnLocationNm').text(item.locationNm);
250 251
 				$li.find('.fnWhsId').data('whs-id', item.whsId);