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

src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -12,7 +12,7 @@
 				<div class="line">
 				  <label>수거장소</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="">
+					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소(매장/창고)">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 					<div class="itp_input_btn">
 						<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -242,8 +242,8 @@
 				<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2 item-row">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
+							<div class="fnWhsNm"></div>
+							<div class="wichi fnLocationNm">()</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

src/main/webapp/mobile/app/mordmng/MORDMNG02010.html

@@ -159,7 +159,7 @@
 				  <label>발주담당자</label>
 				  <div class="line_right">
 					<input id="ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_NM" name="dlvMgrNm" class="left" type="text" style="width:70px;" placeholder="이름">
-					<input id="ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_TEL_NO" name="dlvMgrTelNo" class="left" type="text" style="width:120px;" placeholder="연락처">
+					<input id="ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_TEL_NO" name="dlvMgrTelNo" class="left" type="tel" style="width:120px;" placeholder="연락처">
 				  </div>
 				</div>
 				<div class="table_header">
@@ -205,7 +205,7 @@
 					  <div class="nomal">
 						<label class="col_4">납품수량</label>
 						<span>:</span>
-					    <input id="ITP_FORM_MORDMNG02010_VIEW_SHMT_QTY" name="shmtQty" type="text">
+					    <input id="ITP_FORM_MORDMNG02010_VIEW_SHMT_QTY" name="shmtQty" type="number">
 					    <label>유통기한</label>
 					    <span>:</span>
 						<input type="text" id="ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE" name="expryDate" class="itp_input date col_9 year">

src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -84,8 +84,7 @@
 	            </div>
 				<div class="right" style="width:125px;">
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-					<input id="ITP_MPOMNG01010_DETAIL_NUM" class="">
-					<!-- <div class="num fnPchReqQty">1</div> -->
+                    <input type="number" id="ITP_MPOMNG01010_DETAIL_NUM" class="" value="1" maxlength="5">
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 				</div>
 			</li>
@@ -168,9 +167,6 @@
                     <button id="ITP_BTN_MPOMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
                 </form>
             </div>
-            <div class="select_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-            </div>    
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
                 <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
                 <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display: none;">
@@ -222,7 +218,7 @@
                         </div>
                         <div class="right">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
-			              <input id="ITP_MPOMNG01010_POP_NUM" class="">
+                          <input type="number" id="ITP_MPOMNG01010_POP_NUM" class="" value="1" maxlength="5">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
 			            </div>
                          <div class="scroll_right">

src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -343,9 +343,6 @@
           <button id="ITP_BTN_MPOMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
         </form>
       </div>
-      <div class="select_btn">
-        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-      </div>
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
         <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: none;">
@@ -381,7 +378,6 @@
         </div>
         <div class="select_btn">
 		  <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="btn_blue">추가</button>
-          <button id="ITP_BTN_MPOMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
         </div>
       </form>
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">

src/main/webapp/mobile/css/style.css

@@ -49,7 +49,7 @@ section .popup2 .pop .header .header_left label {font-size: 16px; font-weight:10
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px; position:relative; top:-44px;}
 section .popup2 .pop .header .header_right button {border: none; background: transparent; margin:3px -5px;}
 section .popup2 .pop .header .header_right button img {width:22px;}
