Переглянути джерело

모바일 디자인 적용

juney 2 роки тому
батько
коміт
4c184add4f

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

@@ -131,9 +131,9 @@
131 131
 				<div class="line top6">
132 132
 				  <label>거래일자</label>
133 133
 				  <div class="date_to">
134
-					<input id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
135
-					<div style="margin:4px;">~</div>
136
-					<input id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_TO_DT" name="toDt" class="year" type="date">
134
+					  <input type="text" id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
135
+					  <div style="margin:4px;">~</div>
136
+					  <input type="text" id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_TO_DT" name="toDt" class="itp_input date">
137 137
 				  </div>
138 138
 				</div>
139 139
 				<div class="line">
@@ -171,7 +171,7 @@
171 171
 					  </div>
172 172
 					  <div class="detail_right">
173 173
 						<div class="detail_info">
174
-						  <div class="fnDstpAmt"></div>
174
+						  <div class="fnPaymAmt"></div>
175 175
 						</div>
176 176
 					  </div>
177 177
 					</div>

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

@@ -241,7 +241,7 @@
241 241
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1">
242 242
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
243 243
         <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- display:grid -->
244
-          <li class="list-row">
244
+          <li class="item-row">
245 245
             <div class="left_info">
246 246
               <div class="check_box">
247 247
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />

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

@@ -69,35 +69,35 @@
69 69
 					<div class="nomal">
70 70
 					  <label class="col_3">발주일자</label>
71 71
 					  <span>:</span>
72
-					  <div class="fnPodrDt">2022.10.10</div>
73
-					  <div class="fnPodrMgrNm">(홍길동)</div>
72
+					  <div class="fnPodrDt"></div>
73
+					  <div class="fnPodrMgrNm">($)</div>
74 74
 					</div>
75 75
 				  </div>
76 76
 				  <div class="left">
77 77
 					<div class="nomal">
78 78
 					  <label class="col_3">발주상태</label>
79 79
 					  <span>:</span>
80
-					  <div class="fnPchodrStCd">발주가능</div>
80
+					  <div class="fnPchodrStCd"></div>
81 81
 					  <label>납품장소명</label>
82 82
 					  <span>:</span>
83
-					  <div class="fnLocationNm">테스트 납품장솝명 ㄴㅇㄻㄴㅇ</div>
83
+					  <div class="fnLocationNm"></div>
84 84
 					</div>
85 85
 				  </div>
86 86
 				  <div class="left">
87 87
 					<div class="nomal">
88 88
 					  <label class="col_3">품목수</label>
89 89
 					  <span>:</span>
90
-					  <div class="fnItemQty">1,000,000</div>
90
+					  <div class="fnPodrItemQty"></div>
91 91
 					  <label>금액</label>
92 92
 					  <span>:</span>
93
-					  <div class="fnPodrTotalAmt">12,000,000</div>
93
+					  <div class="fnPodrTotalAmt"></div>
94 94
 					</div>
95 95
 				  </div>
96 96
 				  <div class="left">
97 97
 					<div class="nomal">
98 98
 					  <label class="col_3">공급업체</label>
99 99
 					  <span>:</span>
100
-					  <div class="full fnSpplyNm">테스트 공금상ㅁㄴㄹ</div>
100
+					  <div class="full fnSpplyNm"></div>
101 101
 					</div>
102 102
 				  </div>
103 103
 				</li>
@@ -134,13 +134,13 @@
134 134
 				<div class="line">
135 135
 				  <label>납품장소</label>
136 136
 				  <div class="line_right">
137
-					<div class="fnShmtWhsNm"></div>
137
+					<div class="fnWhsNm"></div>
138 138
 				  </div>
139 139
 				</div>
140 140
 				<div class="line">
141 141
 				  <label>공급업체</label>
142 142
 				  <div class="line_right">
143
-					<div class="fnWhsNm"></div>
143
+					<div class="fnSpplyNm"></div>
144 144
 				  </div>
145 145
 				</div>
146 146
 				<div class="table_header">
@@ -151,7 +151,7 @@
151 151
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
152 152
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
153 153
 			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
154
-				<li class="history_list8">
154
+				<li class="history_list8 item-row">
155 155
 				  <div class="left">
156 156
 					<div class="nomal">
157 157
 					  <label class="col_1">품목명</label>

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

@@ -135,17 +135,17 @@
135 135
 		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-7">
136 136
 			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
137 137
 			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
138
-				<li class="list-row">
138
+				<li class="item-row">
139 139
 					<div class="left_info">
140 140
 						<div class="thick">
141 141
 							<label>품목명</label>
142 142
 							<span>:</span>
143
-							<div class="itp_item fnItemNm">테스트용 길다란 품목명 제목</div>
143
+							<div class="itp_item fnItemNm"></div>
144 144
 						</div>
145 145
 						<div class="thick">
146 146
 							<label>구매가</label>
147 147
 							<span>:</span>
148
-							<div class="itp_amt fnRtnAmt">10,000,000</div>
148
+							<div class="itp_amt fnRtnAmt"></div>
149 149
 						</div>
150 150
 					</div>
