Bläddra i källkod

모바일 수정사항 적용

juney 2 år sedan
förälder
incheckning
7125d98c31

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

@@ -199,7 +199,8 @@
199 199
 	      	</div>
200 200
 	        <div class="line">
201 201
 	          <label>납기요청일</label>
202
-	          <input id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">
202
+				<input type="text" id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="itp_input date">
203
+	          <!--<input id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">-->
203 204
 	        </div>
204 205
 	        <div class="line">
205 206
 	          <label>구매요청금액</label>
@@ -374,9 +375,9 @@
374 375
              <div class="scroll_left">
375 376
                  <div class="con_2 fnItemNm">아이템명</div>
376 377
                  <div class="mg_0">
377
-	                 <div class="sub fnKg"></div>
378
+	                 <div class="sub fnUnitAmt"></div>
378 379
 	                 <div class="type_hide">/</div>
379
-	                 <div class="amt fnUnitAmt"></div>
380
+	                 <div class="amt fnOrdAmt"></div>
380 381
                  </div>
381 382
              </div>
382 383
              <div class="scroll_right">

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

@@ -173,14 +173,14 @@
173 173
 			</form>
174 174
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
175 175
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
176
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
176
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
177 177
 					<li class="row_2 item-row">
178 178
 						 <div class="scroll_left item">
179 179
                             <div class="fnItemNm">품목명</div>
180 180
                             <div class="mg_0">
181 181
 				                 <div class="sub fnUnitAmt"></div>
182 182
 				                 <div class="type_hide">/</div>
183
-				                 <div class="amt fnUnitAmt"></div>
183
+				                 <div class="amt fnOrdAmt"></div>
184 184
 			                 </div>
185 185
                         </div>
186 186
 						<div class="right">

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

@@ -333,9 +333,9 @@
333 333
 						<div class="scroll_left">
334 334
 							<div class="fnItemNm"></div>
335 335
 							<div class="mg_0">
336
-								<div class="sub fnKg"></div>
336
+								<div class="sub fnUnitAmt"></div>
337 337
 								<div class="type_hide">/</div>
338
-								<div class="amt fnUnitAmt"></div>
338
+								<div class="amt fnOrdAmt"></div>
339 339
 							</div>
340 340
 						</div>
341 341
 						<div class="scroll_right">

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

@@ -433,7 +433,7 @@ let mobPopObj = {
433 433
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
434 434
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdReqAmt').text($('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER .fnPchReqAmtTot').text());
435 435
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdPssblAmt').text($('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER .fnOrdUseAmt').text());
436
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add(pchReqAmtTot));
436
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add(Number(pchReqAmtTot) - Number(ordUseAmt)));
437 437
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .pop_msg').html(popMsg);
438 438
 		},
439 439
 		action: function() {

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

@@ -47,12 +47,12 @@ let mobPageObj = {
47 47
 
48 48
 			if(fn_make_user_info.get('authTpCd') === '50') {
49 49
 				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('readonly', true);
50
-				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('disabled', true);
51
-				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM').attr('disabled', true);
50
+				// $('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('disabled', true);
51
+				// $('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM').attr('disabled', true);
52 52
 
53 53
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').attr('readonly', true);
54
-				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM').attr('disabled', true);
55
-				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM').attr('disabled', true);
54
+				// $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM').attr('disabled', true);
55
+				// $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM').attr('disabled', true);
56 56
 			}
57 57
 		},
58 58
 		info: function() {
@@ -72,7 +72,7 @@ let mobPageObj = {
72 72
 				switch (id) {
73 73
 					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_LIST); 		break;
74 74
 					case 'ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_LIST); 	break;
75
-					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH'			: mobContObj.list.search();					break;
75
+					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH'			: mobContObj.list.search();						break;
76 76
 				}
77 77
 				return false;
78 78
 			});
