Selaa lähdekoodia

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

yhl88 2 vuotta sitten
vanhempi
commit
bd2462c25e
35 muutettua tiedostoa jossa 273 lisäystä ja 397 poistoa
  1. 2 196
      src/main/webapp/mobile/app/main.html
  2. 1 1
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html
  3. 1 1
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html
  4. 3 3
      src/main/webapp/mobile/app/mloanmng/MLOANMNG01010.html
  5. 10 10
      src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html
  6. 2 2
      src/main/webapp/mobile/app/mloanmng/MLOANMNG03010.html
  7. 1 1
      src/main/webapp/mobile/app/mpomng/MPOMNG01010.html
  8. 1 0
      src/main/webapp/mobile/app/mpomng/MPOMNG02010.html
  9. 7 7
      src/main/webapp/mobile/app/mpomng/MPOMNG04010.html
  10. 3 3
      src/main/webapp/mobile/app/mpomng/MPOMNG05010.html
  11. 6 6
      src/main/webapp/mobile/app/mpomng/MPOMNG07010.html
  12. 6 6
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html
  13. 13 13
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html
  14. 3 3
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html
  15. 5 5
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html
  16. 1 1
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html
  17. 2 2
      src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html
  18. 1 1
      src/main/webapp/mobile/app/mstockmng/MSTOCKMNG02010.html
  19. 38 40
      src/main/webapp/mobile/css/style.css
  20. 2 2
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js
  21. 3 3
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js
  22. 3 3
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js
  23. 4 0
      src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js
  24. 2 2
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG01010.js
  25. 3 3
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js
  26. 2 2
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js
  27. 3 1
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js
  28. 60 21
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js
  29. 3 3
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG04010.js
  30. 3 3
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG05010.js
  31. 1 1
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG07010.js
  32. 2 2
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js
  33. 73 48
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js
  34. 1 1
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js
  35. 2 1
      src/main/webapp/mobile/js/config.js

+ 2 - 196
src/main/webapp/mobile/app/main.html

@@ -29,7 +29,7 @@
29 29
 	<header>
30 30
 		<div class="header_wrap">
31 31
 			<div class="menu_logo">
32
-				<button id="ITP_MOBILE_BTN_MENU"><img src="../img/menu.png" alt=""></button>
32
+				<button id="ITP_MOBILE_BTN_MENU" style="margin-left:20px;"><img src="../img/menu.png" alt=""></button>
33 33
 				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
34 34
 			</div>
35 35
 			<div class="name_info">
@@ -104,201 +104,7 @@
104 104
 
105 105
 	<div id="ITP_CONTAINER" class="fix">
106 106
 		<div class="itp_mobile_contents">
107
-<section id="ITP_MOBILE_MRTNMNG01010">
108
-	<div id="ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER">
109
-		<form id="ITP_FORM_MRTNMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
110
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
111
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_BRAND_ID" name="brandId" value="">
112
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_STORE_ID" name="storeId" value="">
113
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_DVSN" name="whsDvsn" value="">
114
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
115
-			<div class="content">
116
-				<div class="line header">
117
-					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
118
-		      	</div>
119
-				<div class="line">
120
-					<label>반품요청일</label>
121
-					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
122
-				</div>
123
-				<div class="line">
124
-					<label>반품요청금액</label>
125
-					<div class="line_right">
126
-						<div class="fnRtnReqAmt">0원</div>
127
-					</div>
128
-				</div>
129
-				<div class="line">
130
-					<label>빈품장소</label>
131
-					<div class="float_left">
132
-						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" placeholder="" readonly />
133
-						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
134
-						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_LOCATION" class="form-control itp_input" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" name="rtnLocation" value="" />
135
-       					<div class="itp_input_btn">
136
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
137
-						</div>
138
-					</div>
139
-					<div class="float_right_btn">
140
-						<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
141
-					</div>
142
-				</div>
143
-				<div class="table_header">
144
-					<h1><빈품 품목></h1>
145
-					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
146
-					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
147
-				</div>
148
-			</div>
149
-			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-7">
150
-				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
151
-				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
152
-					<li class="list-row">
153
-						<div class="left_info">
154
-			              <div class="check_box">
155
-			                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
156
-			              </div>
157
-			              <div class="thick">
158
-			              	<label>품목명</label>
159
-			                <span>:</span>
160
-			                <div class="itp_item fnItemNm">품목명</div>
161
-			              </div>
162
-			              <div class="thick">
163
-			              	<label>구매가</label>
164
-			                <span>:</span>
165
-			                <div class="itp_amt fnUnitAmt"></div>
166
-			              </div>
167
-			            </div>
168
-						<div class="right">
169
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
170
-							<div class="num fnPchReqQty">1</div>
171
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
172
-						</div>
173
-					</li>
174
-				</div>
175
-			</div>
176
-			<div class="button_bar">
177
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-orange REQ">빈품요청</button>
178
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
179
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
180
-			</div>
181
-		</form>
182
-	</div>
183
-	<div id="ITP_MOBILE_JS"></div>
184
-	<div id="ITP_POP_MRTNMNG01010_RTN_AREA" class="popup mobile-pop-close" style="display: none;">
185
-		<div class="pop short">
186
-			<div class="pop_line">
187
-            	<div class="itp_label_area">
188
-					<label>반품요청일</label>
189
-				</div>
190
-	            <div class="itp_info_area">
191
-					<div class="fnRtnReqDt"></div>
192
-				</div>
193
-			</div>
194
-			<div class="pop_line">
195
-				<div class="itp_label_area">
196
-					<label>품목수</label>
197
-				</div>
198
-				<div class="itp_info_area">
199
-					<div class="fnItemQty"></div>
200
-				</div>
201
-			</div>
202
-			<div class="pop_line border">
203
-				<div class="itp_label_area">
204
-					<label>반품금액</label>
205
-				</div>
206
-				<div class="itp_info_area">
207
-					<div class="fnRtnAmt"></div>
208
-				</div>
209
-			</div>
210
-			<label class="pop_label msg_save">요청 하시겠습니까?</label>
211
-			<div class="popup_btn">
212
-				<button id="ITP_BTN_MRTNMNG01010_POP_RTN_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
213
-				<button id="ITP_BTN_MRTNMNG01010_POP_RTN_CONFIRM" class="ok btn-primary COK">확인</button>
214
-			</div>
215
-		</div>
216
-	</div>
217
-	<div id="ITP_POP_MRTNMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
218
-		<div class="pop">
219
-			<div class="header">
220
-				<div class="header_left">
221
-					<label>반품장소</label>
222
-				</div>
223
-				<div class="header_right">
224
-					<button type="button" id="ITP_BTN_MRTNMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
225
-				</div>
226
-			</div>
227
-			<div class="search_bar">
228
-				<form id="ITP_FORM_MRTNMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
229
-					<input type="hidden" id="ITP_FORM_MRTNMNG01010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
230
-					<input type="hidden" id="ITP_FORM_MRTNMNG01010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
231
-					<input id="ITP_FORM_MRTNMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
232
-					<button id="ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
233
-				</form>
234
-			</div>
235
-			<div class="select_btn">
236
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 <img src="../img/arrow_down.png"></button>
237
-			</div>
238
-			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
239
-				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
240
-				<div id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY" style="display: none;">
241
-					<li class="row_2">
242
-						<div class="scroll_left">
243
-							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
244
-							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
245
-							
246
-						</div>
247
-						<div class="scroll_right">
248
-							<button id="ITP_BTN_MRTNMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
249
-						</div>
250
-					</li>
251
-				</div>
252
-			</div>
253
-		</div>
254
-	</div>
255
-	<div id="ITP_POP_MRTNMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
256
-		<div class="pop">
257
-			<div class="header">
258
-				<div class="header_left">
259
-					<label>품목 검색</label>
260
-				</div>
261
-				<div class="header_right">
262
-					<button type="button" id="ITP_BTN_MRTNMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
263
-				</div>
264
-			</div>
265
-			<form id="ITP_FORM_MRTNMNG01010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
266
-				<input type="hidden" id="ITP_FORM_MRTNMNG01010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
267
-				<input type="hidden" id="ITP_FORM_MRTNMNG01010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
268
-				<div class="search_bar">
269
-					<input id="ITP_FORM_MRTNMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
270
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
271
-				</div>
272
-				<div class="select_btn">
273
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
274
-				</div>
275
-			</form>
276
-			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
277
-				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
278
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
279
-					<li class="row_2">
280
-						 <div class="scroll_left">
281
-                            <div class="fnItemNm">품목명</div>
282
-                            <div class="mg_0">
283
-				                 <div class="sub fnKg">12,000,000</div>
284
-				                 <div class="type_hide">/</div>
285
-				                 <div class="amt fnUnitAmt">12,000,000</div>
286
-			                 </div>
287
-                        </div>
288
-                        <div class="scroll_right">
289
-                            <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
290
-                        </div>
291
-						<div class="right">
292
-							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
293
-							<div class="num fnPchReqQty">1</div>
294
-							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
295
-						</div>
296
-					</li>
297
-				</div>
298
-			</div>
299
-		</div>
300
-	</div>
301
-</section>
107
+
302 108
 		</div>
