瀏覽代碼

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

yhl88 2 年之前
父節點
當前提交
f83b1f92f0

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

@@ -194,7 +194,7 @@
194 194
 					  <div class="nomal">
195 195
 						<label class="col_4">가격단위</label>
196 196
 						<span>:</span>
197
-					    <div class="fnUPodrQty"></div>
197
+					    <div class="fnUnit"></div>
198 198
 						<label class="col_4">단가</label>
199 199
 						<span>:</span>
200 200
 					    <div class="fnUnitAmt"></div>

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

@@ -149,7 +149,7 @@
149 149
 				  <div class="line">
150 150
 					  <label class="col_6">납품일자</label>
151 151
 					  <div class="line_right">
152
-						  <input id="ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT" name="dlvSchDt" class="year" type="date">
152
+						  <input type="text" id="ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT" name="dlvSchDt" class="itp_input date year">
153 153
 					  </div>
154 154
 				  </div>
155 155
 				<div class="line">
@@ -205,7 +205,7 @@
205 205
 					    <input id="ITP_FORM_MORDMNG02010_VIEW_SHMT_QTY" name="shmtQty" type="text">
206 206
 					    <label>유통기한</label>
207 207
 					    <span>:</span>
208
-					    <input id="ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE" name="expryDate" class="col_9 year" type="date">
208
+						<input type="text" id="ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE" name="expryDate" class="itp_input date col_9 year">
209 209
 					  </div>
210 210
 					</div>
211 211
 					<div class="left">

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

@@ -126,7 +126,7 @@
126 126
 				<form id="ITP_FORM_MRTNMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
127 127
 					<input type="hidden" id="ITP_FORM_MRTNMNG01010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
128 128
 					<input type="hidden" id="ITP_FORM_MRTNMNG01010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
129
-					<input id="ITP_FORM_MRTNMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="품장소명">
129
+					<input id="ITP_FORM_MRTNMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="품장소명">
130 130
 					<button id="ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
131 131
 				</form>
132 132
 			</div>

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

@@ -25,7 +25,7 @@
25 25
 						</div>
26 26
 					</div>
27 27
 					<div class="line">
28
-						<label>품장소</label>
28
+						<label>품장소</label>
29 29
 						<div class="float_left">
30 30
 							<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="" readonly>
31 31
 							<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">

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

@@ -27,7 +27,7 @@
27 27
 					<div class="line">
28 28
 						<label>수거장소</label>
29 29
 						<div class="float_left">
30
-							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="매장명" readonly />
30
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="" readonly />
31 31
 							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
32 32
 							<div class="itp_input_btn">
33 33
 								<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -40,7 +40,7 @@
40 40
 					<div class="line top3">
41 41
 						<label>반품입고장소</label>
42 42
 						<div class="float_left">
43
-							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
43
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="" readonly />
44 44
 							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
45 45
 							<div class="itp_input_btn">
46 46
 								<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -206,7 +206,7 @@
206 206
 		<div class="pop">
207 207
 			<div class="header">
208 208
 				<div class="header_left">
209
-					<label>납품장소</label>
209
+					<label>창고검색</label>
210 210
 				</div>
211 211
 				<div class="header_right">
212 212
 					<button type="button" id="ITP_BTN_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -216,12 +216,12 @@
216 216
 				<form id="ITP_FORM_MRTNMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
217 217
 					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
218 218
 					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
219
-					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
219
+					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
220 220
 					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
221 221
 				</form>
222 222
 			</div>
223 223
 			<div class="select_btn">
224
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
224
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
225 225
 			</div>
226 226
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
227 227
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -26,7 +26,7 @@
26 26
 					<div class="line">
27 27
 						<label>수거창고</label>
28 28
 						<div class="float_left">
29
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
29
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="" readonly />
30 30
 							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" class="" name="srtnWhsId" />
31 31
 							<div class="itp_input_btn">
32 32
 								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -52,7 +52,7 @@
52 52
 					<div class="line">
53 53
 						<label>반품품목명</label>
54 54
 						<div class="float_left name">