-section .popup2 .pop .select_btn {position:relative; width:100%; height: 63px;}
+section .popup2 .pop .select_btn {position:relative; width:100%; height: 45px;}
 section .popup2 .pop .select_btn button.btn_red {float: right; width: 90px; height: 25px; margin:0 7px; background:#d9baaf; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cca597;}
 section .popup2 .pop .select_btn button.btn_blue {float: right; width: 90px; height: 34px; margin:0 7px; background:#8f9fc6; color: #fff; font-size: 12pt; padding-top:4px; border: 1px solid #cacfe3;}
 section .popup2 .pop .select_btn button.btn_blue:active{background-color: #708cd1;}
@@ -83,7 +83,7 @@ section .popup2 .pop .table_tr .table_td div {text-overflow:ellipsis; overflow:h
 section .popup2 .pop .table_tr .table_td .chkItem {margin-top:-5px; width:15px; left:50%; position:relative; transform:translateX(-50%);}
 
 section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
-section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 100%; height: 50px; border-bottom: 1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 70px; display:flex;}
 

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -210,7 +210,6 @@ let mobPopObj = {
 		},
 		rows: [],
 		search: function () {
-			var _this = this;
 			$('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .mb_0').empty();
 			var callbackFn = function(result) {
 				$.each(result.gridRows, function (i, item) {
@@ -220,11 +219,11 @@ let mobPopObj = {
 					$li.find('.fnLocationNm').text(item.locationNm);
 					$li.find('.fnWhsId').data('whs-id', item.whsId);
 					$li.find('.fnWhsId').data('location', item.location);
-					$('#ITP_LIST_MCOLLMNG01010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+					$('#ITP_LIST_MCOLLMNG01010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { mobPopObj.popWhsNm.choice(item); });
 				});
 			};
 			const param = $('#ITP_FORM_MCOLLMNG01010_POP_WHS').serializeObject();
-			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
+			// (fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		action: function() {
@@ -233,12 +232,10 @@ let mobPopObj = {
 				_this.search();
 			});
 		},
-		choice: function(elem) {
-			var whsId = $(elem).data('whs-id');
-			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
-			var location = $(elem).data('location');
-			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID').val(whsId);
-			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM').val(whsNm);
+		choice: function(item) {
+			console.log(item);
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID').val(item.whsId);
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM').val(item.whsNm);
 			mobPopObj.hide(this.popId);
 		},
 		delete: function() {

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -57,6 +57,7 @@ let mobPageObj = {
 					case 'ITP_BTN_MCOLLMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
 					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH'		: mobContObj.list.search();		break;
 					case 'ITP_BTN_MCOLLMNG02010_LIST_CREATE'		: mobContObj.list.colPrint();	break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_CANCEL'		: mobContObj.cancel();			break;
 				}
 				return false;
 			});
@@ -281,6 +282,9 @@ let mobContObj = {
 			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group').empty();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
+	},
+	cancel: function () {
+		$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 	}
 };
 

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -55,8 +55,9 @@ let mobPageObj = {
 				switch (id) {
 					case 'ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
 					case 'ITP_BTN_MORDMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
-					case 'ITP_BTN_MORDMNG02010_LIST_SEARCH'			: mobContObj.list.search();	break;
+					case 'ITP_BTN_MORDMNG02010_LIST_SEARCH'			: mobContObj.list.search();		break;
 					case 'ITP_BTN_MORDMNG02010_LIST_DLV_VIEW'		: mobContObj.list.dlvPrint();	break;
+					case 'ITP_BTN_MORDMNG02010_LIST_CANCEL'			: mobContObj.cancel();			break;
 				}
 				return false;
 			});
@@ -194,7 +195,7 @@ let mobContObj = {
 			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
 			$(id).find('.fnWhsNm').text(result.whsNm);
 			$(id).find('.fnDeliTelNo').text(result.deliTelNo);
-			$(id).find('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').datepicker('setDate', itp_fn_date_add('D', 7));
+			$(id).find('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').datepicker('setDate', result.dlvReqDt);
 			$.each(result.invPoInfoList, function (i, item) {
 				$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY').html());
 				var $li = $('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .item-row:last');
@@ -207,6 +208,7 @@ let mobContObj = {
 				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
 				$li.find('.fnDlvReqDt').text(item.dlvReqDt);
 				$li.find('.itp_input.date').datepicker(ITP_DATE_LANGUAGE);
+				$li.find('#ITP_FORM_MORDMNG02010_VIEW_SHMT_QTY').val(item.shmtQty);
 				$li.find('#ITP_FORM_MORDMNG02010_VIEW_EXPRY_DATE').datepicker('setDate', item.expryDate);
 				_this.rows.push(item);
 			});
@@ -268,7 +270,7 @@ let mobContObj = {
 				console.log(JSON.stringify(param));
 				var callbackFn = function(result) {
 					console.log(result);
-					_this.cancel();
+					mobContObj.list.init();
 				};
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
 			}
@@ -293,6 +295,9 @@ let mobContObj = {
 			this.reset();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
+	},
+	cancel: function () {
+		$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 	}
 };
 

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -309,20 +309,30 @@ let mobPopObj = {
 				},
 				addItems: function() {
 					var items = [];
+					var chkMsg = '';
 					$('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
 						if($(this).is(':checked')) {
+							var val = $(this).closest('li').find('#ITP_MPOMNG01010_POP_NUM').val();
+							if(val.trim() === '') {
+								chkMsg = '수량을 확인하세요.';
+								return false;
+							}
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
-							item['pchReqQty'] = $(this).closest('li').find('#ITP_MPOMNG01010_POP_NUM').val();
+							item['pchReqQty'] = val;
 							items.push(item);
 						}
 					});
-					if(items.length > 0) {
-						mobContObj.list.attachRow(items);
-						mobPopObj.popItem.close();
-					} else {
+					if(chkMsg !== '') {
+						itp_fn_modal_alert(chkMsg);
+						return;
+					}
+					if(items.length < 1) {
 						itp_fn_modal_alert('품목을 선택하세요.');
+						return;
 					}
+					mobContObj.list.attachRow(items);
+					mobPopObj.popItem.close();
 				}
 			}
 		},

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -463,7 +463,7 @@ let mobPopObj = {
 						}
 						return false;
 					});