303 109
 	</div>
304 110
 	<footer id="ITP_FOOTER">

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

@@ -43,7 +43,7 @@
43 43
 		  </div>
44 44
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
45 45
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
46
-			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
46
+			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
47 47
 				<li class="history_list3 list-row">
48 48
 				  <div class="scroll_btn">
49 49
 			  		<input type="checkbox" id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX">

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

@@ -44,7 +44,7 @@
44 44
 		  </div>
45 45
 		  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
46 46
 			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
47
-			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
47
+			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
48 48
 				<li class="history_list3 list-row">
49 49
 				  <div class="scroll_btn">
50 50
 			  		<input type="checkbox" id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX">

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

@@ -46,7 +46,7 @@
46 46
 		  </div>
47 47
 	   <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
48 48
 		  <ul id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
49
-			  <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWCOPY" style="display: block;">
49
+			  <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
50 50
 				<li class="history_list">
51 51
 				  <div class="left">
52 52
 					<div class="nomal">
@@ -158,7 +158,7 @@
158 158
 		  </div>
159 159
 			<div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_AREA" class="scroll_area row-11">
160 160
 			 <ul id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
161
-			  <div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWCOPY" style="display: block;">
161
+			  <div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWCOPY" style="display: none;">
162 162
 				<li class="history_list6">
163 163
 				  <div>
164 164
 					<div class="detail_line">
@@ -230,7 +230,7 @@
230 230
 			</div>
231 231
 			<div id="ITP_LIST_MLOANMNG01010_POP_STORE_AREA" class="popup_scroll">
232 232
 				<ul id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
233
-				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: block;">
233
+				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: none;">
234 234
 					<li class="row_2">
235 235
 						<div class="scroll_left">
236 236
 							<div class="con_2 fnStoreNm"></div>

+ 10 - 10
src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -49,7 +49,7 @@
49 49
 		  </div>
50 50
 			<div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA" class="scroll_area row-12">
51 51
 			  <ul id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
52
-			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
52
+			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
53 53
 				<li class="history_list4">
54 54
 				  <div class="button_right btn-dpst" style="display: gird;"><!-- display:gird 로 해야 정상으로 보임 -->
55 55
 					<button id="ITP_BTN_MLOANMNG02010_LIST_AGREE" class="btn-primary AGR">승인</button>
@@ -170,7 +170,7 @@
170 170
 						<label>휴대전화번호 *</label>
171 171
 					</div>
172 172
 					<div class="list_info" style="padding-top:8px;">
173
-						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_TEL" name="ordTel" value="010-2329-8816" type="text" data-check-required="empty" data-key-up="number">
173
+						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_TEL" name="ordTel" type="text" data-check-required="empty" data-key-up="number">
174 174
 					</div>
175 175
 				</div>
176 176
 				<div class="list_line border">
@@ -226,7 +226,7 @@
226 226
 			</div>
227 227
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
228 228
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
229
-				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: block;">
229
+				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: none;">
230 230
 					<li class="row_2">
231 231
 						<div class="scroll_left">
232 232
 							<div class="con_2 fnStoreNm"></div>
@@ -257,37 +257,37 @@
257 257
 					<div class="line mt_5">
258 258
 						<label>브랜드명</label>
259 259
 						<div class="search_wrap itp_ip">
260
-							<input id="ITP_FORM_MLOANMNG02010_POP_BRAND_NM" name="brandNm" data-check-required="empty" type="text" placeholder="A 브랜드명" readonly>
260
+							<input id="ITP_FORM_MLOANMNG02010_POP_BRAND_NM" name="brandNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="브랜드명" type="text" placeholder="A 브랜드명" readonly>
261 261
 						</div>
262 262
 					</div>
263 263
 					<div class="line mt_5">
264 264
 						<label>매장명</label>
265 265
 						<div class="search_wrap itp_ip">
266
-							<input id="ITP_FORM_MLOANMNG02010_POP_STORE_NM" name="storeNm" data-check-required="empty" type="text" placeholder="A매장명" readonly>
266
+							<input id="ITP_FORM_MLOANMNG02010_POP_STORE_NM" name="storeNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="매장명" type="text" placeholder="A매장명" readonly>
267 267
 						</div>
268 268
 					</div>
269 269
 					<div class="line mt_5">
270 270
 						<label>입금금액</label>
271 271
 						<div class="search_wrap itp_ip">
272
-							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_AMT" name="dpstAmt" data-check-required="empty" type="text" >
272
+							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_AMT" name="dpstAmt" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금금액" type="text" >
273 273
 						</div>
274 274
 					</div>
275 275
 					<div class="line mt_5">
276 276
 						<label>입금일자</label>
277 277
 						<div class="search_wrap itp_ip">
278
-							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_DT" name="dpstDt" data-check-required="empty" type="date">
278
+							<input type="text" id="ITP_FORM_MLOANMNG02010_POP_DPST_DT" name="dpstDt" class="itp_input date" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금일자">
279 279
 						</div>
280 280
 					</div>
281 281
 					<div class="line mt_5">
282 282
 						<label>입금자명</label>
283 283
 						<div class="search_wrap">
284
-							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_NM" name="dpstNm" data-check-required="empty" type="text" >
284
+							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_NM" name="dpstNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금자명" type="text" >
285 285
 						</div>
286 286
 					</div>
287 287
 					<div class="line mt_5">
288 288
 						<label>입금은행</label>
289 289
 						<div class="search_wrap itp_ip">
290
-							<select name="dpstBnkCd" id="ITP_FORM_MLOANMNG02010_POP_DPST_BNK" data-select-code="BNK_CD" data-check-required="empty" >
290
+							<select name="dpstBnkCd" id="ITP_FORM_MLOANMNG02010_POP_DPST_BNK" data-select-code="BNK_CD" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금은행">
291 291
 								<option value="">은행코드 선택</option>
292 292
 							</select>
293 293
 						</div>
@@ -295,7 +295,7 @@
295 295
 					<div class="line mt_5" style="height:70px;">
296 296
 						<label>입금계좌번호</label>
297 297
 						<div class="search_wrap itp_ip">
298
-							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_ACCT_NO" name="rcvAcctNo" data-check-required="empty" type="text" >
298
+							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_ACCT_NO" name="rcvAcctNo" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금계좌번호" type="text" >
299 299
 						</div>
300 300
 					</div>
301 301
 					<div class="line">

+ 2 - 2
src/main/webapp/mobile/app/mloanmng/MLOANMNG03010.html

@@ -167,7 +167,7 @@
167 167
 		  </div>
168 168
 		  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
169 169
 			  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
170
-			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
170
+			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
171 171
 				<li class="history_list2 list-row">
172 172
 				  <div>
173 173
 					<div class="left">
@@ -359,7 +359,7 @@
359 359
 			</div>
360 360
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
361 361
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
362
-				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: block;">
362
+				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: none;">
363 363
 					<li class="row_2">
364 364
 						<div class="scroll_left">
365 365
 							<div class="con_2 fnStoreNm"></div>

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

@@ -171,7 +171,7 @@
171 171
                             <div class="con_2 sub fnLocationNm"></div>
172 172
                         </div>
173 173
                         <div class="scroll_right">
174
-                            <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
174
+                            <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="" data-location="">선택</button>
175 175
                         </div>
176 176
                     </li>
177 177
                 </div>

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

@@ -171,6 +171,7 @@
171 171
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN" name="pchReqDvsn" value="">
172 172
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
173 173
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
174
+      <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_MGR_ID" name="pchReqMgrId" value="">
174 175
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_MALL_ID" name="mallId" value="">
175 176
       <div class="content">
176 177
       	<div class="line header">

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

@@ -61,7 +61,7 @@
61 61
 		  </div>
62 62
 		<div id="ITP_LIST_MPOMNG04010_LIST_ITEM_AREA" class="scroll_area row-4">
63 63
 		  <ul id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
64
-			  <div id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY" style="display: block;">
64
+			  <div id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
65 65
 				<li class="list-row2">
66 66
 				  <div class="left">
67 67
 					<div class="nomal">
@@ -151,7 +151,7 @@
151 151
 		  </div>
152 152
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
153 153
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
154
-			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: block;">
154
+			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
155 155
 				<li class="list-row2">
156 156
 				  <div class="left">
157 157
 					<div class="nomal">
@@ -223,7 +223,7 @@
223 223
 			</div>
224 224
 			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
225 225
 				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
226
-				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: block;">
226
+				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: none;">
227 227
 					<li class="row_2">
228 228
 						<div class="scroll_left">
229 229
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
@@ -237,7 +237,7 @@
237 237
 			</div>
238 238
 		</div>
239 239
 	</div>
240
-	<div id="ITP_POP_MPOMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
240
+	<div id="ITP_POP_MPOMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
241 241
 		<div class="pop">
242 242
 			<div class="header">
243 243
 				<div class="header_left">