55
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
55
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder=" ">
56 56
 						</div>
57 57
 					</div>
58 58
 					<div class="header line top6">
@@ -119,8 +119,8 @@
119 119
 				</div>
120 120
 			</div>
121 121
 			<div class="button_bar">
122
-				<!--<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>-->
123
-				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_6 btn-gray CLB">취소</button>
122
+				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
123
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
124 124
 			</div>
125 125
 		</form>
126 126
 	</div>
@@ -166,7 +166,7 @@
166 166
 		<div class="pop">
167 167
 			<div class="header">
168 168
 				<div class="header_left">
169
-					<label>납품장소</label>
169
+					<label>수거장소</label>
170 170
 				</div>
171 171
 				<div class="header_right">
172 172
 					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -176,12 +176,12 @@
176 176
 				<form id="ITP_FORM_MRTNMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
177 177
 					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
178 178
 					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
179
-					<input id="ITP_FORM_MRTNMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
179
+					<input id="ITP_FORM_MRTNMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
180 180
 					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
181 181
 				</form>
182 182
 			</div>
183 183
 			<div class="select_btn">
184
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
184
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
185 185
 			</div>
186 186
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
187 187
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -156,7 +156,7 @@
156 156
 		<div class="pop">
157 157
 			<div class="header">
158 158
 				<div class="header_left">
159
-					<label>납품장소</label>
159
+					<label>수거장소</label>
160 160
 				</div>
161 161
 				<div class="header_right">
162 162
 					<button type="button" id="ITP_BTN_MRTNMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -166,12 +166,12 @@
166 166
 				<form id="ITP_FORM_MRTNMNG06010_POP_WHS" class="form-horizontal" onsubmit="return false;">
167 167
 					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
168 168
 					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
169
-					<input id="ITP_FORM_MRTNMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
169
+					<input id="ITP_FORM_MRTNMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
170 170
 					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
171 171
 				</form>
172 172
 			</div>
173 173
 			<div class="select_btn">
174
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
174
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
175 175
 			</div>
176 176
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
177 177
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -12,6 +12,7 @@
12 12
 				  <label>창고선택</label>
13 13
 				  <div class="float_left">
14 14
 					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
15
+					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_ID" name="swhsId" type="hidden">
15 16
 					<div class="itp_input_btn">		
16 17
 						<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
17 18
 					</div>
@@ -101,7 +102,7 @@
101 102
 		<div class="pop">
102 103
 			<div class="header">
103 104
 				<div class="header_left">
104
-					<label>납품장소</label>
105
+					<label>창고</label>
105 106
 				</div>
106 107
 				<div class="header_right">
107 108
 					<button type="button" id="ITP_BTN_MSTOCKMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -111,12 +112,12 @@
111 112
 				<form id="ITP_FORM_MSTOCKMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
112 113
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
113 114
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
114
-					<input id="ITP_FORM_MSTOCKMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
115
+					<input id="ITP_FORM_MSTOCKMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
115 116
 					<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
116 117
 				</form>
117 118
 			</div>
118 119
 			<div class="select_btn">
119
-				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
120
+				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_red">창 고<img src="../img/arrow_down.png"></button>
120 121
 			</div>
121 122
 			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
122 123
 				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

+ 2 - 1
src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_WHS_QTY.html

@@ -40,7 +40,8 @@
40 40
 									</div>
41 41
 									<div class="info_box">
42 42
 			              				<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS">-</button>
43
-										<input type="text" id="ITP_POP_FORM_PO_WHS_QTY" class="itp_input" name="whsQty" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" value="0" />
43
+										<input type="text" id="ITP_POP_FORM_PO_WHS_QTY" class="itp_input" name="whsQty" placeholder="0" />
44
+										<!--<input type="text" id="ITP_POP_FORM_PO_WHS_QTY" class="itp_input" name="whsQty" onKeyup="this.value=this.value.replace(/(\d)(?=(?:\d{3})+(?!\d))/g,'$1,');" value="0" />-->
44 45
 										<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS">+</button>