@@ -246,7 +246,7 @@ let mobContObj = {
246 246
 		view: function(result) {
247 247
 			var _this = this;
248 248
 			var id = '#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER';
249
-			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val(result.dlvReqDt.replace(/\./g, "-"));
249
+			$('#ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').datepicker('setDate', result.dlvReqDt);
250 250
 			$(id).find('.fnPchReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
251 251
 			$(id).find('.fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
252 252
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_BRAND_ID').val(result.brandId);
@@ -280,18 +280,26 @@ let mobContObj = {
280 280
 			},
281 281
 			attachRow: function (items) {
282 282
 				var _this = this;
283
-				var fnIsExist = function(rows, item) {
284
-					var isExist = false;
283
+				var fnIsNotExist = function(rows, item) {
284
+					var isAddRow = true;
285
+					var isAddItem = true;
285 286
 					$.each(rows, function(i, row) {
286 287
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
287
-							isExist = true;
288
+							if(row.viewCd === 'D') {
289
+								row.viewCd = 'U';
290
+								row.rtnQty = item.rtnQty;
291
+							} else {
292
+								isAddRow = false;
293
+							}
294
+							isAddRow = false;
288 295
 							return false;
289 296
 						}
290 297
 					});
291
-					return isExist;
298
+					if(isAddRow) _this.rows.push(item);
299
+					return isAddItem;
292 300
 				};
293 301
 				$.each(items, function(i, item) {
294
-					if(!fnIsExist(_this.rows, item)) {
302
+					if(fnIsNotExist(_this.rows, item)) {
295 303
 						_this.rows.push(item);
296 304
 						$('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY').html());
297 305
 						var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .item-row:last');
@@ -433,6 +441,7 @@ let mobPopObj = {
433 441
 					$li.find('#ITP_FORM_MPOMNG02010_POP_ITEM_CHECKBOX').val(item.itemId);
434 442
 					$li.find('.fnItemNm').text(item.itemNm);
435 443
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
444
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(item.unitAmt));
436 445
 				});
437 446
 				mobPopObj.popItem.addRow.init();
438 447
 			};
@@ -463,6 +472,7 @@ let mobPopObj = {
463 472
 					var $div = $(elem).siblings('div');
464 473
 					var num = Number($div.text());
465 474
 					$($div).text((num + 1).toString());
475
+					this.reqAmtUnit(elem, $($div).text());
466 476
 				},
467 477
 				actMinus: function(elem) {
468 478
 					var $div = $(elem).siblings('div');
@@ -471,14 +481,23 @@ let mobPopObj = {
471 481
 						itp_fn_modal_alert('수량을 확인하세요.');
472 482
 					} else {
473 483
 						$($div).text((num - 1).toString());
484
+						this.reqAmtUnit(elem, $($div).text());
474 485
 					}
475 486
 				},
487
+				reqAmtUnit: function(elem, qty) {
488
+					var $li = $(elem).closest('li');
489
+					var unitAmt = CommonObj.onlyNumber($li.find('.fnUnitAmt').text());
490
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(unitAmt ? unitAmt : 0) * Number(qty)));
491
+				},
476 492
 				actItemAdd: function(elem) {
477 493
 					var $li = $(elem).closest('li');
478 494
 					var item = mobPopObj.popItem.rows[$li.index()];
479 495
 					item['viewCd'] = 'C';
480 496
 					item['pchReqQty'] = $li.find('.fnPchReqQty').html();
481
-					mobContObj.modify.list.attachRow(item);
497
+					// var index = $(elem).closest('li').index();
498
+					// var item = mobPopObj.popItem.rows[index];
499
+					// item['pchReqQty'] = $(elem).closest('li').find('.fnPchReqQty').html();
500
+					mobContObj.list.attachRow(item);
482 501
 				},
483 502
 				addItems: function() {
484 503
 					var items = [];
@@ -486,6 +505,7 @@ let mobPopObj = {
486 505
 						if($(this).is(':checked')) {
487 506
 							var index = $(this).closest('li').index();
488 507
 							var item = mobPopObj.popItem.rows[index];
508
+							item['viewCd'] = 'C';
489 509
 							item['pchReqQty'] = $(this).closest('li').find('.fnPchReqQty').html();
490 510
 							items.push(item);
491 511
 						}
@@ -505,7 +525,7 @@ let mobPopObj = {
505 525
 		close: function() {
506 526
 			this.rows.length = 0;
507 527
 			$('#ITP_LIST_MPOMNG02010_POP_ITEM_ROWS').children().remove();
508
-			mobPopObj.hide(this.popId);
528
+			mobPopObj.hide('ITP_POP_MPOMNG02010_ITEM_AREA');
509 529
 		}
510 530
 	},
511 531
 	popWhsNm: {
@@ -656,6 +676,7 @@ let mobPopObj = {
656 676
 			});
657 677
 		},
658 678
 		save: function() {
679
+			var loanDvsn = $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_DVSN').val();
659 680
 			var procSave = function (isReload) {
660 681
 				let param = $('#ITP_FORM_MPOMNG02010_MODIFY').serializeObject();
661 682
 				var gridInsertData = [];
@@ -689,7 +710,7 @@ let mobPopObj = {
689 710
 			} else if (this.saveMode === 4 || this.saveMode === 5) {
690 711
 				// 결제 팝업 결과
691 712
 				var popFn = function(rowDataPop) {
692
-					procSave(false);
713
+					procSave((loanDvsn === 'LD01'));
693 714
 				};
694 715
 				// 결제 팝업
695 716
 				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text());

+ 5 - 0
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -34,6 +34,11 @@ let mobPageObj = {
34 34
 				}
35 35
 			});
36 36
 
37
+			if(fn_make_user_info.get('authTpCd') === '50') {
38
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_BTN_MPOMNG06010_LIST_SEARCH_SPPLY_NM').attr('disabled', true);
39
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_BTN_MPOMNG06010_LIST_DELETE_SPPLY_NM').attr('disabled', true);
40
+			}
41
+
37 42
 			// 조회일자 지정
38 43
 			$('#ITP_MOBILE_MPOMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39 44
 			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));

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

@@ -34,6 +34,11 @@ let mobPageObj = {
34 34
 				}
35 35
 			});
36 36
 
37
+			if(fn_make_user_info.get('authTpCd') === '50') {
38
+				$('#ITP_FORM_MPOMNG07010_LIST_SEARCH #ITP_BTN_MPOMNG07010_LIST_SEARCH_SPPLY_NM').attr('disabled', true);
39
+				$('#ITP_FORM_MPOMNG07010_LIST_SEARCH #ITP_BTN_MPOMNG07010_LIST_DELETE_SPPLY_NM').attr('disabled', true);
40
+			}
41
+
37 42
 			// 조회일자 지정
38 43
 			$('#ITP_MOBILE_MPOMNG07010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39 44
 			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));

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