@@ -260,11 +260,11 @@
260 260
 			</div>
261 261
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
262 262
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
263
-				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: block;">
263
+				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: none;">
264 264
 					<li class="row_2">
265 265
 						<div class="scroll_left">
266
-							<div class="con_2 fnWhsNm">asdfasfsad</div>
267
-							<div class="con_2 sub fnLocationNm">fasdfasd</div>
266
+							<div class="con_2 fnWhsNm"></div>
267
+							<div class="con_2 sub fnLocationNm"></div>
268 268
 						</div>
269 269
 						<div class="scroll_right">
270 270
 							<button id="ITP_BTN_MPOMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -73,7 +73,7 @@
73 73
 			</div>
74 74
 			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-5">
75 75
 				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
76
-				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
76
+				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
77 77
 					<li class="history_list2">
78 78
 						<div class="left">
79 79
 							<div class="nomal">
@@ -162,7 +162,7 @@
162 162
 			</div>
163 163
 		</div>
164 164
 	</div>
165
-	<div id="ITP_POP_MPOMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
165
+	<div id="ITP_POP_MPOMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
166 166
 		<div class="pop">
167 167
 			<div class="header">
168 168
 				<div class="header_left">
@@ -185,7 +185,7 @@
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 191
 							<div class="con_2 fnWhsNm"></div>

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

@@ -65,7 +65,7 @@
65 65
 	    </div>
66 66
       <div id="ITP_LIST_MPOMNG07010_LIST_ITEM_AREA" class="scroll_area row-6">
67 67
         <ul id="ITP_LIST_MPOMNG07010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
68
-        	<div id="ITP_LIST_MPOMNG07010_LIST_ITEM_ROWCOPY" style="display: block;">
68
+        	<div id="ITP_LIST_MPOMNG07010_LIST_ITEM_ROWCOPY" style="display: none;">
69 69
 		      <li class="history_list2">
70 70
 		        <div class="left">
71 71
 		          <div class="nomal">
@@ -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>
@@ -165,7 +165,7 @@
165 165
 			</div>
166 166
 		</div>
167 167
 	</div>
168
-	<div id="ITP_POP_MPOMNG07010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
168
+	<div id="ITP_POP_MPOMNG07010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
169 169
 		<div class="pop">
170 170
 			<div class="header">
171 171
 				<div class="header_left">
@@ -188,11 +188,11 @@
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
-							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
195
-							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
194
+							<div class="con_2 fnWhsNm"></div>
195
+							<div class="con_2 sub fnLocationNm"></div>
196 196
 						</div>
197 197
 						<div class="scroll_right">
198 198
 							<button id="ITP_BTN_MPOMNG07010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 6 - 6
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -10,18 +10,18 @@
10 10
 				<div class="line header">
11 11
 					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
12 12
 		      	</div>
13
-				<div class="line">
13
+				<div class="line mt5">
14 14
 					<label>반품요청일</label>
15 15
 					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
16 16
 				</div>
17 17
 				<div class="line">
18 18
 					<label>반품요청금액</label>
19
-					<div class="line_right">
20
-						<div class="fnRtnReqAmt">0원</div>
19
+					<div class="float_left">
20
+						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_AMT" name="rtnReqAmt" class="itp_input" data-check-required="empty" readonly>
21 21
 					</div>
22 22
 				</div>
23 23
 				<div class="line">
24
-					<label>품장소</label>
24
+					<label>품장소</label>
25 25
 					<div class="float_left">
26 26
 						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" placeholder="" readonly />
27 27
 						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
@@ -35,14 +35,14 @@
35 35
 					</div>
36 36
 				</div>
37 37
 				<div class="table_header">
38
-					<h1><품 품목></h1>
38
+					<h1><품 품목></h1>
39 39
 					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
40 40
 					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
41 41
 				</div>
42 42
 			</div>
43 43
 			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-7">
44 44
 				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
45
-				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
45
+				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
46 46
 					<li class="list-row">
47 47
 						<div class="left_info">
48 48
 			              <div class="check_box">

+ 13 - 13
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -48,7 +48,7 @@
48 48
 		</div>
49 49
 		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-8">
50 50
 			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
51
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
51
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: none;">
52 52
 				<li class="history_list5">
53 53
 					<div class="left">
54 54
 						<div class="nomal">
@@ -117,7 +117,7 @@
117 117
 		</div>
118 118
 		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-7">
119 119
 			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
120
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
120
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
121 121
 				<li class="list-row">
122 122
 					<div class="left_info">
123 123
 						<div class="thick">
@@ -141,7 +141,7 @@
141 141
 			<button id="ITP_BTN_MRTNMNG02010_DETAIL_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
142 142
 		</div>
143 143
 	</div>
144
-	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: block;">
144
+	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: none;">
145 145
 		<form id="ITP_FORM_MRTNMNG02010_MODIFY" class="form-horizontal" onsubmit="return false;">
146 146
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
147 147
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
@@ -156,7 +156,7 @@
156 156
 		      	</div>
157 157
 				<div class="line">
158 158
 					<label>반품요청일</label>
159
-					<input id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="date fnColReqDt" data-check-required="empty" type="date" placeholder="">
159
+					<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거요청일">
160 160
 				</div>
161 161
 				<div class="line">
162 162
 					<label>반품요청금액</label>
@@ -167,7 +167,7 @@
167 167
 				<div class="line">
168 168
 					<label>반품장소</label>
169 169
 					<div class="float_left">
170
-						<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
170
+						<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="반품장소" placeholder="매장명" readonly />
171 171
 						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
172 172
 						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
173 173
 						<div class="itp_input_btn">
@@ -186,7 +186,7 @@
186 186
 			</div>
187 187
 			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-7">
188 188
 				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
189
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: gird;"><!-- style="display: gird;" -->
189
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- style="display: gird;" -->
190 190
 					<li class="list-row">
191 191
 						<div class="left_info">
192 192
 							<div class="check_box"><!-- class 변경 -->
@@ -274,7 +274,7 @@
274 274
 			</div>
275 275
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
276 276
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
277
-				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: block;">
277
+				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: none;">
278 278
 					<li class="row_2">
279 279
 						<div class="scroll_left">
280 280
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
@@ -288,7 +288,7 @@
288 288
 			</div>
289 289
 		</div>
290 290
 	</div>
291
-	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
291
+	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
292 292
 		<div class="pop">
293 293
 			<div class="header">
294 294
 				<div class="header_left">
@@ -311,22 +311,22 @@
311 311
 			</form>
312 312
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
313 313
 				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
314
-				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
314
+				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: none;">
315 315
 					<li class="row_2">
316 316
 						 <div class="scroll_left">
317 317
                             <div class="fnItemNm">fdssfd</div>
318 318
                             <div class="mg_0">
319
-				                 <div class="sub fnKg">12,000,000</div>
319
+				                 <div class="sub fnKg"></div>
320 320
 				                 <div class="type_hide">/</div>
321
-				                 <div class="amt fnUnitAmt">12,000,000</div>
321
+				                 <div class="amt fnUnitAmt"></div>
322 322
 			                 </div>
323 323
                         </div>
324 324
                         <div class="scroll_right">
325
-                            <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
325
+                            <button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
326 326
                         </div>
327 327
 						<div class="right">
328 328
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
329
-							<div class="num fnPchReqQty">1</div>
329
+							<div class="num fnRtnQty">1</div>
330 330
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
331 331
 						</div>
332 332
 					</li>

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

@@ -22,7 +22,7 @@
22 22
 			</div>
23 23
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
24 24
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
25
-				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display: block;">
25
+				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:;">
26 26
 					<li class="list-row row_2">
27 27
 						<div class="scroll_left">
28 28
 							<div class="con_2 fnWhsNm"></div>
@@ -98,7 +98,7 @@
98 98
 			</div>
99 99
 			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-9">
100 100
 				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
101
-				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: block;">
101
+				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
102 102
 					<li class="history_list7">
103 103
 						<div class="left">
104 104
 							<div class="nomal">
@@ -181,7 +181,7 @@
181 181
 			</div>
182 182
 			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3">
183 183
 				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
184
-				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: block;">
184
+				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
185 185
 					<li class="history_list5">
186 186
 					  <div class="left">
187 187
 						<div class="nomal">

+ 5 - 5
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -22,7 +22,7 @@
22 22
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
23 23
 					</div>
24 24
 				</div>
25
-				<div class="line top3">
25
+				<div class="line">
26 26
 					<label>반품입고장소</label>
27 27
 					<div class="float_left">
28 28
 						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
@@ -35,7 +35,7 @@
35 35
 						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
36 36
 					</div>
37 37
 				</div>
38
-				<div class="line top6">
38
+				<div class="line">
39 39
 					<label>반품장소</label>
40 40
 					<div class="float_left">
41 41
 						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
@@ -48,7 +48,7 @@
48 48
 						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
49 49
 					</div>
50 50
 				</div>
51
-				<div class="line top9">
51
+				<div class="line">
52 52
 					<label>반품품목명</label>