151 151
 					<div class="right">
@@ -208,7 +208,7 @@
208 208
 			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-7">
209 209
 				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
210 210
 				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- style="display: gird;" -->
211
-					<li class="list-row">
211
+					<li class="item-row">
212 212
 						<div class="left_info">
213 213
 							<div class="check_box"><!-- class 변경 -->
214 214
 								<input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
@@ -216,12 +216,12 @@
216 216
 							<div class="thick">
217 217
 								<label>품목명</label>
218 218
 								<span>:</span>
219
-								<div class="itp_item fnItemNm">품목명</div>
219
+								<div class="itp_item fnItemNm"></div>
220 220
 							</div>
221 221
 							<div class="thick">
222 222
 								<label>구매가</label>
223 223
 								<span>:</span>
224
-								<div class="itp_amt fnUnitAmt">10,000,000</div>
224
+								<div class="itp_amt fnUnitAmt"></div>
225 225
 							</div>
226 226
 						</div>
227 227
 						<div class="right">

+ 6 - 5
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG01010.js

@@ -134,7 +134,7 @@ let mobContentObj = {
134 134
 				_this.totPage = result.gridTotal;
135 135
 				$.each(result.gridRows, function (i, item) {
136 136
 					$('#ITP_LIST_MLOANMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWCOPY').html());
137
-					var $li = $('#ITP_LIST_MLOANMNG01010_LIST_ITEM_AREA .panel-group > .history_list:last');
137
+					var $li = $('#ITP_LIST_MLOANMNG01010_LIST_ITEM_AREA .panel-group > .item-row:last');
138 138
 					$li.find('.fnStoreNm').text(item.storeNm);
139 139
 					$li.find('.fnLoanDvsnNm').text(item.loanDvsnNm);
140 140
 					var limitAmt = (item.loanDvsn === 'LD01') ? limitAmt = item.chrgeLimitAmt : limitAmt = item.credtLimitAmt;
@@ -194,8 +194,9 @@ let mobContentObj = {
194 194
 			rows: [],
195 195
 			init: function(loanMgntUnqNo) {
196 196
 				// 조회일자 지정
197
-				$('#ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
198
-				$('#ITP_FORM_MLOANMNG01010_VIEW_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
197
+				$('#ITP_MOBILE_MLOANMNG01010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
198
+				$('#ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
199
+				$('#ITP_FORM_MLOANMNG01010_VIEW_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
199 200
 				this.loanMgntUnqNo = loanMgntUnqNo;
200 201
 				this.search();
201 202
 			},
@@ -218,8 +219,8 @@ let mobContentObj = {
218 219
 						var $li = $('#ITP_LIST_MLOANMNG01010_VIEW_ITEM_AREA .panel-group > .item-row:last');
219 220
 						$li.find('.fnLoanRegDt').text(item.loanRegDt);
220 221
 						$li.find('.fnDpstPayDvsnNm').text(item.dpstPayDvsnNm);
221
-						$li.find('.fnDstpAmt').text(item.dstpAmt);
222
-						$li.find('.fnTrscAfBal').text(item.trscAfBal);
222
+						$li.find('.fnPaymAmt').text(CommonObj.currency.add(CommonObj.nullToString(item.dpstPayDvsnNm === 'D' ? item.dpstAmt : item.paymAmt)));
223
+						$li.find('.fnTrscAfBal').text(CommonObj.currency.add(item.trscAfBal));
223 224
 						$li.find('.fnUse').text(item.use);
224 225
 						_this.rows.push(item);
225 226
 					});

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

@@ -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'			: mobContentObj.list.search();					break;
75
+					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH'			: mobContObj.list.search();					break;
76 76
 				}
77 77
 				return false;
78 78
 			});
@@ -80,7 +80,7 @@ let mobPageObj = {
80 80
 			$('button[id^="ITP_BTN_MPOMNG02010_VIEW"]').on('click', function() {
81 81
 				var id = $(this).attr('id');
82 82
 				switch (id) {
83
-					case 'ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST'		: mobContentObj.detail.cancel();	break;
83
+					case 'ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST'		: mobContObj.detail.cancel();	break;
84 84
 				}
85 85
 				return false;
86 86
 			});
@@ -91,8 +91,8 @@ let mobPageObj = {
91 91
 					case 'ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(VIEW_MODE_MODIFY); 	break;
92 92
 					case 'ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(VIEW_MODE_MODIFY); 	break;
93 93
 					case 'ITP_BTN_MPOMNG02010_MODIFY_ADD_ROW'			: mobPopObj.popItem.init();						break;
94
-					case 'ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW'			: mobContentObj.modify.list.detachRow();		break;
95
-					case 'ITP_BTN_MPOMNG02010_MODIFY_CANCEL'			: mobContentObj.modify.cancel();				break;
94
+					case 'ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW'			: mobContObj.modify.list.detachRow();			break;
95
+					case 'ITP_BTN_MPOMNG02010_MODIFY_CANCEL'			: mobContObj.modify.cancel();					break;
96 96
 					case 'ITP_BTN_MPOMNG02010_MODIFY_REQ_ORDER'			: mobPopObj.popReqConfirm.init(PCH_REQ_ST_CD_REQUEST_SAVE);	break;
97 97
 					case 'ITP_BTN_MPOMNG02010_MODIFY_TEMP_SAVE'			: mobPopObj.popReqConfirm.init(PCH_REQ_ST_CD_TEMP_SAVE);	break;
98 98
 				}
@@ -121,11 +121,11 @@ let mobPageObj = {
121 121
 		this.viewMode = mode;
122 122
 	},
123 123
 	ready: function() {
124
-		mobContentObj.list.init();
124
+		mobContObj.list.init();
125 125
 	}
126 126
 };
127 127
 
128
-let mobContentObj = {
128
+let mobContObj = {
129 129
 	list: {
130 130
 		listPage: 1,
131 131
 		rows: [],
@@ -138,19 +138,19 @@ let mobContentObj = {
138 138
 			this.rows.length = 0;
139 139
 			$('#ITP_LIST_MPOMNG02010_ITEM_ROWS').children().remove();
140 140
 			setTimeout(function() {
141
-				mobContentObj.list.load();
141
+				mobContObj.list.load();
142 142
 			}, 100);
143 143
 		},
144 144
 		pager: function(totPage) {
145 145
 			(this.listPage < totPage) ?
146
-				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', true, mobContentObj.list.load) :
146
+				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', true, mobContObj.list.load) :
147 147
 				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', false);
148 148
 			this.listPage += 1;
149 149
 		},
150 150
 		load: function() {
151 151
 			var callbackFn = function(result) {
152 152
 				console.log(result);
153
-				mobContentObj.list.pager(result.gridTotal);
153
+				mobContObj.list.pager(result.gridTotal);
154 154
 				$.each(result.gridRows, function (i, item) {
155 155
 					$('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_ITEM_ROWCOPY').html());
156 156
 					var $li = $('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group > .item-row:last');
@@ -164,12 +164,12 @@ let mobContentObj = {
164 164
 					$li.find('.fnPchReqTotalAmt').text(CommonObj.currency.add(item.pchReqTotalAmt));
165 165
 					$li.find('.fnPchReqRjctDt').text(item.pchReqRjctDt);
166 166
 					$li.find('.fnPchReqRjctNm').text(item.pchReqRjctNm);
167
-					mobContentObj.list.rows.push(item);
167
+					mobContObj.list.rows.push(item);
168 168
 				});
169
-				mobContentObj.list.action();
169
+				mobContObj.list.action();
170 170
 			};
171 171
 			const param = $('#ITP_FORM_MPOMNG02010_LIST_SEARCH').serializeObject();
172
-			param.gridPage = mobContentObj.list.listPage;
172
+			param.gridPage = mobContObj.list.listPage;
173 173
 			param.gridSize = mobile_list_size;
174 174
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
175 175
 		},
@@ -179,7 +179,7 @@ let mobContentObj = {
179 179
 			$(document).on('click', '#ITP_LIST_MPOMNG02010_ITEM_ROWS li', function() {
180 180
 				var index = $(this).index();
181 181
 				var item = _this.rows[index];
182
-				(item.pchReqStCd === PCH_REQ_ST_CD_TEMP_SAVE) ? mobContentObj.modify.init(item) : mobContentObj.detail.init(item);
182
+				(item.pchReqStCd === PCH_REQ_ST_CD_TEMP_SAVE) ? mobContObj.modify.init(item) : mobContObj.detail.init(item);
183 183
 			});
184 184
 		}
185 185
 	},
@@ -214,7 +214,7 @@ let mobContentObj = {
214 214
 				$li.find('.fnItemNm').text(item.itemNm);
215 215
 				$li.find('.fnPchReqQty').text(item.pchReqQty + ' ' + item.unit);
216 216
 				$li.find('.fnPchReqAmt').text(CommonObj.currency.add(item.pchReqAmt));
217
-				mobContentObj.detail.rows.push(item);
217
+				mobContObj.detail.rows.push(item);
218 218
 			});
219 219
 		},
220 220
 		cancel: function () {
@@ -271,47 +271,76 @@ let mobContentObj = {
271 271
 			rows: [],
272 272
 			init: function(pchReqDtlList) {
273 273
 				var _this = this;
274
+				var existRows = [];
274 275
 				$.each(pchReqDtlList, function (i, item) {
275 276
 					item['viewCd'] = 'U';
276
-					_this.attachRow(item);
277
+					existRows.push(item);
277 278
 				});
279
+				this.attachRow(existRows);
278 280
 			},
279
-			attachRow: function (item) {
281
+			attachRow: function (items) {
280 282
 				var _this = this;
281
-				var append = function(isPush) {
282
-					$('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY').html());
283
-					var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .item-row:last');
284
-					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
285
-					$li.find('.fnItemNm').text(item.itemNm);
286
-					$li.find('.fnPchReqQty').text(item.pchReqQty);
287
-					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
288
-					$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
289
-					$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
290
-					if(isPush) {
291
-						_this.rows.push(item);
292
-					}
293
-					_this.pchReqAmtTot();
294
-				};
295
-				var fnIsExist = function() {
283
+				var fnIsExist = function(rows, item) {
296 284
 					var isExist = false;
297
-					$.each(_this.rows, function(i, row) {
285
+					$.each(rows, function(i, row) {
298 286
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
299
-							if(row.viewCd === 'D') {
300
-								item.viewCd = 'U';
301
-								append(false);
302
-							} else {
303
-								itp_fn_modal_alert('이미 존재하는 품목입니다.');
304
-							}
305 287
 							isExist = true;
306 288
 							return false;
307 289
 						}
308 290
 					});
309 291
 					return isExist;
310 292
 				};
311
-				if(!fnIsExist(this.rows)) {
312
-					append(true);
313
-				}
293
+				$.each(items, function(i, item) {
294
+					if(!fnIsExist(_this.rows, item)) {
295
+						_this.rows.push(item);
296
+						$('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY').html());
297
+						var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .item-row:last');
298
+						$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
299
+						$li.find('.fnItemNm').text(item.itemNm);
300
+						$li.find('.fnPchReqQty').text(item.pchReqQty);
301
+						$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
302
+						$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
303
+						$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
304
+						_this.pchReqAmtTot();
305
+					}
306
+				});
314 307
 			},
308
+			// attachRow: function (item) {
309
+			// 	var _this = this;
310
+			// 	var append = function(isPush) {
311
+			// 		$('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY').html());
312
+			// 		var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .item-row:last');
313
+			// 		$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
314
+			// 		$li.find('.fnItemNm').text(item.itemNm);
315
+			// 		$li.find('.fnPchReqQty').text(item.pchReqQty);
316
+			// 		$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
317
+			// 		$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
318
+			// 		$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
319
+			// 		if(isPush) {
320
+			// 			_this.rows.push(item);
321
+			// 		}
322
+			// 		_this.pchReqAmtTot();
323
+			// 	};
324
+			// 	var fnIsExist = function() {
325
+			// 		var isExist = false;
326
+			// 		$.each(_this.rows, function(i, row) {
327
+			// 			if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
328
+			// 				if(row.viewCd === 'D') {
329
+			// 					item.viewCd = 'U';
330
+			// 					append(false);
331
+			// 				} else {
332
+			// 					itp_fn_modal_alert('이미 존재하는 품목입니다.');
333
+			// 				}
334
+			// 				isExist = true;
335
+			// 				return false;
336
+			// 			}
337
+			// 		});
338
+			// 		return isExist;
339
+			// 	};
340
+			// 	if(!fnIsExist(this.rows)) {
341
+			// 		append(true);
342
+			// 	}
343
+			// },
315 344
 			detachRow: function () {
316 345
 				if($('#ITP_LIST_MPOMNG02010_MODIFY_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
317 346
 					var _this = this;
@@ -422,7 +451,8 @@ let mobPopObj = {
422 451
 						switch (id) {
423 452
 							case 'ITP_BTN_MPOMNG02010_POP_ITEM_PLUS'	: _this.actPlus($(this)); 		break;
424 453
 							case 'ITP_BTN_MPOMNG02010_POP_ITEM_MINUS'	: _this.actMinus($(this)); 		break;
425
-							case 'ITP_BTN_MPOMNG02010_POP_ITEM_ADD'		: _this.actItemAdd($(this)); 	break;
454
+							case 'ITP_BTN_MPOMNG02010_POP_ITEM_ADD'		: _this.addItems(); 			break;
455
+							// case 'ITP_BTN_MPOMNG02010_POP_ITEM_ADD'		: _this.actItemAdd($(this)); 	break;
426 456
 							case 'ITP_BTN_MPOMNG02010_POP_ITEM_SEARCH'	: mobPopObj.popItem.search(); 	break;
427 457
 							case 'ITP_BTN_MPOMNG02010_POP_ITEM_CLOSE'	: mobPopObj.hide(id); 			break;
428 458
 						}
@@ -448,12 +478,34 @@ let mobPopObj = {
448 478
 					var item = mobPopObj.popItem.rows[$li.index()];
449 479
 					item['viewCd'] = 'C';
450 480
 					item['pchReqQty'] = $li.find('.fnPchReqQty').html();
451
-					mobContentObj.modify.list.attachRow(item);
481
+					mobContObj.modify.list.attachRow(item);
482
+				},
483
+				addItems: function() {
484
+					var items = [];
485
+					$('#ITP_LIST_MPOMNG02010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
486
+						if($(this).is(':checked')) {
487
+							var index = $(this).closest('li').index();
488
+							var item = mobPopObj.popItem.rows[index];
489
+							item['pchReqQty'] = $(this).closest('li').find('.fnPchReqQty').html();
490
+							items.push(item);
491
+						}
492
+					});
493
+					if(items.length > 0) {
494
+						mobContObj.modify.list.attachRow(items);
495
+						mobPopObj.popItem.close();
496
+					} else {
497
+						itp_fn_modal_alert('품목을 선택하세요.');
498
+					}
452 499
 				}
453 500
 			}
454 501
 		},
455 502
 		delRow: function() {
456 503
 
504
+		},
505
+		close: function() {
506
+			this.rows.length = 0;
507
+			$('#ITP_LIST_MPOMNG02010_POP_ITEM_ROWS').children().remove();
508
+			mobPopObj.hide(this.popId);
457 509
 		}
458 510
 	},
459 511
 	popWhsNm: {
@@ -476,7 +528,6 @@ let mobPopObj = {
476 528
 			};
477 529
 			const param = $('#ITP_FORM_MPOMNG02010_POP_WHS').serializeObject();
478 530
 			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = (mobPageObj.viewMode === VIEW_MODE_LIST) ? '' : 'W01';
479
-			console.log(param);
480 531
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
481 532
 		},
482 533
 		view: function(gridRows) {
@@ -527,7 +578,6 @@ let mobPopObj = {
527 578
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_ID').val('');
528 579
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').val('');
529 580
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOCATION').val('');
530
-				mobPopObj.hide(ID_ITP_POP_MPOMNG02010_WHS_AREA);
531 581
 			}
532 582
 		}
533 583
 	},
@@ -611,7 +661,7 @@ let mobPopObj = {
611 661
 				var gridInsertData = [];
612 662
 				var gridUpdateData = [];
613 663
 				var gridDeleteData = [];
614
-				$.each(mobContentObj.modify.list.rows, function(i, item) {
664
+				$.each(mobContObj.modify.list.rows, function(i, item) {
615 665
 					if(item.viewCd === 'D') {
616 666
 						gridDeleteData.push(item);
617 667
 					} else if(item.viewCd === 'C') {
@@ -627,7 +677,7 @@ let mobPopObj = {
627 677
 				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
628 678
 				var saveFn = function (result) {
629 679
 					mobPopObj.hide('ITP_POP_MPOMNG02010_REQ_AREA');
630
-					if(isReload) mobContentObj.list.init();
680
+					if(isReload) mobContObj.list.init();
631 681
 				};
632 682
 				console.log(param);
633 683
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');

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

@@ -130,12 +130,12 @@ let mobContentObj = {
130 130
 					$('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY').html());
131 131
 					var $li = $('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group > .list-row2:last');
132 132
 					$li.find('.fnPodrDt').text(item.podrDt);
133
-					$li.find('.fnPodrMgrNm').text(item.podrMgrNm);
133
+					$li.find('.fnPodrMgrNm').text($li.find('.fnPodrMgrNm').text().replace('$', item.podrMgrNm));
134 134
 					$li.find('.fnPchodrStCd').text(item.pchOdrStNm);
135 135
 					$li.find('.fnLocationNm').text(item.whsNm);
136 136
 					// $li.find('.fnLocationNm').text(item.whsNm + ' - ' + item.locationNm);
137
-					$li.find('.fnItemQty').text($li.find('.fnItemQty').text().replace('$', item.podrItemQty));
138
-					$li.find('.fnPodrTotalAmt').text(CommonObj.comma.set(item.podrTotalAmt));
137
+					$li.find('.fnPodrItemQty').text(CommonObj.comma.set(item.podrItemQty));
138
+					$li.find('.fnPodrTotalAmt').text(CommonObj.currency.add(item.podrTotalAmt));
139 139
 					$li.find('.fnSpplyNm').text(item.spplyNm);
140 140
 					mobContentObj.list.rows.push(item);
141 141
 				});
@@ -165,15 +165,15 @@ let mobContentObj = {
165 165
 			var id = '#ITP_AJAX_MPOMNG04010_VIEW_CONTAINER';
166 166
 			$(id).find('.fnPodrDt').text(result.podrDt);
167 167
 			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
168
-			$(id).find('.fnShmtWhsNm').text(result.shmtWhsNm);
169
-			$(id).find('.fnWhsNm').text(result.whsNm);
170 168
 			$(id).find('.fnDlvReqDt').text(result.dlvReqDt);
169
+			$(id).find('.fnWhsNm').text(result.whsNm);
170
+			$(id).find('.fnSpplyNm').text(result.spplyNm);
171 171
 			$.each(result.pchOdrDtlList, function (i, item) {
172 172
 				$('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY').html());
173
-				var $li = $('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group > .list-row2:last');
173
+				var $li = $('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group > .item-row:last');
174 174
 				$li.find('.fnItemNm').text(item.itemNm);
175 175
 				$li.find('.fnUnit').text(item.unit);
176
-				$li.find('.fnPodrQty').text(CommonObj.currency.add(item.podrQty));
176
+				$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty + ' ' + item.unit));
177 177
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
178 178
 				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
179 179
 			});
@@ -182,7 +182,8 @@ let mobContentObj = {
182 182
 			var id = '#ITP_AJAX_MPOMNG04010_VIEW_CONTAINER';
183 183
 			$(id).find('.fnPodrDt').text('');
184 184
 			$(id).find('.fnPodrTotalAmt').text('');
185
-			$(id).find('.fnShmtWhsDvsnNm').text('');
185
+			$(id).find('.fnDlvReqDt').text('');
186
+			$(id).find('.fnWhsNm').text('');
186 187
 			$(id).find('.fnSpplyNm').text('');
187 188
 			$('#ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA .panel-group').empty();
188 189
 			mobPageObj.switchScreen(PAGE_MODE_LIST);

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

@@ -123,8 +123,8 @@ let mobContentObj = {
123 123
 					$li.find('.fnSpplyNm').text(item.spplyNm);
124 124
 					$li.find('.fnWhsNm').text(item.whsNm);
125 125
 					$li.find('.fnItemNm').text(item.itemNm);
126
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
127
-					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
126
+					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty + ' ' + item.unit));
127
+					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty + ' ' + item.unit));
128 128
 					mobContentObj.list.rows.push(item);
129 129
 				});
130 130
 			};

+ 100 - 47
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -62,7 +62,7 @@ let mobPageObj = {
62 62
 				switch (id) {
63 63
 					case 'ITP_BTN_MRTNMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_LIST); 		break;
64 64
 					case 'ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_LIST); 	break;
65
-					case 'ITP_BTN_MRTNMNG02010_LIST_SEARCH'			: mobContentObj.list.search();					break;
65
+					case 'ITP_BTN_MRTNMNG02010_LIST_SEARCH'			: mobContObj.list.search();					break;
66 66
 				}
67 67
 				return false;
68 68
 			});
@@ -70,7 +70,7 @@ let mobPageObj = {
70 70
 			$('button[id^="ITP_BTN_MRTNMNG02010_DETAIL"]').on('click', function() {
71 71
 				var id = $(this).attr('id');
72 72
 				switch (id) {
73
-					case 'ITP_BTN_MRTNMNG02010_DETAIL_CANCEL_LIST'		: mobContentObj.detail.cancel();	break;
73
+					case 'ITP_BTN_MRTNMNG02010_DETAIL_CANCEL_LIST'		: mobContObj.detail.cancel();	break;
74 74
 				}
75 75
 				return false;
76 76
 			});
@@ -81,8 +81,8 @@ let mobPageObj = {
81 81
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_MODIFY); 	break;
82 82
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_MODIFY); 	break;
83 83
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW'			: mobPopObj.popItem.init();						break;
84
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW'			: mobContentObj.modify.list.detachRow();		break;
85
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_CANCEL'			: mobContentObj.modify.cancel();				break;
84
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW'			: mobContObj.modify.list.detachRow();		break;
85
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_CANCEL'			: mobContObj.modify.cancel();				break;
86 86
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER'		: mobPopObj.popReqConfirm.init(RTN_REQ_ST_CD_REQUEST_SAVE);	break;
87 87
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_TEMP_SAVE'		: mobPopObj.popReqConfirm.init(RTN_REQ_ST_CD_TEMP_SAVE);	break;
88 88
 				}
@@ -91,15 +91,15 @@ let mobPageObj = {
91 91
 
92 92
 			$(document).on('click', '#ITP_LIST_MRTNMNG02010_LIST_ROWS li', function() {
93 93
 				var index = $(this).index();
94
-				var item = mobContentObj.list.rows[index];
95
-				(item.rtnReqStCd === RTN_REQ_ST_CD_TEMP_SAVE) ? mobContentObj.modify.init(item) : mobContentObj.detail.init(item);
94
+				var item = mobContObj.list.rows[index];
95
+				(item.rtnReqStCd === RTN_REQ_ST_CD_TEMP_SAVE) ? mobContObj.modify.init(item) : mobContObj.detail.init(item);
96 96
 			});
97 97
 
98 98
 			// $(document).on('click', '#ITP_LIST_MRTNMNG02010_MODIFY_ROWS li', function(e) {
99 99
 			// 	if($(e.target).hasClass('DETAIL_ITEM_PLUS')) {
100
-			// 		mobContentObj.modify.list.actPlus($(this));
100
+			// 		mobContObj.modify.list.actPlus($(this));
101 101
 			// 	} else if($(e.target).hasClass('DETAIL_ITEM_MINUS')) {
102
-			// 		mobContentObj.modify.list.actMinus($(this));
102
+			// 		mobContObj.modify.list.actMinus($(this));
103 103
 			// 	} else {
104 104
 			// 	}
105 105
 			// });
@@ -130,9 +130,9 @@ let mobPageObj = {
130 130
 		if(isScroll) {
131 131
 			$('#ITP_LIST_MRTNMNG02010_LIST_AREA').on('scroll', function () {
132 132
 				if($(this).scrollTop() + $(this).innerHeight() + 1 >= $(this)[0].scrollHeight) {
133
-					if(mobContentObj.list.totPage > mobContentObj.list.listPage) {
134
-						if(!mobContentObj.list.isSearch) {
135
-							mobContentObj.list.load();
133
+					if(mobContObj.list.totPage > mobContObj.list.listPage) {
134
+						if(!mobContObj.list.isSearch) {
135
+							mobContObj.list.load();
136 136
 						}
137 137
 					}
138 138
 				}
@@ -142,11 +142,11 @@ let mobPageObj = {
142 142
 		}
143 143
 	},
144 144
 	ready: function() {
145
-		mobContentObj.list.init();
145
+		mobContObj.list.init();
146 146
 	}
147 147
 };
148 148
 
149
-let mobContentObj = {
149
+let mobContObj = {
150 150
 	list: {
151 151
 		listSize: 10,
152 152
 		listPage: 0,
@@ -217,7 +217,7 @@ let mobContentObj = {
217 217
 			$(id).find('.fnRtnApprNm').text('(' + result.pchApprNm + ')' + CommonObj.currency.add(result.pchApprAmt));
218 218
 			$.each(result.rtnReqDtlList, function (i, item) {
219 219
 				$('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group').append($('#ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY').html());
220
-				var $li = $('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group > .list-row:last');
220
+				var $li = $('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group > .item-row:last');
221 221
 				$li.find('.fnItemNm').text(item.itemNm);
222 222
 				$li.find('.fnUnit').text(item.unit);
223 223
 				$li.find('.fnRtnAmt').text(CommonObj.comma.set(item.rtnAmt));
@@ -270,47 +270,77 @@ let mobContentObj = {
270 270
 			rows: [],
271 271
 			init: function(rtnReqDtlList) {
272 272
 				var _this = this;
273
+				var existRows = [];
273 274
 				$.each(rtnReqDtlList, function (i, item) {
274
-					_this.attachRow(item, 'U');
275
+					item['viewCd'] = 'U';
276
+					existRows.push(item);
275 277
 				});
278
+				this.attachRow(existRows);
276 279
 			},
277
-			attachRow: function (item, viewCd) {
280
+			attachRow: function (items) {
278 281
 				var _this = this;
279
-				var append = function(isPush) {
280
-					$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
281
-					var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .list-row:last');
282
-					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
283
-					$li.find('.fnItemNm').text(item.itemNm);
284
-					$li.find('.fnRtnQty').text(item.rtnReqItemQty);
285
-					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
286
-					item['viewCd'] = viewCd;
287
-					if(isPush) {
288
-						_this.rows.push(item);
289
-					}
290
-					_this.rtnReqAmtTot();
291
-					$('.list-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
292
-					$('.list-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
293
-				};
294
-				var fnChkExist = function() {
282
+				var fnIsExist = function(rows, item) {
295 283
 					var isExist = false;
296
-					$.each(_this.rows, function(i, row) {
284
+					$.each(rows, function(i, row) {
297 285
 						if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
298
-							if(row.viewCd === 'D') {
299
-								item.viewCd = 'U';
300
-								append(false);
301
-							} else {
302
-								itp_fn_modal_alert('이미 존재하는 품목입니다.');
303
-							}
304 286
 							isExist = true;
305 287
 							return false;
306 288
 						}
307 289
 					});
308
-					if(!isExist) {
309
-						append(true);
310
-					}
290
+					return isExist;
311 291
 				};
312
-				fnChkExist();
292
+				$.each(items, function(i, item) {
293
+					if(!fnIsExist(_this.rows, item)) {
294
+						_this.rows.push(item);
295
+						$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
296
+						var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .item-row:last');
297
+						$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
298
+						$li.find('.fnItemNm').text(item.itemNm);
299
+						// $li.find('.fnRtnQty').text(item.rtnQty);
300
+						$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
301
+						$('.item-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
302
+						$('.item-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
303
+						_this.rtnReqAmtTot();
304
+					}
305
+				});
313 306
 			},
307
+			// attachRow: function (item, viewCd) {
308
+			// 	var _this = this;
309
+			// 	var append = function(isPush) {
310
+			// 		$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
311
+			// 		var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .list-row:last');
312
+			// 		$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
313
+			// 		$li.find('.fnItemNm').text(item.itemNm);
314
+			// 		$li.find('.fnRtnQty').text(item.rtnReqItemQty);
315
+			// 		$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
316
+			// 		item['viewCd'] = viewCd;
317
+			// 		if(isPush) {
318
+			// 			_this.rows.push(item);
319
+			// 		}
320
+			// 		_this.rtnReqAmtTot();
321
+			// 		$('.list-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
322
+			// 		$('.list-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
323
+			// 	};
324
+			// 	var fnChkExist = function() {
325
+			// 		var isExist = false;
326
+			// 		$.each(_this.rows, function(i, row) {
327
+			// 			if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
328
+			// 				if(row.viewCd === 'D') {
329
+			// 					item.viewCd = 'U';
330
+			// 					append(false);
331
+			// 				} else {
332
+			// 					itp_fn_modal_alert('이미 존재하는 품목입니다.');
333
+			// 				}
334
+			// 				isExist = true;
335
+			// 				return false;
336
+			// 			}
337
+			// 		});
338
+			// 		if(!isExist) {
339
+			// 			append(true);
340
+			// 		}
341
+			// 	};
342
+			// 	fnChkExist();
343
+			// },
314 344
 			detachRow: function () {
315 345
 				if($('#ITP_LIST_MRTNMNG02010_MODIFY_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
316 346
 					var _this = this;
@@ -440,7 +470,8 @@ let mobPopObj = {
440 470
 						switch (id) {
441 471
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS'	: _this.actPlus($(this)); 		break;
442 472
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS'	: _this.actMinus($(this)); 		break;
443
-							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.actItemAdd($(this)); 	break;
473
+							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.addItems(); 			break;
474
+							// case 'ITP_BTN_MRTNMNG02010_POP_ITEM_ADD'	: _this.actItemAdd($(this)); 	break;
444 475
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH'	: mobPopObj.popItem.search(); 	break;
445 476
 							case 'ITP_BTN_MRTNMNG02010_POP_ITEM_CLOSE'	: mobPopObj.hide(id); 			break;
446 477
 						}
@@ -465,12 +496,34 @@ let mobPopObj = {
465 496
 					var index = $(elem).closest('li').index();
466 497
 					var item = mobPopObj.popItem.rows[index];
467 498
 					item['rtnQty'] = $(elem).closest('li').find('.fnRtnQty').html();
468
-					mobContentObj.modify.list.attachRow(item, 'C');
499
+					mobContObj.modify.list.attachRow(item, 'C');
500
+				},
501
+				addItems: function() {
502
+					var items = [];
503
+					$('#ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
504
+						if($(this).is(':checked')) {
505
+							var index = $(this).closest('li').index();
506
+							var item = mobPopObj.popItem.rows[index];
507
+							item['rtnQty'] = $(this).closest('li').find('.fnRtnQty').html();
508
+							items.push(item);
509
+						}
510
+					});
511
+					if(items.length > 0) {
512
+						mobContObj.modify.list.attachRow(items);
513
+						mobPopObj.popItem.close();
514
+					} else {
515
+						itp_fn_modal_alert('품목을 선택하세요.');
516
+					}
469 517
 				}
470 518
 			}
471 519
 		},
472 520
 		delRow: function() {
473 521
 
522
+		},
523
+		close: function() {
524
+			this.rows.length = 0;
525
+			$('#ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS').children().remove();
526
+			mobPopObj.hide(this.popId);
474 527
 		}
475 528
 	},
476 529
 	popWhsNm: {
@@ -586,7 +639,7 @@ let mobPopObj = {
586 639
 			var gridInsertData = [];
587 640
 			var gridUpdateData = [];
588 641
 			var gridDeleteData = [];
589
-			$.each(mobContentObj.modify.list.rows, function(index, item) {
642
+			$.each(mobContObj.modify.list.rows, function(index, item) {
590 643
 				// var item = {};
591 644
 				// item['brandUnitUnqNo']	= row.brandUnitUnqNo;
592 645
 				// item['itemId']			= row.itemId;
@@ -623,7 +676,7 @@ let mobPopObj = {
623 676
 			var saveFn = function (result) {
624 677
 				console.log(result);
625 678
 				mobPopObj.hide(_this.popId);
626
-				mobContentObj.list.init();
679
+				mobContObj.list.init();
627 680
 			};
628 681
 			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
629 682
 		}

+ 6 - 3
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG01010.js

@@ -30,6 +30,9 @@ let mobPageObj = {
30 30
 			this.info();
31 31
 		},
32 32
 		view: function() {
33
+			if(fn_make_user_info.get('authTpCd') === '50') {
34
+				$('#ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK').hide();
35
+			}
33 36
 		},
34 37
 		info: function() {
35 38
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -139,17 +142,17 @@ let mobContentObj = {
139 142
 				_this.totPage = result.gridTotal;
140 143
 				$.each(result.gridRows, function (i, item) {
141 144
 					$('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY').html());
142
-					var $li = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group > .list-row:last');
145
+					var $li = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group > .item-row:last');
143 146
 					$li.find('.fnWhsId').text(item.whsId);
144 147
 					$li.find('.fnWhsNm').text(item.whsNm);
148
+					$li.find('.fnLocationNm').text(CommonObj.nullToString(item.locationNm));
145 149
 					$li.find('.fnItemId').text(item.itemId);
146 150
 					$li.find('.fnItemNm').text(item.itemNm);
147 151
 					$li.find('.fnUnit').text(item.unit);
148 152
 					$li.find('.fnUnitQty').text(item.unitQty);
149 153
 					$li.find('.fnStckQty').text(item.stckQty);
150 154
 					$li.find('.fnPrpStckQty').text(item.prpStckQty);
151
-					$li.find('.fnSftStckRt').text(item.sftStckRt);
152
-					$li.find('.fnLocationNm').text(item.locationNm);
155
+					$li.find('.fnSftStckRt').text(CommonObj.nullToString(item.sftStckRt));
153 156
 					_this.rows.push(item);
154 157
 				});
155 158
 			};

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

@@ -811,12 +811,10 @@ let CommonObj = {
811 811
 	},
812 812
 	comma: {
813 813
 		set: function(str) {
814
-			str = String(str);
815
-			return str.replace(/(\d)(?=(?:\d{3})+(?!\d))/g, '$1,');
814
+			return String(str).replace(/(\d)(?=(?:\d{3})+(?!\d))/g, '$1,');
816 815
 		},
817 816
 		remove: function(str) {
818
-			str = String(str);
819
-			return str.replace(/[^\d]+/g, '');
817
+			return String(str).replace(/[^\d]+/g, '');
820 818
 		}
821 819
 	},
822 820
 	currency: {