모바일 재고 수정

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

@@ -63,7 +63,7 @@
 						<label class="col_4">발주번호</label>
 						<span>:</span>
 					    <div class="fnRtnPodrUnqNo"></div>
-						<label class="col_4">발주항번</label>
+						<label class="col_4">수거요청일</label>
 						<span>:</span>
 					    <div class="fnColReqDt"></div>
 					  </div>
@@ -132,7 +132,7 @@
 				<div class="line">
 				  <label class="col_6">수거서생성일자</label>
 				  <div class="line_right">
-					<div class="fnRtnOdrRegDt"></div>
+					<div class="fnColReqDt"></div>
 				  </div>      
 				</div>
 				<div class="line">
@@ -156,14 +156,14 @@
 				<div class="line">
 				  <label class="col_6">수거일자</label>
 				  <div class="line_right">
-					  <input id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="year" type="date">
+					  <input type="text" id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="itp_input date">
 				  </div>
 				</div>
 				<div class="line">
 				  <label>수거담당자</label>
 				  <div class="line_right">
 					<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM" name="pickMgrNm" class="left" type="text" style="width:70px;" placeholder="이름">
-					<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO" name="pickMgrTelNo" class="left" type="text" style="width:120px;" placeholder="연락처">
+					<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO" name="pickMgrTelNo" class="left" type="tel" style="width:120px;" placeholder="연락처">
 				  </div>
 				</div>
 				<div class="table_header">
@@ -210,7 +210,7 @@
 					  <div class="nomal">
 						<label class="col_4">수거수량</label>
 						<span>:</span>
-					    <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
+					    <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="number" name="colQty">
 						<label class="">수거구분</label>
 						<span>:</span>
 						<select name="rtnRsnDvsn" id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN" data-select-code="RTN_RSN_DVSN">

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

@@ -71,14 +71,11 @@ let mobPageObj = {
 				return false;
 			});
 
-			$(document).off('click', 'input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]');
-			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]', function() {
-				if($(this).prop('checked')) {
-					$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
-					$(this).prop('checked', true);
-				}
+			$(document).off('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .item-row');
+			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .item-row', function() {
+				$('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .item-row').removeClass('check');
+				$(this).addClass('check');
 			});
-
 		}
 	},
 	switchScreen: function(mode) {
@@ -133,6 +130,7 @@ let mobContObj = {
 					$li.find('.fnRtnWhsNm').text(item.rtnWhsNm);
 					$li.find('.fnItemId').text(item.itemId);
 					$li.find('.fnItemNm').text(item.itemNm);
+					$('#ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT').datepicker('setDate', item.colReqDt);
 					$li.find('.fnRtnDodrItemQty').text(CommonObj.currency.add(item.rtnOdrQty, '개'));
 					$li.find('.fnUnitAmt').text(CommonObj.comma.set(item.unitAmt));
 					$li.find('.fnRtnDodrTotalAmt').text(CommonObj.comma.set(item.rtnOdrAmt));
@@ -148,8 +146,8 @@ let mobContObj = {
 		},
 		colPrint: function() {
 			var iChoice = -1;
-			$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]').each(function(index) {
-				if($(this).is(":checked")) {
+			$('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .item-row').each(function(index) {
+				if($(this).hasClass("check")) {
 					iChoice = index;
 					return false;
 				}
@@ -165,6 +163,7 @@ let mobContObj = {
 		rows: [],
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
+			this.reset();
 			this.search(item);
 		},
 		search: function(item) {
@@ -200,9 +199,9 @@ let mobContObj = {
 				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnOdrQty));
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 				$li.find('.fnUnit').text(item.unit);
-				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(result.coltQty);
-				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(result.rtnRsnDvsn);
-				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val(result.rtnRsn);
+				$li.find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(item.rtnOdrQty);
+				$li.find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(item.rtnRsnDvsn);
+				$li.find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val(item.rtnRsn);
 				_this.rows.push(item);
 			});
 		},
@@ -213,15 +212,15 @@ let mobContObj = {
 			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM').val();
 			var pickMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO').val();
 			if(colSchDt.length < 1) {
-				alert('수거일자를 입력해 주세요.');
+				itp_fn_modal_alert('수거일자를 입력해 주세요.');
 				return false;
 			}
 			if(pickMgrNm.length < 1) {
-				alert('수거담당자를 입력해 주세요.');
+				itp_fn_modal_alert('수거담당자를 입력해 주세요.');
 				return false;
 			}
 			if(pickMgrTelNo.length < 1) {
-				alert('수거담당자 연락처를 입력해 주세요.');
+				itp_fn_modal_alert('수거담당자 연락처를 입력해 주세요.');
 				return false;
 			}
 			var gridInsertData = [];
@@ -231,23 +230,22 @@ let mobContObj = {
 				var item = {
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
-					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
+					'colQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
 					'rtnRsnDvsn': $(this).find("#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN option:selected").val(),
 					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
 				};
-				if(item.coltQty.length < 1) {
-					alert('수거수량을 입력해 주세요.');
+				if(item.colQty.length < 1) {
+					itp_fn_modal_alert('수거수량을 입력해 주세요.');
 					return false;
 				}
-				if(item.coltQty > row.rtnOdrQty) {
-					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
+				if(item.colQty > row.rtnOdrQty) {
+					itp_fn_modal_alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
 					return false;
 				}
 				if(item.rtnRsnDvsn.length < 1) {
-					alert('수거사유를 선택해 주세요.');
+					itp_fn_modal_alert('수거사유를 선택해 주세요.');
 					return false;
 				}
-				item.expryDate = item.expryDate.replace(/-/g, ".");
 				gridInsertData.push(item);
 				isValid = true;
 			});
@@ -255,31 +253,32 @@ let mobContObj = {
 				param['viewCd'] = 'C';
 				param['brandId'] = fn_make_user_info.get('brandId');
 				param['spplyId'] = fn_make_user_info.get('userId');
-				param['colSchDt'] = colSchDt.replace(/-/g, ".");
+				param['colSchDt'] = colSchDt;
 				param['pickMgrNm'] = pickMgrNm;
 				param['pickMgrTelNo'] = pickMgrTelNo;
 				param['gridInsertData'] = gridInsertData;
-				console.log(JSON.stringify(param));
+				// 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');
 			}
 		},
-		cancel: function () {
+		reset: function() {
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
-			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val('');
-			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val('');
 			$(id).find('.fnBrandNm').text('');
-			$(id).find('.fnRtnPodrDtlNo').text('');
-			$(id).find('.fnRtnOdrRegDt').text('');
+			$(id).find('.fnRtnPodrUnqNo').text('');
+			$(id).find('.fnColReqDt').text('');
 			$(id).find('.fnRtnDodrTotalAmt').text('');
 			$(id).find('.fnRtnWhsNm').text('');
 			$(id).find('.fnPickTelNo').text('');
-			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val('');
-			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM').val('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO').val('');
 			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group').empty();
+		},
+		cancel: function () {
+			this.reset();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
 	},

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -320,7 +320,7 @@ let mobPopObj = {
 					$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
 				});
 			};
-			var param = $('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM').serializeObject();
+			var param = $.extend({}, $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject(), $('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM').serializeObject());
 			console.log(JSON.stringify(param));
 			fn_ajax_call(API_POP_STOCK_MNG_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},