53 53
 					<div class="float_left name">
54 54
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
@@ -134,7 +134,7 @@
134 134
 		</form>
135 135
 	</div>
136 136
 	<div id="ITP_MOBILE_JS"></div>
137
-	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
137
+	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
138 138
 		<div class="pop">
139 139
 			<div class="header">
140 140
 				<div class="header_left">
@@ -157,7 +157,7 @@
157 157
 			</div>
158 158
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
159 159
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
160
-				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: block;">
160
+				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: none;">
161 161
 					<li class="list-row row_2">
162 162
 						<div class="scroll_left">
163 163
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>

+ 1 - 1
src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html

@@ -65,7 +65,7 @@
65 65
 			</div>
66 66
 			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-6">
67 67
 				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
68
-				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
68
+				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
69 69
 					<li class="history_list2 ">
70 70
 						<div class="left">
71 71
 							<div class="nomal">

+ 2 - 2
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -45,7 +45,7 @@
45 45
 		  </div>
46 46
 			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-12">
47 47
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
48
-			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
48
+			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
49 49
 				<li class="history_list2 list-row">
50 50
 				  <div>
51 51
 					<div class="left">
@@ -143,7 +143,7 @@
143 143
 			</div>
144 144
 			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
145 145
 				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
146
-				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: block;">
146
+				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: none;">
147 147
 					<li class="row_2">
148 148
 						<div class="scroll_left">
149 149
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>

+ 1 - 1
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG02010.html

@@ -49,7 +49,7 @@
49 49
 		  </div>
50 50
 			<div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA" class="scroll_area row-4">
51 51
 			  <ul id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
52
-			  <div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY" style="display: grid;"> <!-- display:gird -->
52
+			  <div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY" style="display: none;"> <!-- display:gird -->
53 53
 				<li class="history_list5 list-row">
54 54
 				  <div>
55 55
 					<div class="left">

+ 38 - 40
src/main/webapp/mobile/css/style.css

@@ -4,7 +4,7 @@
4 4
     font-weight: normal;
5 5
     font-style: normal;
6 6
 }
