Bläddra i källkod

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

yhl88 2 år sedan
förälder
incheckning
4e830a0284

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

@@ -218,9 +218,6 @@
218 218
 					<button id="ITP_BTN_MLOANMNG01010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
219 219
 				</form>
220 220
 			</div>
221
-			<div class="select_btn">
222
-				<button id="ITP_BTN_MLOANMNG01010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
223
-			</div>
224 221
 			<div id="ITP_LIST_MLOANMNG01010_POP_STORE_AREA" class="popup_scroll">
225 222
 				<ul id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
226 223
 				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -234,9 +234,6 @@
234 234
 					<button id="ITP_BTN_MLOANMNG02010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
235 235
 				</form>
236 236
 			</div>
237
-			<div class="select_btn">
238
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
239
-			</div>
240 237
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
241 238
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
242 239
 				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -309,9 +309,6 @@
309 309
 					<button id="ITP_BTN_MLOANMNG03010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
310 310
 				</form>
311 311
 			</div>
312
-			<div class="select_btn">
313
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
314
-			</div>
315 312
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
316 313
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
317 314
 				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -205,9 +205,6 @@
205 205
 					<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
206 206
 				</form>
207 207
 			</div>
208
-			<div class="select_btn">
209
-				<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
210
-			</div>
211 208
 			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
212 209
 				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
213 210
 				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: none;">
@@ -242,9 +239,6 @@
242 239
 					<button id="ITP_BTN_MPOMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
243 240
 				</form>
244 241
 			</div>
245
-			<div class="select_btn">
246
-				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_red">납품장소<img src="../img/arrow_down.png"></button>
247
-			</div>
248 242
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
249 243
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
250 244
 				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -34,7 +34,7 @@
34 34
 					<div class="line">
35 35
 						<label>공급업체</label>
36 36
 						<div class="float_left">
37
-							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="" readonly>
37
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" readonly>
38 38
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
39 39
 	           				<div class="itp_input_btn">
40 40
 								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -47,7 +47,7 @@
47 47
 					<div class="line">
48 48
 						<label>납품장소</label>
49 49
 						<div class="float_left">
50
-							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
50
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" readonly />
51 51
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
52 52
 	           				<div class="itp_input_btn">
53 53
 								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -60,7 +60,7 @@
60 60
 					<div class="line">
61 61
 						<label>품목명</label>
62 62
 						<div class="float_left name">
63
-							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
63
+							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text">
64 64
 						</div>
65 65
 					</div>
66 66
 					<div class="line">
@@ -162,9 +162,6 @@
162 162
 					<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
163 163
 				</form>
164 164
 			</div>
165
-			<div class="select_btn">
166
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
167
-			</div>
168 165
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
169 166
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
170 167
 				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -199,9 +196,6 @@
199 196
 					<button id="ITP_BTN_MPOMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
200 197
 				</form>
201 198
 			</div>
202
-			<div class="select_btn">
203
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
204
-			</div>
205 199
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
206 200
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
207 201
 				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -143,9 +143,6 @@
143 143
 					<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
144 144
 				</form>
145 145
 			</div>
146
-			<div class="select_btn">
147
-				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
148
-			</div>
149 146
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
150 147
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
151 148
 				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;;">
@@ -180,9 +177,6 @@
180 177
 					<button id="ITP_BTN_MPOMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
181 178
 				</form>
182 179
 			</div>
183
-			<div class="select_btn">
184
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_red">수거창고 <img src="../img/arrow_down.png"></button>
185
-			</div>
186 180
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
187 181
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
188 182
 				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -140,9 +140,6 @@
140 140
 					<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
141 141
 				</form>
142 142
 			</div>
143
-			<div class="select_btn">
144
-				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
145
-			</div>
146 143
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
147 144
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
148 145
 				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -177,9 +174,6 @@
177 174
 					<button id="ITP_BTN_MPOMNG07010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
178 175
 				</form>
179 176
 			</div>
180
-			<div class="select_btn">
181
-				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
182
-			</div>
183 177
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
184 178
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
185 179
 				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -130,9 +130,6 @@
130 130
 					<button id="ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
131 131
 				</form>
132 132
 			</div>
133
-			<div class="select_btn">
134
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
135
-			</div>
136 133
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
137 134
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
138 135
 				<div id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY" style="display: none;">
@@ -168,7 +165,6 @@
168 165
 				</div>
169 166
 				<div class="select_btn">
170 167
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="btn_blue ">추가</button>
171
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
172 168
 				</div>
173 169
 			</form>
174 170
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">

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

@@ -221,7 +221,7 @@
221 221
 						</div>
222 222
 						<div class="right">
223 223
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
224
-							<input id="ITP_MRTNMNG02010_MODIFY_NUM" class="">
224
+							<input type="number" id="ITP_MRTNMNG02010_MODIFY_NUM" class="" value="1" maxlength="5" data-brandUnitUnqNo="">
225 225
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
226 226
 						</div>
227 227
 					</li>
@@ -285,9 +285,6 @@
285 285
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
286 286
 				</form>