@@ -203,21 +203,22 @@ let mobPopObj = {
203 203
 		$('#' + popId).show();
204 204
 	},
205 205
 	popItem: {
206
-		rows: null,
206
+		// rows: null,
207 207
 		init: function() {
208 208
 			this.search();
209 209
 		},
210 210
 		search: function() {
211 211
 			$('#ITP_LIST_MRTNMNG01010_POP_ITEM_AREA .panel-group').empty();
212 212
 			var callbackFn = function(result) {
213
+				console.log(result);
213 214
 				mobPopObj.popItem.rows = result.gridRows;
214 215
 				$.each(mobPopObj.popItem.rows, function (i, item) {
215 216
 					$('#ITP_LIST_MRTNMNG01010_POP_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY').html());
216 217
 					var $li = $('#ITP_LIST_MRTNMNG01010_POP_ITEM_AREA .panel-group > .row_2:last');
217
-					$li.find('#ITP_BTN_MRTNMNG01010_POP_ITEM_ADD').val(item.itemId);
218
+					$li.find('#ITP_FORM_MRTNMNG01010_POP_ITEM_CHECKBOX').val(item.itemId);
218 219
 					$li.find('.fnItemNm').text(item.itemNm);
219
-					$li.find('.fnKg').text(item.unit);
220 220
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
221
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(item.unitAmt));
221 222
 				});
222 223
 				mobPopObj.popItem.addRow.init();
223 224
 			};
@@ -236,17 +237,19 @@ let mobPopObj = {
236 237
 						switch (id) {
237 238
 							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_PLUS'	: _this.actPlus($(this)); 		break;
238 239
 							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS'	: _this.actMinus($(this)); 		break;
239
-							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_ADD'	: _this.addItems(); 			break;
240
-							// case 'ITP_BTN_MRTNMNG01010_POP_ITEM_ADD'	: _this.actItemAdd($(this)); 	break;
240
+							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_ADD'		: _this.addItems(); 			break;
241
+							// case 'ITP_BTN_MRTNMNG01010_POP_ITEM_ADD'		: _this.actItemAdd($(this)); 	break;
241 242
 							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH'	: mobPopObj.popItem.search(); 	break;
242 243
 							case 'ITP_BTN_MRTNMNG01010_POP_ITEM_CLOSE'	: mobPopObj.hide(id); 			break;
243 244
 						}
245
+						return false;
244 246
 					});