45 46
 									</div>
46 47
 								</div>

+ 2 - 0
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG01010.js

@@ -165,6 +165,8 @@ let mobContObj = {
165 165
 				limitAmt = result.chrgeLimitAmt;
166 166
 			} else if(result.loanDvsn == 'LD02') { // 후불(신용)
167 167
 				limitAmt = result.credtLimitAmt;
168
+			} else if(result.loanDvsn == 'LD03') { // 무정산
169
+				limitAmt = 0;
168 170
 			}
169 171
 			$(id).find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
170 172
 			$(id).find('.fnUseYnNm').text(result.useYnNm);

+ 3 - 1
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG01011.js

@@ -78,10 +78,12 @@ let mobContObj = {
78 78
 				limitAmt = result.chrgeLimitAmt;
79 79
 			} else if(result.loanDvsn == 'LD02') { // 후불(신용)
80 80
 				limitAmt = result.credtLimitAmt;
81
+			} else if(result.loanDvsn == 'LD03') { // 무정산
82
+				limitAmt = '0';
81 83
 			}
82 84
 			$(id).find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
83 85
 			$(id).find('.fnUseYnNm').text(result.useYnNm);
84
-			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt + result.acctBal - result.useAmtTotal));
86
+			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add((result.loanDvsn == 'LD03') ? '0' : limitAmt + result.acctBal - result.useAmtTotal));
85 87
 			$(id).find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(result.tmpRcvAcctTotal));
86 88
 			$(id).find('.fnUseAmtTotal').text(CommonObj.currency.add(result.useAmtTotal));
87 89
 

+ 0 - 42
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG03010.js

@@ -263,44 +263,11 @@ let mobContObj = {
263 263
 		},