287 287
 			</div>
288
-			<div class="select_btn">
289
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
290
-			</div>
291 288
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
292 289
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
293 290
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: none;">
@@ -323,7 +320,6 @@
323 320
 				</div>
324 321
 				<div class="select_btn">
325 322
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="btn_blue ">추가</button>
326
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
327 323
 				</div>
328 324
 			</form>
329 325
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
@@ -340,7 +336,7 @@
340 336
 						</div>
341 337
 						<div class="right">
342 338
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
343
-							<input id="ITP_MRTNMNG02010_POP_NUM" class="">
339
+							<input type="number" id="ITP_MRTNMNG02010_POP_NUM" class="" value="1" maxlength="5">
344 340
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
345 341
 						</div>
346 342
 						<div class="scroll_right">

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

@@ -220,9 +220,6 @@
220 220
 					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
221 221
 				</form>
222 222
 			</div>
223
-			<div class="select_btn">
224
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
225
-			</div>
226 223
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
227 224
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
228 225
 				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">

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

@@ -142,9 +142,6 @@
142 142
 					<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
143 143
 				</form>
144 144
 			</div>
145
-			<div class="select_btn">
146
-				<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
147
-			</div>
148 145
 			<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
149 146
 				<ul id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
150 147
 				<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -179,9 +176,6 @@
179 176
 					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
180 177
 				</form>
181 178
 			</div>
182
-			<div class="select_btn">
183
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
184
-			</div>
185 179
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
186 180
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
187 181
 				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -133,9 +133,6 @@
133 133
 					<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
134 134
 				</form>
135 135
 			</div>
136
-			<div class="select_btn">
137
-				<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
138
-			</div>
139 136
 			<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
140 137
 				<ul id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
141 138
 				<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -170,9 +167,6 @@
170 167
 					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
171 168
 				</form>
172 169
 			</div>