7
-* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
7
+* {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
8 8
 section {}
9 9
 body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'GmarketSansMedium';
10 10
 	overflow:scroll-y; 
@@ -12,7 +12,7 @@ body{background: #fff; position: relative; width: 100%; height: auto; font-famil
12 12
 body .login {position:fixed;}
13 13
 .color-gray {color:#aaa;}
14 14
 /* 팝업 */
15
-section .popup {position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
15
+section .popup {position: absolute; top:0; width: 100%; height: 100%; background: transparent; z-index: 11;}
16 16
 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;}
17 17
 section .popup .pop.short {height:260px;}
18 18
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
@@ -29,7 +29,7 @@ section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #0
29 29
 section .popup .pop .popup_btn button.cancel {width: 36%;}
30 30
 
31 31
 
32
-section .popup2 {position: fixed; width: 100%; height: 100%; background: rgba(200, 200,200, 0.8); z-index: 11;}
32
+section .popup2 {position: absolute; top:0; width: 100%; height: 100vh; background: rgba(200, 200,200, 0.8); z-index: 11;}
33 33
 section .popup2 .content {position: fixed; z-index: 10; width:100%; background: #fff;}
34 34
 section .popup2 .barcode {width: 100%;}
35 35
 section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; background: #fff; border: 1px solid #000; margin-top: 10%;}
@@ -126,7 +126,7 @@ section .popup2 .content .line.mt_5 {margin-top:5px;}
126 126
 section .popup2 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
127 127
 
128 128
 
129
-section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
129
+section .popup3 {position: absolute; top:0;width: 100%; height: 100vh; background: transparent; z-index: 11;}
130 130
 section .popup3 .content {position: fixed; z-index: 10; width:100%; height:596px; background: #fff;}
131 131
 section .popup3 .content label{width:120px; margin-top:7px;}
132 132
 section .popup3 .content div{font-weight:100;}
@@ -225,7 +225,7 @@ body.eee {height: 700px; background: #eee;}
225 225
 .main .wicon .icon_left {float: left;}
226 226
 
227 227
 
228
-input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:5px; height: 27px;text-align: left; padding:0 10px;}
228
+input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 34px;text-align: left; padding:0 10px;}
229 229
 input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
230 230
 
231 231
 select {border: 1px solid #aaa; border-radius:5px; height: 35px; font-size: 12px; text-align: left; padding:0 15px;}
@@ -233,19 +233,20 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
233 233
 
234 234
 /* 공통화면 */
235 235
 
236
-#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 45px;background-color:#F7B014;align-items: center; z-index: 11;}
237
-#ITP_WRAPPER header .header_wrap {width: 100%; height: 55px; margin: 0 auto; display: inline-flex;}
238
-#ITP_WRAPPER header .header_wrap .menu_logo {width:80px; height:45px;}
239
-#ITP_WRAPPER header .header_wrap .menu_logo button {width: 40px; height: 40px; float: left; padding: 0; background: transparent; border: none; margin-top: 2px;}
240
-#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 25px; height: 20px; margin: 0; border-radius: 0; border: none;}
236
+#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 49px;background-color:#F7B014;align-items: center; z-index: 11;}
237
+#ITP_WRAPPER header .header_wrap {width: 100%; height: 49px; margin: 0 auto; display: inline-flex;}
238
+#ITP_WRAPPER header .header_wrap .menu_logo {width:80px; height:49px;}
239
+#ITP_WRAPPER header .header_wrap .menu_logo button {width: 22px; height: 18px; float: left; padding: 0; background: transparent; border: none; margin-left:10px; margin-top: 14px;}
240
+#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 22px; height: 18px; margin: 0; border-radius: 0; border: none;}
241 241
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
242 242
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
243
-#ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 125px); height:45px; display:inline-flex;}
244
-#ITP_WRAPPER header .header_wrap .name_info div {width: 100%; font-size: 14px; color:#eee; margin-top:14px;}
243
+#ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 120px); height:49px; display:inline-flex;}
244
+#ITP_WRAPPER header .header_wrap .name_info .bn {text-overflow:ellipsis; padding-top:0; text-align:right; width:115%; font-size:18px;}
245
+#ITP_WRAPPER header .header_wrap .name_info div {text-overflow:ellipsis; padding-left:3px; padding-top:2px; text-align:left; width: 85%; font-size: 15px; color:#fff; margin-top:14px;}
245 246
 
246
-#ITP_WRAPPER header .header_wrap .logout {float: right; width: 45px;}
247
-#ITP_WRAPPER header .header_wrap .logout button {margin: -3px; width: 45px; height: 45px; border:none; font-size: 0.8rem;background: transparent;}
248
-#ITP_WRAPPER header .header_wrap .logout button img {width:22px;}
247
+#ITP_WRAPPER header .header_wrap .logout {float: right; width: 40px;}
248
+#ITP_WRAPPER header .header_wrap .logout button {margin-top: 15px; margin-right:20px; padding:0; width: 20px; height: 20px; border:none; font-size: 0.8rem;background: transparent;}
249
+#ITP_WRAPPER header .header_wrap .logout button img {width:17px; height:18px;}
249 250
 
250 251
 /* 메뉴바 */
251 252
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
@@ -305,8 +306,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
305 306
 }
306 307
 .content {position:relative; z-index: 10; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
307 308
 .content .header {width:100% !important; margin:0 !important;}
308
-.content .line {position: relative; display: inline-block; width: 90%; margin:0 5%; height: 28px; margin-bottom: -10px;}
309
-.content .line.top3 {top:3px;}
309
+.content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 40px; margin-bottom: -10px;}
310
+.content .line.mt5 {margin-top:5px;}
310 311
 .content .line.top6 {top:6px;}
311 312
 .content .line.top9 {top:9px;}
312 313
 .content .line.top12 {top:12px;}
@@ -315,23 +316,23 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
315 316
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
316 317
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
317 318
 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
318
-.content .line div.itp_search_header {font-weight:100;padding:5px 10px 0px 9px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14px;}
319
+.content .line div.itp_search_header {height:40px; font-weight:100;padding:11px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
319 320
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
320
-.content .line label {min-width:92px; color:#898989; font-size: 14px; margin-left: 10px; float: left; text-align: left; margin-top: 7px; font-weight:100;}
321
+.content .line label {min-width:125px; color:#898989; font-size: 14pt; float: left; text-align: left; margin-top: 9px; font-weight:100;}
321 322
 .content .line label.pay_label {margin:20px 1%; width:98%;}
322 323
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
323 324
 .content .line .itp_label_select {padding:0;width:98px; height:27px; color:#666; font-size: 14px; float: left;  margin:0 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
324
-.content .line .float_left {float: left; margin-top:2px; width:55%;}
325
+.content .line .float_left {float: left; margin-top:2px; width:168px;;}
325 326
 .content .line .float_left.name {width:60%;}
326
-.content .line .float_left button {float:right; left:-5px; position:relative; background:transparent; border:none; width:27px; height:27px; padding:0;} 
327
+.content .line .float_left button {float:right; left:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
327 328
 .content .line .float_left button img {width:18px;}
328
-.content .line .float_left input {width:100%; font-size:14px;}
329
+.content .line .float_left input {width:100%; font-size:14pt;}
329 330
 .content .line .float_left.note {width: 100%; padding: 10px;}
330 331
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
331 332
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
332
-.content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:55%;}
333
+.content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
333 334
 .content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
334
-.content .line .float_right_btn button {padding:0; width:27px; height:27px; border-radius:5px; border:1px solid #aaa;}
335
+.content .line .float_right_btn button {padding:0; width:34px; height:34px; border-radius:5px; border:1px solid #aaa;}
335 336
 .content .line .float_right_btn button img {width:18px; height:18px;}
336 337
 .content .line .float_left select {float: left; width: 100%; height: 27px; border: 1px solid #aaa; border-radius:5px; font-size: 14px;}
337 338
 .content .line .line_right {font-size: 2rem; float: left; margin-right: 0%; width:57%}
@@ -342,7 +343,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
342 343
 .content .line .line_right input.mg0 {margin-right:10px;}
343 344
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
344 345
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
345
-.content .line input.date {width: 55%; height: 27px; float: left; text-align:center; font-size:14px;}
346
+.content .line input.date {width: 168px; height: 34px; float: left; text-align:center; font-size:14pt; background: url(../img/calender.png) 95%/18px no-repeat white}
346 347
 .content .line input.full {width: 100%;}
347 348
 .content .line div.date_to {display:flex; width:60%; height:27px; float: left; margin-right:0px;}
348 349
 .content .line div.date_to input {font-weight:100; width:47%; height:27px; font-size:14px; margin:0;}
@@ -361,9 +362,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
361 362
 .content .list_line .mail input {width:30%;}
362 363
 .content .list_line .mail select {width:30%; height:27px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
363 364
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:15px;}
364
-.content .table_header {margin-top: 10px; width: 100%; height: 36px;}
365
-.content .table_header h1 {margin: 10px; font-size: 14px; float: left; color: #000; font-weight: 100;}
366
-.content .table_header button {float: right; width: 72px; height:30px; font-size: 12px; font-weight: 100; padding:0px; margin: 5px 12px 5px 0; border-radius:15px;}
365
+.content .table_header {margin-top: 6px; width: 100%; height: 36px;}
366
+.content .table_header h1 {margin-left: 15px; margin-top:16px; font-size: 13px; float: left; color: #000; font-weight: 100;}
367
+.content .table_header button {float: right; width: 68px; height:26px; font-size: 12px; font-weight: 100; padding:0px; margin: 4px 12px 6px 0; border-radius:15px;}
367 368
 
368 369
 .detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
369 370
 .detail_content .detail_header {width: 100%; height: 80px; padding-top:65px}
@@ -395,8 +396,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
395 396
   font-size: 1.8rem;
396 397
 } */
397 398
 
398
-.button_bar {width: 100%; height: 40px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
399
-.button_bar button.col_3{float: left; height: 40px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
399
+.button_bar {width: 100%; height: 47px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
400
+.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
400 401
 .button_bar button.btn-gray {border-radius: 0px; background-color: #858076; color: #eee;}
401 402
 .button_bar button.btn-w-gray{border-radius: 0px; background-color: #b6b8b8; color: #eee;}
402 403
 .button_bar button.btn {height: 120px;}
@@ -420,7 +421,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
420 421
 .scroll_area .itp_non_data {margin:35% auto;}
421 422
 .scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
422 423
 
423
-.scroll_area li.list-row {display: inline-flex; height:60px;}
424
+.scroll_area li.list-row {display: inline-flex; height:76px;}
424 425
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
425 426
 
426 427
 .scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
@@ -498,8 +499,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
498 499
 .scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 15px;}
499 500
 .scroll_area li .left .nomal .col_5{min-width:50px;}
500 501
 
501
-.scroll_area li .right {margin: 12px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
502
-.scroll_area li .right .num {padding:8px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
502
+.scroll_area li .right {margin: 12px 10px 0 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
503
+.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
503 504
 .scroll_area li .right .fnnum {margin:10px 30px;}
504 505
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
505 506
 
@@ -535,20 +536,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
535 536
 #ITP_FOOTER .itp_modal .itp_form .itp_mip {padding: 8px 5px 4px 12px; height:42px; text-align: left; font-size: 16px; border:1px solid #ccc;}
536 537
 
537 538
 @media screen and (min-width: 550px) {
538
-	
539
-	.content .line input.date {width: 70%;}
540
-	.content .line input.full {width: 100%;}
541
-	
542 539
 	.content .line .line_right {width:80%}
543
-	.content .line .float_left .itp_input_btn {width:70%;}
544
-	.content .line .float_left {width:70%;}
545
-	.content .line div.date_to {width:70%;}
546 540
 	.content .line div.date_to input {width:47%}
547 541
 	.content .line .float_left.name {width:76%;}
548 542
 	.modal-dialog {margin:auto 20% !important;}
549 543
 	.scroll_area li .left_info .thick {width: 90%;}
550 544
 	.content .line .search_wrap input {width:78%;}
551 545
 	.content .line .search_wrap select {width:78%;}	
546
+	
547
+}
548
+@media screen and (min-width: 650px) {
549
+	.content .line {margin:-6px 140px; }
552 550
 }
553 551
 @media screen and (max-width: 380px) {
554 552
 	section .popup2 .barcode_area {width: 250px; height: 250px;}

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

@@ -34,7 +34,7 @@ let mobPageObj = {
34 34
 			});
35 35
 
36 36
 			// 조회일자 지정
37
-			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
37
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
38 38
 			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
39 39
 		},
40 40
 		info: function() {
@@ -234,7 +234,7 @@ let mobPopObj = {
234 234
 				_this.view(result.gridRows);
235 235
 			};
236 236
 			const param = $('#ITP_FORM_MCOLLMNG01010_POP_WHS').serializeObject();
237
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
237
+			param.swhsDvsn = 'W01';
238 238
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
239 239
 		},
240 240
 		view: function(gridRows) {

+ 3 - 3
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', 0));
39
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
38
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
39
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
40 40
 		},
41 41
 		info: function() {
42 42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -326,7 +326,7 @@ let mobPopObj = {
326 326
 				_this.view(result.gridRows);
327 327
 			};
328 328
 			const param = $('#ITP_FORM_MCOLLMNG02010_POP_WHS').serializeObject();
329
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
329
+			param.swhsDvsn = 'W01';
330 330
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
331 331
 		},
332 332
 		view: function(gridRows) {

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

@@ -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', 0));
38
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
37
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
38
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
39 39
 		},
40 40
 		info: function() {
41 41
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -276,7 +276,7 @@ let mobPopObj = {
276 276
 				_this.view(result.gridRows);
277 277
 			};
278 278
 			const param = $('#ITP_FORM_MCOLLMNG03010_POP_WHS').serializeObject();
279
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
279
+			param.swhsDvsn = 'W01';
280 280
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
281 281
 		},
282 282
 		view: function(gridRows) {

+ 4 - 0
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -44,6 +44,9 @@ let mobPageObj = {
44 44
 			$('#ITP_MOBILE_MLOANMNG02010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
45 45
 			$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
46 46
 			$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
47
+			$('#ITP_FORM_MLOANMNG02010_POP_DPST_DT').datepicker('setDate', itp_fn_date_add('M', 0));
48
+
49
+			fn_make_user_info.get('apprYn') === 'Y' ? $('#ITP_BTN_MLOANMNG02010_LIST_PAY').show() : $('#ITP_BTN_MLOANMNG02010_LIST_PAY').hide();
47 50
 
48 51
 			if(fn_make_user_info.get('authTpCd') === '50') {
49 52
 				$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM').val(fn_make_user_info.get('storeNm'));
@@ -193,6 +196,7 @@ let mobContentObj = {
193 196
 						dpstDt = item.dpstAuthDt;
194 197
 					}
195 198
 					$li.find('.fnDpstDt').text(dpstDt);
199
+					(fn_make_user_info.get('authTpCd') === '50') ? $li.find('.btn-dpst').hide() : $li.find('.btn-dpst').show();
196 200
 					_this.rows.push(item);
197 201
 				});
198 202
 			};

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

@@ -34,7 +34,7 @@ let mobPageObj = {
34 34
 			});
35 35
 
36 36
 			// 조회일자 지정
37
-			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
37
+			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
38 38
 			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
39 39
 		},
40 40
 		info: function() {
@@ -235,7 +235,7 @@ let mobPopObj = {
235 235
 				_this.view(result.gridRows);
236 236
 			};
237 237
 			const param = $('#ITP_FORM_MORDMNG01010_POP_WHS').serializeObject();
238
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
238
+			param.swhsDvsn = 'W01';
239 239
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
240 240
 		},
241 241
 		view: function(gridRows) {

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

@@ -40,8 +40,8 @@ let mobPageObj = {
40 40
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
41 41
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', new Date());
42 42
 
43
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
44
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
43
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
44
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
45 45
 		},
46 46
 		info: function() {
47 47
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -337,7 +337,7 @@ let mobPopObj = {
337 337
 				_this.view(result.gridRows);
338 338
 			};
339 339
 			const param = $('#ITP_FORM_MORDMNG02010_POP_WHS').serializeObject();
340
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
340
+			param.swhsDvsn = 'W01';
341 341
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
342 342
 		},
343 343
 		view: function(gridRows) {

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

@@ -34,7 +34,7 @@ let mobPageObj = {
34 34
 			});
35 35
 
36 36
 			// 조회일자 지정
37
-			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
37
+			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('D', -7));
38 38
 			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
39 39
 		},
40 40
 		info: function() {
@@ -279,7 +279,7 @@ let mobPopObj = {
279 279
 				_this.view(result.gridRows);
280 280
 			};
281 281
 			const param = $('#ITP_FORM_MORDMNG03010_POP_WHS').serializeObject();
282
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
282
+			param.swhsDvsn = 'W01';
283 283
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
284 284
 		},
285 285
 		view: function(gridRows) {

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

@@ -309,6 +309,7 @@ let mobPopObj = {
309 309
 					$li.find('.fnWhsNm').text(item.whsNm);
310 310
 					$li.find('.fnLocationNm').text(item.locationNm);
311 311
 					$li.find('.fnWhsId').data('whs-id', item.whsId);
312
+					$li.find('.fnWhsId').data('location', item.location);
312 313
 				});
313 314
 			};
314 315
 			const param = $('#ITP_FORM_MPOMNG01010_POP_WHS').serializeObject();
@@ -320,7 +321,7 @@ let mobPopObj = {
320 321
 			$('#ITP_LIST_MPOMNG01010_POP_WHS_AREA button[id$="POP_WHS_CHOICE"]').off('click').on('click', function() {
321 322
 				var whsId = $(this).data('whs-id');
322 323
 				var whsNm = $(this).parent().prev().find('.fnWhsNm').text();
323
-				var location = $(this).parent().prev().find('.fnLocationNm').text();
324
+				var location = $(this).data('location');
324 325
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_ID').val(whsId);
325 326
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_NM').val(whsNm);
326 327
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOCATION').val(location);
@@ -429,6 +430,7 @@ let mobPopObj = {
429 430
 					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
430 431
 					mobContObj.reset();
431 432
 				};
433
+				console.log(JSON.stringify(param));
432 434
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
433 435
 			};
434 436
 			if (this.saveMode === 1 || this.saveMode === 2 || this.saveMode === 3) {

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

@@ -151,13 +151,12 @@ let mobContentObj = {
151 151
 		init: function() {
152 152
 			mobPageObj.switchScreen(VIEW_MODE_LIST);
153 153
 			this.search();
154
-			this.action();
155 154
 		},
156 155
 		search: function() {
157 156
 			this.listPage = 0;
158 157
 			this.totPage = 0;
159 158
 			this.rows.length = 0;
160
-			$('#ITP_LIST_MPOMNG02010_LIST_ROWS').empty();
159
+			$('#ITP_LIST_MPOMNG02010_ITEM_ROWS').children().remove();
161 160
 			this.load();
162 161
 		},
163 162
 		load: function() {
@@ -179,6 +178,7 @@ let mobContentObj = {
179 178
 					$li.find('.fnPchReqRjctNm').text(item.pchReqRjctNm);
180 179
 					_this.rows.push(item);
181 180
 				});
181
+				_this.action();
182 182
 			};
183 183
 			var errFn = function() { _this.isSearch = false;};
184 184
 			const param = $('#ITP_FORM_MPOMNG02010_LIST_SEARCH').serializeObject();
@@ -266,6 +266,7 @@ let mobContentObj = {
266 266
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
267 267
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
268 268
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN').val(result.pchReqDvsn);
269
+			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_MGR_ID').val(result.pchReqMgrId);
269 270
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_MALL_ID').val(result.mallId);
270 271
 
271 272
 			$('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
@@ -288,7 +289,7 @@ let mobContentObj = {
288 289
 			},
289 290
 			attachRow: function (item) {
290 291
 				var _this = this;
291
-				var append = function() {
292
+				var append = function(isPush) {
292 293
 					$('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY').html());
293 294
 					var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .list-row:last');
294 295
 					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
@@ -297,14 +298,21 @@ let mobContentObj = {
297 298
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
298 299
 					$('.list-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
299 300
 					$('.list-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
300
-					_this.rows.push(item);
301
+					if(isPush) {
302
+						_this.rows.push(item);
303
+					}
301 304
 					_this.pchReqAmtTot();
302 305
 				};
303 306
 				var fnIsExist = function() {
304 307
 					var isExist = false;
305 308
 					$.each(_this.rows, function(i, row) {
306 309
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
307
-							itp_fn_modal_alert_ajax('이미 존재하는 품목입니다.');
310
+							if(row.viewCd === 'D') {
311
+								item.viewCd = 'U';
312
+								append(false);
313
+							} else {
314
+								itp_fn_modal_alert('이미 존재하는 품목입니다.');
315
+							}
308 316
 							isExist = true;
309 317
 							return false;
310 318
 						}
@@ -312,17 +320,27 @@ let mobContentObj = {
312 320
 					return isExist;
313 321
 				};
314 322
 				if(!fnIsExist(this.rows)) {
315
-					append();
323
+					append(true);
316 324
 				}
317 325
 			},
318 326
 			detachRow: function () {
319 327
 				if($('#ITP_LIST_MPOMNG02010_MODIFY_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
320 328
 					var _this = this;
321 329
 					$('#ITP_LIST_MPOMNG02010_MODIFY_ROWS li').each(function(index, elem) {
330
+						var __this = this;
322 331
 						var isChecked = $(this).find('input[type="checkbox"]').is(':checked');
323 332
 						if(isChecked) {
333
+							if(_this.rows[index].viewCd === 'U') {
334
+								_this.rows[index].viewCd = 'D';
335
+							} else {
336
+								$.each(_this.rows, function(i, row){
337
+									if(row.brandUnitUnqNo === $(__this).find('input[type="checkbox"]').val()) {
338
+										_this.rows.splice(i, 1);
339
+										return false;
340
+									}
341
+								});
342
+							}
324 343
 							$(this).remove();
325
-							_this.rows[index].viewCd = 'D';
326 344
 						}
327 345
 					});
328 346
 					this.pchReqAmtTot();
@@ -349,9 +367,11 @@ let mobContentObj = {
349 367
 			pchReqAmtTot: function() {
350 368
 				var reqAmt = 0;
351 369
 				$.each(this.rows, function(index, item) {
352
-					var qty = item.pchReqQty;
353
-					var amt = item.unitAmt;
354
-					reqAmt += Number(qty) * amt;
370
+					if(item.viewCd !== 'D') {
371
+						var qty = item.pchReqQty;
372
+						var amt = item.unitAmt;
373
+						reqAmt += Number(qty) * amt;
374
+					}
355 375
 				});
356 376
 				$('#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
357 377
 			}
@@ -437,6 +457,7 @@ let mobPopObj = {
437 457
 				actItemAdd: function(elem) {
438 458
 					var $li = $(elem).closest('li');
439 459
 					var item = mobPopObj.popItem.rows[$li.index()];
460
+					item['viewCd'] = 'C';
440 461
 					item['pchReqQty'] = $li.find('.fnPchReqQty').html();
441 462
 					mobContentObj.modify.list.attachRow(item);
442 463
 				}
@@ -465,14 +486,15 @@ let mobPopObj = {
465 486
 				_this.view(result.gridRows);
466 487
 			};
467 488
 			const param = $('#ITP_FORM_MPOMNG02010_POP_WHS').serializeObject();
468
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
489
+			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = (mobPageObj.viewMode === VIEW_MODE_LIST) ? '' : 'W01';
490
+			console.log(param);
469 491
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
470 492
 		},
471 493
 		view: function(gridRows) {
472 494
 			this.rows = gridRows;
473 495
 			$.each(gridRows, function (i, item) {
474 496
 				$('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY').html());
475
-				var $li = $('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group > .list-row:last');
497
+				var $li = $('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group > .row_2:last');
476 498
 				$li.find('.fnWhsId').data('whs-id', item.whsId);
477 499
 				$li.find('.fnWhsNm').text(item.whsNm);
478 500
 				$li.find('.fnLocationNm').text(item.locationNm);
@@ -525,6 +547,11 @@ let mobPopObj = {
525 547
 		pchReqStCd: '',
526 548
 		saveMode: 1, // 1 : 임시저장, 2 : 구매요청, 요청금액이 가능금액보다 클 경우 (3 : PG 정보 없음, 4 : 선불매장, 5 : 후불매장)
527 549
 		init: function (pchReqStCd) {
550
+			let mgrId = $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_MGR_ID').val();
551
+			if(mgrId !== fn_make_user_info.get('userId')) {
552
+				itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.ajax.diffWrite);
553
+				return;
554
+			}
528 555
 			this.formId = '#ITP_FORM_MPOMNG02010_MODIFY';
529 556
 			this.pchReqStCd = pchReqStCd;
530 557
 			mobPopObj.show(this.popId);
@@ -578,7 +605,7 @@ let mobPopObj = {
578 605
 				$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
579 606
 			}
580 607
 			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
581
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
608
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add($('#ITP_LIST_MPOMNG02010_MODIFY_ROWS').children().length, '개'));
582 609
 			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add(pchReqAmtTot));
583 610
 			$('#ITP_POP_MPOMNG02010_REQ_AREA .pop_msg').html(popMsg);
584 611
 		},
@@ -590,28 +617,40 @@ let mobPopObj = {
590 617
 			});
591 618
 		},
592 619
 		save: function() {
593
-			var procSave = function (rtnFn) {
620
+			var procSave = function (isReload) {
594 621
 				let param = $('#ITP_FORM_MPOMNG02010_MODIFY').serializeObject();
595
-				$.each(mobContentObj.modify.list.rows, function(index, item) {
596
-					item['viewCd'] = 'C';
622
+				var gridInsertData = [];
623
+				var gridUpdateData = [];
624
+				var gridDeleteData = [];
625
+				$.each(mobContentObj.modify.list.rows, function(i, item) {
626
+					if(item.viewCd === 'D') {
627
+						gridDeleteData.push(item);
628
+					} else if(item.viewCd === 'C') {
629
+						gridInsertData.push(item);
630
+					} else {
631
+						item.viewCd = 'U';
632
+						gridUpdateData.push(item);
633
+					}
597 634
 				});
598
-				param.gridInsertData = mobContentObj.modify.list.rows;
635
+				param.gridInsertData = gridInsertData;
636
+				param.gridUpdateData = gridUpdateData;
637
+				param.gridDeleteData = gridDeleteData;
599 638
 				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
600 639
 				var saveFn = function (result) {
601
-					console.log(result);
602 640
 					mobPopObj.hide('ITP_POP_MPOMNG02010_REQ_AREA');
603
-					if(typeof rtnFn === 'function') rtnFn();
641
+					if(isReload) mobContentObj.list.init();
604 642
 				};
643
+				console.log(param);
605 644
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
606 645
 			};
607 646
 			if (this.saveMode === 1 || this.saveMode === 2 || this.saveMode === 3) {
608 647
 				if(this.saveMode === 3)
609 648
 					$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
610
-				procSave();
649
+				procSave(true);
611 650
 			} else if (this.saveMode === 4 || this.saveMode === 5) {
612 651
 				// 결제 팝업 결과
613 652
 				var popFn = function(rowDataPop) {
614
-					procSave(mobContentObj.modify.cancel());
653
+					procSave(false);
615 654
 				};
616 655
 				// 결제 팝업
617 656
 				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text());

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

@@ -36,8 +36,8 @@ let mobPageObj = {
36 36
 
37 37
 			// 조회일자 지정
38 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));
39
+			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 1));
41 41
 
42 42
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
43 43
 			$('input:hidden[id$="_STORE_ID"]').val(fn_make_user_info.get('storeId'));
@@ -289,7 +289,7 @@ let mobPopObj = {
289 289
 				_this.view(result.gridRows);
290 290
 			};
291 291
 			const param = $('#ITP_FORM_MPOMNG04010_POP_WHS').serializeObject();
292
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
292
+			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = '';
293 293
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
294 294
 		},
295 295
 		view: function(gridRows) {

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

@@ -36,8 +36,8 @@ let mobPageObj = {
36 36
 
37 37
 			// 조회일자 지정
38 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));
39
+			$('#ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 1));
41 41
 		},
42 42
 		info: function() {
43 43
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -239,7 +239,7 @@ let mobPopObj = {
239 239
 				_this.view(result.gridRows);
240 240
 			};
241 241
 			const param = $('#ITP_FORM_MPOMNG05010_POP_WHS').serializeObject();
242
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
242
+			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = '';
243 243
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
244 244
 		},
245 245
 		view: function(gridRows) {

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

@@ -236,7 +236,7 @@ let mobPopObj = {
236 236
 				_this.view(result.gridRows);
237 237
 			};
238 238
 			const param = $('#ITP_FORM_MPOMNG07010_POP_WHS').serializeObject();
239
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
239
+			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = '';
240 240
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
241 241
 		},
242 242
 		view: function(gridRows) {

+ 2 - 2
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -171,7 +171,7 @@ let mobContObj = {
171 171
 			var $div = $(elem).siblings('div');
172 172
 			var num = Number($div.text());
173 173
 			if(num <= 1) {
174
-				alert('주문수량을 확인하세요.');
174
+				itp_fn_modal_alert_ajax('주문수량을 확인하세요.');
175 175
 			} else {
176 176
 				$($div).text((num - 1).toString());
177 177
 				this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
@@ -252,7 +252,7 @@ let mobPopObj = {
252 252
 					var $div = $(elem).siblings('div');
253 253
 					var num = Number($div.text());
254 254
 					if(num <= 1) {
255
-						alert('주문수량을 확인하세요.');
255
+						itp_fn_modal_alert_ajax('주문수량을 확인하세요.');
256 256
 					} else {
257 257
 						$($div).text((num - 1).toString());
258 258
 					}

+ 73 - 48
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -42,8 +42,8 @@ let mobPageObj = {
42 42
 
43 43
 			// 조회일자 지정
44 44
 			$('#ITP_MOBILE_MRTNMNG02010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
45
-			$('#ITP_FORM_MRTNMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
46
-			$('#ITP_FORM_MRTNMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
45
+			$('#ITP_FORM_MRTNMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
46
+			$('#ITP_FORM_MRTNMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 1));
47 47
 		},
48 48
 		info: function() {
49 49
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -253,7 +253,8 @@ let mobContentObj = {
253 253
 		view: function(result) {
254 254
 			var _this = this;
255 255
 			var id = '#ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER';
256
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val(result.colReqDt.replace(/\./g, "-"));
256
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val(result.colReqDt.replace(/\./g, "."));
257
+			$('#ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').datepicker('setDate', result.colReqDt.replace(/\./g, "."));
257 258
 			$(id).find('.fnRtnReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
258 259
 			$(id).find('.fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
259 260
 			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_UNQ_NO').val(result.rtnReqUnqNo);
@@ -274,34 +275,35 @@ let mobContentObj = {
274 275
 			},
275 276
 			attachRow: function (item, viewCd) {
276 277
 				var _this = this;
277
-				var append = function() {
278
-					$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
279
-					var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .panel-group > .list-row:last');
278
+				var append = function(isPush) {
279
+					$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
280
+					var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .list-row:last');
280 281
 					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
281 282
 					$li.find('.fnItemNm').text(item.itemNm);
282 283
 					$li.find('.fnRtnQty').text(item.rtnQty);
283 284
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
284 285
 					item['viewCd'] = viewCd;
285
-					_this.rows.push(item);
286
+					if(isPush) {
287
+						_this.rows.push(item);
288
+					}
289
+					_this.rtnReqAmtTot();
286 290
 				};
287 291
 				var fnChkExist = function() {
288 292
 					var isExist = false;
289 293
 					$.each(_this.rows, function(i, row) {
290 294
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
291 295
 							if(row.viewCd === 'D') {
292
-								item.viewCd = _this.rows[i].viewCd;
293
-								_this.rows[i] = item;
294
-								append();
296
+								item.viewCd = 'U';
297
+								append(false);
295 298
 							} else {
296
-								alert('이미 존재하는 품목입니다.');
299
+								itp_fn_modal_alert('이미 존재하는 품목입니다.');
297 300
 							}
298 301
 							isExist = true;
299 302
 							return false;
300 303
 						}
301 304
 					});
302 305
 					if(!isExist) {
303
-						append();
304
-						_this.rtnReqAmtTot();
306
+						append(true);
305 307
 					}
306 308
 				};
307 309
 				fnChkExist();
@@ -310,10 +312,20 @@ let mobContentObj = {
310 312
 				if($('#ITP_LIST_MRTNMNG02010_MODIFY_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
311 313
 					var _this = this;
312 314
 					$('#ITP_LIST_MRTNMNG02010_MODIFY_ROWS li').each(function(index, elem) {
315
+						var __this = this;
313 316
 						var isChecked = $(this).find('input[type="checkbox"]').is(':checked');
314 317
 						if(isChecked) {
318
+							if(_this.rows[index].viewCd === 'U') {
319
+								_this.rows[index].viewCd = 'D';
320
+							} else {
321
+								$.each(_this.rows, function(i, row){
322
+									if(row.brandUnitUnqNo === $(__this).find('input[type="checkbox"]').val()) {
323
+										_this.rows.splice(i, 1);
324
+										return false;
325
+									}
326
+								});
327
+							}
315 328
 							$(this).remove();
316
-							_this.rows[index].viewCd = 'D';
317 329
 						}
318 330
 					});
319 331
 					this.rtnReqAmtTot();
@@ -330,7 +342,7 @@ let mobContentObj = {
330 342
 				var index = $(elem).index();
331 343
 				var num = Number($(elem).find('.fnRtnQty').text()) - 1;
332 344
 				if(num < 1) {
333
-					alert('주문수량을 확인하세요.');
345
+					itp_fn_modal_alert('주문수량을 확인하세요.');
334 346
 				} else {
335 347
 					$(elem).find('.fnRtnQty').text(num.toString());
336 348
 					this.rows[index]['rtnQty'] = num;
@@ -340,9 +352,11 @@ let mobContentObj = {
340 352
 			rtnReqAmtTot: function() {
341 353
 				var reqAmt = 0;
342 354
 				$.each(this.rows, function(index, item) {
343
-					var qty = item.rtnQty;
344
-					var amt = item.unitAmt;
345
-					reqAmt += Number(qty) * amt;
355
+					if(item.viewCd !== 'D') {
356
+						var qty = item.rtnQty;
357
+						var amt = item.unitAmt;
358
+						reqAmt += Number(qty) * amt;
359
+					}
346 360
 				});
347 361
 				$('#ITP_FORM_MRTNMNG02010_MODIFY').find('.fnRtnReqAmtTot').text(CommonObj.currency.add(reqAmt));
348 362
 			}
@@ -356,14 +370,14 @@ let mobContentObj = {
356 370
 			$(id).find('.fnDlvReqDt').val('');
357 371
 			$(id).find('.fnRtnReqTotalAmt').text('');
358 372
 			$(id).find('.fnOrdUseAmt').text('');
359
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOAN_DVSN').val('');
360
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val('');
361
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_UNQ_NO').val('');
362
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_DVSN').val('');
373
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val('');
374
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_UNQ_NO').val('');
375
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_DVSN').val('');
376
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID').val('');
363 377
 			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM').val('');
364 378
 			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID').val('');
365 379
 			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOCATION').val('');
366
-			$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .panel-group').empty();
380
+			$('#ITP_LIST_MRTNMNG02010_MODIFY_ROWS').children().remove();
367 381
 		}
368 382
 	}
369 383
 };
@@ -404,7 +418,7 @@ let mobPopObj = {
404 418
 						switch (id) {
405 419
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS'	: _this.actPlus($(this)); 		break;
406 420
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS'	: _this.actMinus($(this)); 		break;
407
-							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'		: _this.actItemAdd($(this)); 	break;
421
+							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.actItemAdd($(this)); 	break;
408 422
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH'	: mobPopObj.popItem.search(); 	break;
409 423
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_CLOSE'	: mobPopObj.hide(id); 			break;
410 424
 						}
@@ -420,7 +434,7 @@ let mobPopObj = {
420 434
 					var $div = $(elem).siblings('div');
421 435
 					var num = Number($div.text());
422 436
 					if(num <= 1) {
423
-						alert('주문수량을 확인하세요.');
437
+						itp_fn_modal_alert('주문수량을 확인하세요.');
424 438
 					} else {
425 439
 						$($div).text((num - 1).toString());
426 440
 					}
@@ -456,7 +470,7 @@ let mobPopObj = {
456 470
 				_this.view(result.gridRows);
457 471
 			};
458 472
 			const param = $('#ITP_FORM_MRTNMNG02010_POP_WHS').serializeObject();
459
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
473
+			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn =  mobPageObj.viewMode === VIEW_MODE_LIST ? '' : 'W01';
460 474
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
461 475
 		},
462 476
 		view: function(gridRows) {
@@ -514,6 +528,15 @@ let mobPopObj = {
514 528
 		popId: 'ITP_POP_MRTNMNG02010_REQ_AREA',
515 529
 		rtnReqStCd: '',
516 530
 		init: function (rtnReqStCd) {
531
+			let mgrId = $('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID').val();
532
+			if(mgrId !== fn_make_user_info.get('userId')) {
533
+				itp_fn_modal_alert(ITP_MSG_LOCALE.message.ajax.diffWrite);
534
+				return;
535
+			}
536
+			if($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWS').children().length < 1) {
537
+				itp_fn_modal_alert( "요청할 품목내역이 없습니다.");
538
+				return;
539
+			}
517 540
 			this.rtnReqStCd = rtnReqStCd;
518 541
 			mobPopObj.show(this.popId);
519 542
 			this.view();
@@ -526,7 +549,7 @@ let mobPopObj = {
526 549
 				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
527 550
 			}
528 551
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val());
529
-			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
552
+			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWS').children().length, '개'));
530 553
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnRtnTotalAmt').text($('#ITP_FORM_MRTNMNG02010_MODIFY .fnRtnReqAmtTot').text());
531 554
 		},
532 555
 		action: function() {
@@ -541,29 +564,31 @@ let mobPopObj = {
541 564
 			var gridInsertData = [];
542 565
 			var gridUpdateData = [];
543 566
 			var gridDeleteData = [];
544
-			$.each(mobContentObj.modify.list.rows, function(index, row) {
545
-				var item = {};
546
-				item['brandUnitUnqNo']	= row.brandUnitUnqNo;
547
-				item['itemId']			= row.itemId;
548
-				item['itemNm']			= row.itemNm;
549
-				item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.rtnQty);
550
-				item['rtnDvsn']			= row.rtnDvsn;
551
-				item['rtnQty']			= row.rtnQty;
552
-				item['rtnReqDtlNo']		= row.rtnReqDtlNo;
553
-				item['rtnReqUnqNo']		= row.rtnReqUnqNo;
554
-				item['rtnRsn']			= row.rtnRsn;
555
-				item['rtnRsnDvsn']		= row.rtnRsnDvsn;
556
-				item['spplyId']			= row.spplyId;
557
-				item['storeUnitUnqNo']	= row.storeUnitUnqNo;
558
-				item['unit']			= row.unit;
559
-				item['unitAmt']			= row.unitAmt;
560
-				item['unitGubun']		= row.unitGubun;
561
-				if(row.viewCd === 'R' || row.viewCd === 'C' ) {
567
+			$.each(mobContentObj.modify.list.rows, function(index, item) {
568
+				// var item = {};
569
+				// item['brandUnitUnqNo']	= row.brandUnitUnqNo;
570
+				// item['itemId']			= row.itemId;
571
+				// item['itemNm']			= row.itemNm;
572
+				// item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.rtnQty);
573
+				// item['rtnDvsn']			= row.rtnDvsn;
574
+				// item['rtnQty']			= row.rtnQty;
575
+				// item['rtnReqDtlNo']		= row.rtnReqDtlNo;
576
+				// item['rtnReqUnqNo']		= row.rtnReqUnqNo;
577
+				// item['rtnRsn']			= row.rtnRsn;
578
+				// item['rtnRsnDvsn']		= row.rtnRsnDvsn;
579
+				// item['spplyId']			= row.spplyId;
580
+				// item['storeUnitUnqNo']	= row.storeUnitUnqNo;
581
+				// item['unit']			= row.unit;
582
+				// item['unitAmt']			= row.unitAmt;
583
+				// item['unitGubun']		= row.unitGubun;
584
+				item['rtnAmt']			= parseInt(item.unitAmt) * parseInt(item.rtnQty);
585
+				if(item.viewCd === 'D') {
586
+					gridDeleteData.push(item);
587
+				} else if(item.viewCd === 'C') {
562 588
 					gridInsertData.push(item);
563
-				} else if(row.viewCd === 'U') {
589
+				} else {
590
+					item.viewCd = 'U';
564 591
 					gridUpdateData.push(item);
565
-				} else if(row.viewCd === 'D') {
566
-					gridDeleteData.push(item);
567 592
 				}
568 593
 			});
569 594
 			let param = $(formId).serializeObject();

+ 1 - 1
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js

@@ -36,7 +36,7 @@ let mobPageObj = {
36 36
 
37 37
 			// 조회일자 지정
38 38
 			$('#ITP_MOBILE_MRTNMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
-			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
39
+			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
40 40
 			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
41 41
 		},
42 42
 		info: function() {

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

@@ -71,6 +71,7 @@ require([
71 71
 		CONN_KEY = data.connKey; //로그인 했을때 넣었던 키를 가져옴
72 72
 
73 73
 		var callbackFn = function(result) {
74
+			console.log(result);
74 75
 			CODE_LIST = result.codeList;
75 76
 			AUTH_MENU_LIST = result.authMenuList;
76 77
 			ACT_LIST = result.actList;
@@ -853,7 +854,7 @@ function itp_fn_date_add(type, iAdd) {
853 854
 	if(type === 'Y') date.setFullYear(date.getFullYear() + iAdd);
854 855
 	else if(type === 'M') date.setMonth(date.getMonth() + iAdd);
855 856
 	else if(type === 'D') date.setDate(date.getDate() + iAdd);
856
-	return itp_fn_date_format(date, 4);
857
+	return itp_fn_date_format(date, 2);
857 858
 }
858 859
 
859 860
 function itp_fn_fire_window_resize() {