-					$('input[id="ITP_BTN_MPOMNG02010_POP_NUM"]').off('input').on('input', function() {
+					$('input[id="ITP_MPOMNG02010_POP_NUM"]').off('input').on('input', function() {
 						var _this = this;
 						CommonObj.chkMaxLength(this, function(qty) { mobPopObj.popItem.addRow.button.reqAmtUnit(_this, qty) });
 					});
@@ -503,21 +503,31 @@ let mobPopObj = {
 				},
 				addItems: function() {
 					var items = [];
+					var chkMsg = '';
 					$('#ITP_LIST_MPOMNG02010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
 						if($(this).is(':checked')) {
+							var val = $(this).closest('li').find('#ITP_MPOMNG02010_POP_NUM').val();
+							if(val.trim() === '') {
+								chkMsg = '수량을 확인하세요.';
+								return false;
+							}
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
 							item['viewCd'] = 'C';
-							item['pchReqQty'] = $(this).closest('li').find('#ITP_BTN_MPOMNG02010_POP_NUM').val();
+							item['pchReqQty'] = val;
 							items.push(item);
 						}
 					});
-					if(items.length > 0) {
-						mobContObj.modify.list.attachRow(items);
-						mobPopObj.popItem.close();
-					} else {
+					if(chkMsg !== '') {
+						itp_fn_modal_alert(chkMsg);
+						return;
+					}
+					if(items.length < 1) {
 						itp_fn_modal_alert('품목을 선택하세요.');
+						return;
 					}
+					mobContObj.modify.list.attachRow(items);
+					mobPopObj.popItem.close();
 				}
 			}
 		},

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -297,20 +297,30 @@ let mobPopObj = {
 				},
 				addItems: function() {
 					var items = [];
+					var chkMsg = '';
 					$('#ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
 						if($(this).is(':checked')) {
+							var val = $(this).closest('li').find('#ITP_MRTNMNG01010_POP_NUM').val();
+							if(val.trim() === '') {
+								chkMsg = '수량을 확인하세요.';
+								return false;
+							}
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
-							item['pchReqQty'] = $(this).closest('li').find('#ITP_MRTNMNG01010_POP_NUM').val();
+							item['pchReqQty'] = val;
 							items.push(item);
 						}
 					});
-					if(items.length > 0) {
-						mobContObj.list.attachRow(items);
-						mobPopObj.popItem.close();
-					} else {
+					if(chkMsg !== '') {
+						itp_fn_modal_alert(chkMsg);
+						return;
+					}
+					if(items.length < 1) {
 						itp_fn_modal_alert('품목을 선택하세요.');
+						return;
 					}
+					mobContObj.list.attachRow(items);
+					mobPopObj.popItem.close();
 				}
 			}
 		},

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -489,21 +489,31 @@ let mobPopObj = {
 				},
 				addItems: function() {
 					var items = [];
+					var chkMsg = '';
 					$('#ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS').find('input:checkbox').each(function() {
 						if($(this).is(':checked')) {
+							var val = $(this).closest('li').find('#ITP_MRTNMNG02010_POP_NUM').val();
+							if(val.trim() === '') {
+								chkMsg = '수량을 확인하세요.';
+								return false;
+							}
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
 							item['viewCd'] = 'C';
-							item['rtnQty'] = $(this).closest('li').find('#ITP_MRTNMNG02010_POP_NUM').val();
+							item['rtnQty'] = val;
 							items.push(item);
 						}
 					});
-					if(items.length > 0) {
-						mobContObj.modify.list.attachRow(items);
-						mobPopObj.popItem.close();
-					} else {
+					if(chkMsg !== '') {
+						itp_fn_modal_alert(chkMsg);
+						return;
+					}
+					if(items.length < 1) {
 						itp_fn_modal_alert('품목을 선택하세요.');
+						return;
 					}
+					mobContObj.modify.list.attachRow(items);
+					mobPopObj.popItem.close();
 				}
 			}
 		},