173
-			<div class="select_btn">
174
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
175
-			</div>
176 170
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
177 171
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
178 172
 				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -314,7 +314,7 @@ let mobPopObj = {
314 314
 						if($(this).is(':checked')) {
315 315
 							var val = $(this).closest('li').find('#ITP_MPOMNG01010_POP_NUM').val();
316 316
 							if(val.trim() === '') {
317
-								chkMsg = '수량을 확인하세요.';
317
+								chkMsg = '수량을 입력하세요.';
318 318
 								return false;
319 319
 							}
320 320
 							var index = $(this).closest('li').index();
@@ -471,11 +471,21 @@ let mobPopObj = {
471 471
 		},
472 472
 		save: function() {
473 473
 			var procSave = function () {
474
+				var chkMsg = '';
474 475
 				let param = $('#ITP_FORM_MPOMNG01010_DETAIL').serializeObject();
475 476
 				$.each(mobContObj.list.rows, function(index, item) {
477
+					if(item.pchReqQty.trim() === '') {
478
+						chkMsg = '수량을 입력하세요.';
479
+						return false;
480
+					}
476 481
 					item['viewCd'] = 'C';
477 482
 					item['pchReqAmt'] = Number(item.unitAmt) * Number(item.pchReqQty);
478 483
 				});
484
+				if(chkMsg !== '') {
485
+					itp_fn_modal_alert(chkMsg);
486
+					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
487
+					return;
488
+				}
479 489
 				param.gridInsertData = mobContObj.list.rows;
480 490
 				var saveFn = function (result) {
481 491
 					console.log(result);
@@ -516,7 +526,7 @@ let mobPopObj = {
516 526
 			itp_fn_form_clear_validate(null, formId);
517 527
 			if (itp_fn_form_event.isValid(formId)) {
518 528
 				if($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS > li').size() < 1) {
519
-					alert('품목추가 버튼을 이용하여 품목을 추가해 주세요.');
529
+					itp_fn_modal_alert('품목추가 버튼을 이용하여 품목을 추가해 주세요.');
520 530
 					return false;
521 531
 				} else {
522 532
 					$('#' + popId).show();

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

@@ -508,7 +508,7 @@ let mobPopObj = {
508 508
 						if($(this).is(':checked')) {
509 509
 							var val = $(this).closest('li').find('#ITP_MPOMNG02010_POP_NUM').val();
510 510
 							if(val.trim() === '') {
511
-								chkMsg = '수량을 확인하세요.';
511
+								chkMsg = '수량을 입력하세요.';
512 512
 								return false;
513 513
 							}
514 514
 							var index = $(this).closest('li').index();
@@ -674,11 +674,17 @@ let mobPopObj = {
674 674
 		save: function() {
675 675
 			var loanDvsn = $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_DVSN').val();
676 676
 			var procSave = function (isReload) {
677
+				var chkMsg = '';
677 678
 				let param = $('#ITP_FORM_MPOMNG02010_MODIFY').serializeObject();
678 679
 				var gridInsertData = [];
679 680
 				var gridUpdateData = [];
680 681
 				var gridDeleteData = [];
681 682
 				$.each(mobContObj.modify.list.rows, function(i, item) {
683
+					console.log(item);
684
+					if(item.pchReqQty.toString().trim() === '') {
685
+						chkMsg = '수량을 입력하세요.';
686
+						return false;
687
+					}
682 688
 					if(item.viewCd === 'D') {
683 689
 						gridDeleteData.push(item);
684 690
 					} else if(item.viewCd === 'C') {
@@ -688,6 +694,11 @@ let mobPopObj = {
688 694
 						gridUpdateData.push(item);
689 695
 					}
690 696
 				});
697
+				if(chkMsg !== '') {
698
+					itp_fn_modal_alert(chkMsg);
699
+					mobPopObj.hide('ITP_POP_MPOMNG02010_REQ_AREA');
700
+					return;
701
+				}
691 702
 				param.gridInsertData = gridInsertData;
692 703
 				param.gridUpdateData = gridUpdateData;
693 704
 				param.gridDeleteData = gridDeleteData;

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

@@ -302,7 +302,7 @@ let mobPopObj = {
302 302
 						if($(this).is(':checked')) {
303 303
 							var val = $(this).closest('li').find('#ITP_MRTNMNG01010_POP_NUM').val();
304 304
 							if(val.trim() === '') {
305
-								chkMsg = '수량을 확인하세요.';
305
+								chkMsg = '수량을 입력하세요.';
306 306
 								return false;
307 307
 							}
308 308
 							var index = $(this).closest('li').index();
@@ -406,14 +406,24 @@ let mobPopObj = {
406 406
 			});
407 407
 		},
408 408
 		save: function(formId) {
409
+			var chkMsg = '';
409 410
 			let param = $(formId).serializeObject();
410 411
 			var gridInsertData = [];
411 412
 			$.each(mobContObj.list.rows, function(index, row) {
413
+				if(row.pchReqQty.trim() === '') {
414
+					chkMsg = '수량을 입력하세요.';
415
+					return false;
416
+				}
412 417
 				row['viewCd'] 			= 'C';
413 418
 				row['rtnQty']			= row.pchReqQty;
414 419
 				row['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.pchReqQty);
415 420
 				gridInsertData.push(row);
416 421
 			});
422
+			if(chkMsg !== '') {
423
+				itp_fn_modal_alert(chkMsg);
424
+				mobPopObj.hide('ITP_POP_MRTNMNG01010_RTN_AREA');
425
+				return;
426
+			}
417 427
 			param.gridInsertData = gridInsertData;
418 428
 			param['colReqDt'] = param.colReqDt.replace(/[^0-9]/g, "");
419 429
 			// console.log(JSON.stringify(param));

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

@@ -494,7 +494,7 @@ let mobPopObj = {
494 494
 						if($(this).is(':checked')) {
495 495
 							var val = $(this).closest('li').find('#ITP_MRTNMNG02010_POP_NUM').val();
496 496
 							if(val.trim() === '') {
497
-								chkMsg = '수량을 확인하세요.';
497
+								chkMsg = '수량을 입력하세요.';
498 498
 								return false;
499 499
 							}
500 500
 							var index = $(this).closest('li').index();
@@ -637,6 +637,7 @@ let mobPopObj = {
637 637
 		},
638 638
 		save: function(formId) {
639 639
 			var _this = this;
640
+			var chkMsg = '';
640 641
 			var gridInsertData = [];
641 642
 			var gridUpdateData = [];
642 643
 			var gridDeleteData = [];
@@ -657,6 +658,10 @@ let mobPopObj = {
657 658
 				// item['unit']			= row.unit;
658 659
 				// item['unitAmt']			= row.unitAmt;
659 660
 				// item['unitGubun']		= row.unitGubun;
661
+				if(item.rtnQty.toString().trim() === '') {
662
+					chkMsg = '수량을 입력하세요.';
663
+					return false;
664
+				}
660 665
 				item['rtnAmt']			= parseInt(item.unitAmt) * parseInt(item.rtnQty);
661 666
 				if(item.viewCd === 'D') {
662 667
 					gridDeleteData.push(item);
@@ -667,6 +672,11 @@ let mobPopObj = {
667 672
 					gridUpdateData.push(item);
668 673
 				}
669 674
 			});
675
+			if(chkMsg !== '') {
676
+				itp_fn_modal_alert(chkMsg);
677
+				mobPopObj.hide(_this.popId);
678
+				return;
679
+			}
670 680
 			let param = $(formId).serializeObject();
671 681
 			param['rtnReqStCd'] = this.rtnReqStCd;
672 682
 			param['colReqDt'] = param.colReqDt.replace(/[^0-9]/g, "");
@@ -675,7 +685,6 @@ let mobPopObj = {
675 685
 			param.gridDeleteData = gridDeleteData;
676 686
 			console.log(JSON.stringify(param));
677 687
 			var saveFn = function (result) {
678
-				console.log(result);
679 688
 				mobPopObj.hide(_this.popId);
680 689
 				mobContObj.list.init();
681 690
 			};