264 264
 		payment: {
265 265
 			view: function() {
266
-				// if(CommonObj.isApp) {
267
-				// 	mobPageObj.switchScreen(PAGE_MODE_PAY);
268
-				// 	this.load();
269
-				// } else {
270
-				// 	this.popup();
271
-				// }
272 266
 				this.popup();
273 267
 			},
274
-			load: function() {
275
-				var callbackFn = function(result) {
276
-					console.log(result);
277
-					var id = '#ITP_AJAX_MLOANMNG03010_PAY_CONTAINER';
278
-					$(id).find('.fnPoOrdNo').text(result.poOrdNo);
279
-					$(id).find('.fnOrdNm').text(result.ordNm);
280
-					$(id).find('.fnGoodsNm').text(result.goodsNm);
281
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_PO_ORD_NO').val(result.poOrdNo);
282
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_ORD_NM').val(result.ordNm);
283
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_GOODS_NM').val(result.goodsNm);
284
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_MALL_ID').val(result.mallId);
285
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_MOBILE_URL').val(result.kicc_action_mobile_url);
286
-					$(id).find('#ITP_FORM_MLOANMNG03010_PAY_JS_URL').val(result.kicc_javascript_url);
287
-					if(result.ordEmail) {
288
-						var email = result.ordEmail.split('@');
289
-						if(email.length === 2) {
290
-							$(id).find('#ITP_FORM_MLOANMNG03010_PAY_ORD_EMAIL').val(email);
291
-							$(id).find('#ITP_FORM_MLOANMNG03010_PAY_EMAIL_ID').val(email[0]);
292
-							$(id).find('#ITP_FORM_MLOANMNG03010_PAY_EMAIL_NM').val(email[1]);
293
-						}
294
-					}
295
-				};
296
-				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
297
-				var param = $('#ITP_FORM_MLOANMNG03010_VIEW').serializeObject();
298
-				fn_ajax_call(EASYPAY_PAYMENT_CREATE, JSON.stringify(param), callbackFn, 'POST');
299
-			},
300 268
 			popup: function() {
301 269
 				// 결제 팝업 결과
302 270
 				var popFn = function(rowDataPop) {
303
-					console.log('rowDataPop : ' + JSON.stringify(rowDataPop));
304 271
 					mobContObj.list.search();
305 272
 				};
306 273
 				// 결제 팝업
@@ -319,9 +286,6 @@ let mobContObj = {
319 286
 				console.log(param);
320 287
 				location.replace('app:payment:' + JSON.stringify(param));
321 288
 			},
322
-			payResult: function(result) {
323
-				console.log(result);
324
-			},
325 289
 			cancel: function() {
326 290
 				$(id).find('.fnPoOrdNo').text('');
327 291
 				$(id).find('.fnOrdNm').text('');
@@ -336,12 +300,6 @@ let mobContObj = {
336 300
 				mobPageObj.switchScreen(PAGE_MODE_VIEW);
337 301
 			}
338 302
 		},
339
-		payRequest: function() {
340
-			location.replace('app:payment');
341
-		},
342
-		payCancel: function() {
343
-			mobPageObj.switchScreen(PAGE_MODE_VIEW);
344
-		},
345 303
 		cancel: function () {
346 304
 			var id = '#ITP_AJAX_MLOANMNG03010_VIEW_CONTAINER';
347 305
 			$(id).find('.fnStoreNm').text('');

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

@@ -166,7 +166,7 @@ let mobContObj = {
166 166
 			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
167 167
 			$(id).find('.fnWhsNm').text(result.whsNm);
168 168
 			$(id).find('.fnDlvReqDt').text(result.dlvReqDt);
169
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
169
+			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
170 170
 			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
171 171
 			$.each(result.pchOdrDtlList, function (i, item) {
172 172
 				$('#ITP_LIST_MORDMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG01010_VIEW_ITEM_ROWCOPY').html());
@@ -174,9 +174,8 @@ let mobContObj = {
174 174
 				$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
175 175
 				$li.find('.fnItemId').text(item.itemId);
176 176
 				$li.find('.fnItemNm').text(item.itemNm);
177
-				$li.find('.fnUPodrQty').text(item.podrQty);
178
-				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
179 177
 				$li.find('.fnUnit').text(item.unit);
178
+				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
180 179
 				$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
181 180
 				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
182 181
 			});

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

@@ -70,12 +70,10 @@ let mobPageObj = {
70 70
 				return false;
71 71
 			});
72 72
 
73
-			$(document).off('click', 'input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]');
74
-			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]', function() {
75
-				if($(this).prop('checked')) {
76
-					$('input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
77
-					$(this).prop('checked', true);
78
-				}
73
+			$(document).off('click', '#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .item-row');
74
+			$(document).on('click', '#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .item-row', function() {
75
+				$('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .item-row').removeClass('check');
76
+				$(this).addClass('check');
79 77
 			});
80 78
 
81 79
 		}
@@ -152,14 +150,14 @@ let mobContObj = {
152 150
 		},
153 151
 		dlvPrint: function() {
154 152
 			var iChoice = -1;
155
-			$('input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]').each(function(index) {
156
-				if($(this).is(":checked")) {
153
+			$('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .item-row').each(function(index) {
154
+				if($(this).hasClass("check")) {
157 155
 					iChoice = index;
158 156
 					return false;
159 157
 				}
160 158
 			});
161 159
 			if(iChoice ===  -1) {
162
-				alert("납품서를 선택해주세요 (대표 납품서번호)");
160
+				itp_fn_modal_alert("발주건을 선택해주세요(대표 발주번호)");
163 161
 				return;
164 162
 			}
165 163
 			mobContObj.view.init(this.rows[iChoice]);
@@ -196,6 +194,7 @@ let mobContObj = {
196 194
 			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
197 195
 			$(id).find('.fnWhsNm').text(result.whsNm);
198 196
 			$(id).find('.fnDeliTelNo').text(result.deliTelNo);
197
+			$(id).find('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').datepicker('setDate', itp_fn_date_add('D', 7));
199 198
 			$.each(result.invPoInfoList, function (i, item) {
200 199
 				$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY').html());
201 200
 				var $li = $('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .item-row:last');
@@ -207,7 +206,8 @@ let mobContObj = {
207 206
 				$li.find('.fnUnit').text(item.unit);
208 207
 				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
209 208
 				$li.find('.fnDlvReqDt').text(item.dlvReqDt);
210
-				$li.find('#ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE').val(itp_fn_date_add('M', 0));
209
+				$li.find('.itp_input.date').datepicker(ITP_DATE_LANGUAGE);
210
+				$li.find('#ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE').datepicker('setDate', item.expryDate);
211 211
 				_this.rows.push(item);
212 212
 			});
213 213
 		},

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

@@ -141,8 +141,8 @@ let mobContObj = {
141 141
 					$li.find('.fnDlvMgrNm').text(item.dlvMgrNm);
142 142
 					$li.find('.fnItemNm').text(item.itemNm);
143 143
 					$li.find('.fnPodrQty').text( CommonObj.currency.add(item.podrQty, '개') );
144
-					$li.find('.fnUnitAmt').text(item.unitAmt);
145
-					$li.find('.fnDlvAmt').text(item.dlvAmt);
144
+					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
145
+					$li.find('.fnDlvAmt').text(CommonObj.currency.add(item.dlvAmt));
146 146
 					mobContObj.list.rows.push(item);
147 147
 				});
148 148
 			};

+ 1 - 2
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG01010.js

@@ -144,8 +144,7 @@ let mobContObj = {
144 144
 			const param = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH').serializeObject();
145 145
 			param.gridPage = mobContObj.list.listPage;
146 146
 			param.gridSize = mobile_list_size;
147
-			param.pagingYn = true;
148
-			// console.log(JSON.stringify(param));
147
+			console.log(JSON.stringify(param));
149 148
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
150 149
 		},
151 150
 		choice: function(item) {

+ 4 - 2
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_WHS_QTY.js

@@ -14,12 +14,14 @@ var popPageObj = {
14 14
 		this.action();
15 15
 	},
16 16
 	view: function() {
17
-		console.log(popPageObj.args.item);
18 17
 		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnItemId').text(popPageObj.args.item.itemId);
19 18
 		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnItemNm').text(popPageObj.args.item.itemNm);
20
-		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnDlvQty').text(popPageObj.args.item.dlvQty);
19
+		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnDlvQty').text(CommonObj.comma.set(popPageObj.args.item.dlvQty));
21 20
 	},
22 21
 	action: function() {
22
+		$('#ITP_POP_FORM_PO_WHS_QTY').on('keyup', function() {
23
+			$(this).val(CommonObj.comma.set(CommonObj.comma.remove($(this).val())));
24
+		});
23 25
 		$('button[id^="ITP_BTN_PO_WHS_QTY_"]').on('click', function() {
24 26
 			var id = $(this).attr('id');
25 27
 			switch (id) {

+ 4 - 2
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_RT_COL_QTY.js

@@ -14,12 +14,14 @@ var popPageObj = {
14 14
 		this.action();
15 15
 	},
16 16
 	view: function() {
17
-		console.log(popPageObj.args.item);
18 17
 		$('#ITP_FORM_RT_COL_QTY_POPUP .fnItemId').text(popPageObj.args.item.itemId);
19 18
 		$('#ITP_FORM_RT_COL_QTY_POPUP .fnItemNm').text(popPageObj.args.item.itemNm);
20
-		$('#ITP_FORM_RT_COL_QTY_POPUP .fnColReqQty').text(popPageObj.args.item.colReqQty);
19
+		$('#ITP_FORM_RT_COL_QTY_POPUP .fnColReqQty').text(CommonObj.comma.set(popPageObj.args.item.colReqQty));
21 20
 	},
22 21
 	action: function() {
22
+		$('#ITP_POP_FORM_RT_COL_QTY').on('keyup', function() {
23
+			$(this).val(CommonObj.comma.set(CommonObj.comma.remove($(this).val())));
24
+		});
23 25
 		$('button[id^="ITP_BTN_RT_COL_QTY_"]').on('click', function() {
24 26
 			var id = $(this).attr('id');
25 27
 			switch (id) {