245 247
 				},
246 248
 				actPlus: function(elem) {
247 249
 					var $div = $(elem).siblings('div');
248 250
 					var num = Number($div.text());
249 251
 					$($div).text((num + 1).toString());
252
+					this.reqAmtUnit(elem, $($div).text());
250 253
 				},
251 254
 				actMinus: function(elem) {
252 255
 					var $div = $(elem).siblings('div');
@@ -255,12 +258,21 @@ let mobPopObj = {
255 258
 						itp_fn_modal_alert('수량을 확인하세요.');
256 259
 					} else {
257 260
 						$($div).text((num - 1).toString());
261
+						this.reqAmtUnit(elem, $($div).text());
258 262
 					}
259 263
 				},
264
+				reqAmtUnit: function(elem, qty) {
265
+					var $li = $(elem).closest('li');
266
+					var unitAmt = CommonObj.onlyNumber($li.find('.fnUnitAmt').text());
267
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(unitAmt ? unitAmt : 0) * Number(qty)));
268
+				},
260 269
 				actItemAdd: function(elem) {
261
-					var index = $(elem).closest('li').index();
262
-					var item = mobPopObj.popItem.rows[index];
263
-					item['pchReqQty'] = $(elem).closest('li').find('.fnPchReqQty').html();
270
+					var $li = $(elem).closest('li');
271
+					var item = mobPopObj.popItem.rows[$li.index()];
272
+					item['pchReqQty'] = $li.find('.fnPchReqQty').html();
273
+					// var index = $(elem).closest('li').index();
274
+					// var item = mobPopObj.popItem.rows[index];
275
+					// item['pchReqQty'] = $(elem).closest('li').find('.fnPchReqQty').html();
264 276
 					mobContObj.list.attachRow(item);
265 277
 				},
266 278
 				addItems: function() {
@@ -392,11 +404,13 @@ let mobPopObj = {
392 404
 			});
393 405
 			param.gridInsertData = gridInsertData;
394 406
 			param['colReqDt'] = param.colReqDt.replace(/[^0-9]/g, "");
395
-			console.log(JSON.stringify(param));
407
+			// console.log(JSON.stringify(param));
396 408
 			var saveFn = function (result) {
397 409
 				console.log(result);
398 410
 				mobPopObj.hide('ITP_POP_MRTNMNG01010_RTN_AREA');
399 411
 				$('#ITP_LIST_MRTNMNG01010_DETAIL_ROWS').empty();
412
+				mobContObj.list.rows.length = 0;
413
+				$('#ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER').find('.fnRtnReqAmt').text('');
400 414
 			};
401 415
 			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
402 416
 		}

+ 37 - 53
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -104,6 +104,7 @@ let mobPageObj = {
104 104
 			// 	}
105 105
 			// });
106 106
 
107
+			$(document).off('click', '#ITP_LIST_MRTNMNG02010_POP_WHS_ROWS li button');
107 108
 			$(document).on('click', '#ITP_LIST_MRTNMNG02010_POP_WHS_ROWS li button', function() {
108 109
 				mobPopObj.popWhsNm.choice($(this));
109 110
 			});
@@ -147,8 +148,8 @@ let mobContObj = {
147 148
 		},
148 149
 		pager: function(totPage) {
149 150
 			(this.listPage < totPage) ?
150
-				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', true, mobContObj.list.load) :
151
-				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', false);
151
+				CommonObj.moreView('#ITP_LIST_MRTNMNG02010_ITEM_AREA', true, mobContObj.list.load) :
152
+				CommonObj.moreView('#ITP_LIST_MRTNMNG02010_ITEM_AREA', false);
152 153
 			this.listPage += 1;
153 154
 		},
154 155
 		load: function() {
@@ -263,24 +264,31 @@ let mobContObj = {
263 264
 			},
264 265
 			attachRow: function (items) {
265 266
 				var _this = this;
266
-				var fnIsExist = function(rows, item) {
267
-					var isExist = false;
267
+				var fnIsNotExist = function(rows, item) {
268
+					var isAddRow = true;
269
+					var isAddItem = true;
268 270
 					$.each(rows, function(i, row) {
269 271
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
270
-							isExist = true;
272
+							if(row.viewCd === 'D') {
273
+								row.viewCd = 'U';
274
+								row.rtnQty = item.rtnQty;
275
+							} else {
276
+								isAddRow = false;
277
+							}
278
+							isAddRow = false;
271 279
 							return false;
272 280
 						}
273 281
 					});
274
-					return isExist;
282
+					if(isAddRow) _this.rows.push(item);
283
+					return isAddItem;
275 284
 				};
276 285
 				$.each(items, function(i, item) {
277
-					if(!fnIsExist(_this.rows, item)) {
278
-						_this.rows.push(item);
286
+					if(fnIsNotExist(_this.rows, item)) {
279 287
 						$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
280 288
 						var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .item-row:last');
281 289
 						$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
282 290
 						$li.find('.fnItemNm').text(item.itemNm);
283
-						// $li.find('.fnRtnQty').text(item.rtnQty);
291
+						$li.find('.fnRtnQty').text(item.rtnQty);
284 292
 						$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
285 293
 						$('.item-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
286 294
 						$('.item-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
@@ -288,43 +296,6 @@ let mobContObj = {
288 296
 					}
289 297
 				});
290 298
 			},
291
-			// attachRow: function (item, viewCd) {
292
-			// 	var _this = this;
293
-			// 	var append = function(isPush) {
294
-			// 		$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
295
-			// 		var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .list-row:last');
296
-			// 		$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
297
-			// 		$li.find('.fnItemNm').text(item.itemNm);
298
-			// 		$li.find('.fnRtnQty').text(item.rtnReqItemQty);
299
-			// 		$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
300
-			// 		item['viewCd'] = viewCd;
301
-			// 		if(isPush) {
302
-			// 			_this.rows.push(item);
303
-			// 		}
304
-			// 		_this.rtnReqAmtTot();
305
-			// 		$('.list-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
306
-			// 		$('.list-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
307
-			// 	};
308
-			// 	var fnChkExist = function() {
309
-			// 		var isExist = false;
310
-			// 		$.each(_this.rows, function(i, row) {
311
-			// 			if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
312
-			// 				if(row.viewCd === 'D') {
313
-			// 					item.viewCd = 'U';
314
-			// 					append(false);
315
-			// 				} else {
316
-			// 					itp_fn_modal_alert('이미 존재하는 품목입니다.');
317
-			// 				}
318
-			// 				isExist = true;
319
-			// 				return false;
320
-			// 			}
321
-			// 		});
322
-			// 		if(!isExist) {
323
-			// 			append(true);
324
-			// 		}
325
-			// 	};
326
-			// 	fnChkExist();
327
-			// },
328 299
 			detachRow: function () {
329 300
 				if($('#ITP_LIST_MRTNMNG02010_MODIFY_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
330 301
 					var _this = this;
@@ -436,6 +407,7 @@ let mobPopObj = {
436 407
 					$li.find('#ITP_FORM_MRTNMNG02010_POP_ITEM_CHECKBOX').val(item.itemId);
437 408
 					$li.find('.fnItemNm').text(item.itemNm);
438 409
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
410
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(item.unitAmt));
439 411
 				});
440 412
 				mobPopObj.popItem.addRow.init();
441 413
 			};
@@ -454,8 +426,8 @@ let mobPopObj = {
454 426
 						switch (id) {
455 427
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS'	: _this.actPlus($(this)); 		break;
456 428
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS'	: _this.actMinus($(this)); 		break;
457
-							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.addItems(); 			break;
458
-							// case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.actItemAdd($(this)); 	break;
429
+							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'		: _this.addItems(); 			break;
430
+							// case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'		: _this.actItemAdd($(this)); 	break;
459 431
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH'	: mobPopObj.popItem.search(); 	break;
460 432
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_CLOSE'	: mobPopObj.hide(id); 			break;
461 433
 						}
@@ -466,6 +438,7 @@ let mobPopObj = {
466 438
 					var $div = $(elem).siblings('div');
467 439
 					var num = Number($div.text());
468 440
 					$($div).text((num + 1).toString());
441
+					this.reqAmtUnit(elem, $($div).text());
469 442
 				},
470 443
 				actMinus: function(elem) {
471 444
 					var $div = $(elem).siblings('div');
@@ -474,13 +447,23 @@ let mobPopObj = {
474 447
 						itp_fn_modal_alert('수량을 확인하세요.');
475 448
 					} else {
476 449
 						$($div).text((num - 1).toString());
450
+						this.reqAmtUnit(elem, $($div).text());
477 451
 					}
478 452
 				},
453
+				reqAmtUnit: function(elem, qty) {
454
+					var $li = $(elem).closest('li');
455
+					var unitAmt = CommonObj.onlyNumber($li.find('.fnUnitAmt').text());
456
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(unitAmt ? unitAmt : 0) * Number(qty)));
457
+				},
479 458
 				actItemAdd: function(elem) {
480
-					var index = $(elem).closest('li').index();
481
-					var item = mobPopObj.popItem.rows[index];
482
-					item['rtnQty'] = $(elem).closest('li').find('.fnRtnQty').html();
483
-					mobContObj.modify.list.attachRow(item, 'C');
459
+					var $li = $(elem).closest('li');
460
+					var item = mobPopObj.popItem.rows[$li.index()];
461
+					item['viewCd'] = 'C';
462
+					item['rtnQty'] = $li.find('.fnRtnQty').html();
463
+					// var index = $(elem).closest('li').index();
464
+					// var item = mobPopObj.popItem.rows[index];
465
+					// item['pchReqQty'] = $(elem).closest('li').find('.fnPchReqQty').html();
466
+					mobContObj.list.attachRow(item);
484 467
 				},
485 468
 				addItems: function() {
486 469
 					var items = [];
@@ -488,6 +471,7 @@ let mobPopObj = {
488 471
 						if($(this).is(':checked')) {
489 472
 							var index = $(this).closest('li').index();
490 473
 							var item = mobPopObj.popItem.rows[index];
474
+							item['viewCd'] = 'C';
491 475
 							item['rtnQty'] = $(this).closest('li').find('.fnRtnQty').html();
492 476
 							items.push(item);
493 477
 						}
@@ -507,7 +491,7 @@ let mobPopObj = {
507 491
 		close: function() {
508 492
 			this.rows.length = 0;
509 493
 			$('#ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS').children().remove();
510
-			mobPopObj.hide(this.popId);
494
+			mobPopObj.hide('ITP_POP_MRTNMNG02010_ITEM_AREA');
511 495
 		}
512 496
 	},
513 497
 	popWhsNm: {

+ 9 - 0
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG05010.js

@@ -34,6 +34,11 @@ let mobPageObj = {
34 34
 				}
35 35
 			});
36 36
 
37
+			if(fn_make_user_info.get('authTpCd') === '50') {
38
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_BTN_MRTNMNG05010_LIST_SEARCH_SPPLY_NM').attr('disabled', true);
39
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_BTN_MRTNMNG05010_LIST_DELETE_SPPLY_NM').attr('disabled', true);
40
+			}
41
+
37 42
 			// 조회일자 지정
38 43
 			$('#ITP_MOBILE_MRTNMNG05010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39 44
 			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
@@ -58,6 +63,7 @@ let mobPageObj = {
58 63
 					case 'ITP_BTN_MRTNMNG05010_LIST_DELETE_SPPLY_NM'	: mobPopObj.popSpply.delete(); 	break;
59 64
 					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH'				: mobContObj.list.search();		break;
60 65
 					case 'ITP_BTN_MRTNMNG05010_LIST_MODIFY'				: mobContObj.list.save();		break;
66
+					case 'ITP_BTN_MRTNMNG05010_LIST_CANCEL'				: mobContObj.list.cancel();				break;
61 67
 				}
62 68
 				return false;
63 69
 			});
@@ -208,6 +214,9 @@ let mobContObj = {
208 214
 				}
209 215
 			};
210 216
 			itp_fn_modal_confirm('반품처리 하시겠습니까?', modalFn);
217
+		},
218
+		cancel: function() {
219
+			$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
211 220
 		}
212 221
 	}
213 222
 };

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

@@ -34,6 +34,11 @@ let mobPageObj = {
34 34
 				}
35 35
 			});
36 36
 
37
+			if(fn_make_user_info.get('authTpCd') === '50') {
38
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_BTN_MRTNMNG06010_LIST_SEARCH_SPPLY_NM').attr('disabled', true);
39
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_BTN_MRTNMNG06010_LIST_DELETE_SPPLY_NM').attr('disabled', true);
40
+			}
41
+
37 42
 			// 조회일자 지정
38 43
 			$('#ITP_MOBILE_MRTNMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39 44
 			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));