수거현황 완료

src/main/webapp/app/collmng/COLLMNG01010.html

@@ -7,11 +7,7 @@
 					<button type="button" id="ITP_BTN_COLLMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_COLLMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i> &nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
-				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
-					<button type="button" id="ITP_BTN_COLLMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-					<button type="button" id="ITP_BTN_COLLMNG01010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
-				</div>
+				<div style="top:0px; text-align:center; font-size:20px;"></div>
 			</div>
 			<div class="itp_det_in">
 				<div id="ITP_AJAX_COLLMNG01010_LIST_CONTAINER">
@@ -19,6 +15,8 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_COLLMNG01010_SEARCH" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
+								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<label>수거 일자 *</label>
@@ -33,16 +31,17 @@
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_COLLMNG01010_SEARCH_ST_CD" class="form-control itp_input" name="sStCd">
-												<option value="A">수거상태</option>											
+											<select id="ITP_FORM_COLLMNG01010_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="form-control itp_input" name="srtnOdrStCd">
+												<option value="">수거상태</option>											
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" />
+											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" />
+											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="swhsId"/>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
-											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_COLLMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-5 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호/품목명" />
@@ -74,33 +73,33 @@
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">발주번호</label>
-											<div class="col-xs-4 itp_ip fnPchPodrUnqNo"></div>
+											<div class="col-xs-4 itp_ip fnRtnPodrUnqNo"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">수거일자</label>
-											<div class="col-xs-4 itp_ip fnColDt"></div>
+											<div class="col-xs-4 itp_ip fnRtnOdrRegDt"></div>
 											<label class="col-xs-2 itp_lb">수거상태</label>
-											<div class="col-xs-4 itp_ip fnColCmdStCd"></div>
+											<div class="col-xs-4 itp_ip fnRtnOdrStNm"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">수거장소</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-3 itp_in fnColPlace"></div>
+												<div class="col-xs-3 itp_in fnRtnWhsNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">수거 총 금액</label>
-											<div class="col-xs-4 itp_ip fnColAmt"></div>
+											<div class="col-xs-4 itp_ip fnRtnDodrTotalAmt"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">발주담당자</label>
-											<div class="col-xs-4 itp_ip fnPodrMgrNm"></div>
+											<div class="col-xs-4 itp_ip fnRtnMgrNm"></div>
 											<label class="col-xs-2 itp_lb">발주담당자연락처</label>
-											<div class="col-xs-4 itp_ip fnPodrMgrTelNo"></div>
+											<div class="col-xs-4 itp_ip fnRtnMgrTelNo"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">

src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -167,8 +167,8 @@ let pageObj = {
 			var defaultToDate = new Date(now);
 			defaultToDate.setDate(now.getDate()+7);
 			$('#ITP_TAB_COLLMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', '2022.10.01');
-			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', '2022.12.01');
+			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', now);
+			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(COLLMNG01010_GRID_ID, COLLMNG01010_GRID_LIST, 'lg');
@@ -213,7 +213,7 @@ let pageObj = {
             $('#ITP_FORM_COLLMNG01010_SEARCH #ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
             $('#ITP_BTN_COLLMNG01010_SEARCH_WHS_NM').show();
             $('#ITP_BTN_COLLMNG01010_DELETE_WHS_NM').show();
-        } else if(mode == 'ADD') { // 등록
+        } /*else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
 
@@ -239,7 +239,7 @@ let pageObj = {
             $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 
             $('.fnBrandId').text('(자동부여)');
-        } else if(mode == 'MODIFY') { // 수정
+        } */else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
 
@@ -267,6 +267,7 @@ let pageObj = {
 let listObj = {
 	init: function() {
 		this.grid.init();
+		this.action();
 	},
 	itp_COLLMNG01010_param: {},
 	itp_COLLMNG01010_search: false,
@@ -276,9 +277,8 @@ let listObj = {
 			let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            param.sbrandId = LOGIN_USER_INFO.sbrandId;            
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
-            param.sidx = '0';
+            //param.sbrandId = 'BRD221100002';            
+            //param.sspplyId = 'SPY221100004';
             console.log(JSON.stringify(param));
             $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         }
@@ -296,13 +296,13 @@ let listObj = {
         push: function() {
             let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
             listObj.itp_COLLMNG01010_param = param;
-            listObj.itp_COLLMNG01010_param.sidx = '0';
+            //listObj.itp_COLLMNG01010_param.sbrandId = 'BRD221100002';            
+            //listObj.itp_COLLMNG01010_param.sspplyId = 'SPY221100004';
         },
         back: function() {
             $('#ITP_FORM_COLLMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG01010_param.brandType);
             $('#ITP_FORM_COLLMNG01010_SERVICE_ST_CD').val(listObj.itp_COLLMNG01010_param.stCd);
             $('#ITP_FORM_COLLMNG01010_SEARCH_BRAND_NM').val(listObj.itp_COLLMNG01010_param.brandNm);
-        	console.log('here');
         	console.log(listObj.itp_COLLMNG01010_param);            
         }
 	},
@@ -321,9 +321,8 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            param.sbrandId = 'BRD221100002';            
-            param.sspplyId = 'SPY221100004';
-            param.sidx = '0';
+            //param.sbrandId = 'BRD221100002';            
+            //param.sspplyId = 'SPY221100004';
             console.log(JSON.stringify(param));
             var option = {
             	gridId: COLLMNG01010_GRID_ID,
@@ -334,11 +333,11 @@ let listObj = {
             	onCellSelect: function(rowId, cellIdx, cellValue) {
                     var cm = $(this).jqGrid('getGridParam', 'colModel');
                     var colNm = cm[cellIdx].name;
-                    if (colNm === 'pchPodrUnqNo') {
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
+                    if (colNm === 'rtnPodrUnqNo') {
+                        const rtnPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'rtnPodrUnqNo');
                         const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
                         const spplyIdVal = fn_make_user_info.get('spplyId'); 
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
+                        const key = {rtnPodrUnqNo: rtnPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
                         var param = $.param(key);
                         viewObj.init(param);
                     }
@@ -348,7 +347,7 @@ let listObj = {
                     itp_fn_grid_load_complete(data, COLLMNG01010_GRID_ID, true, 'number', 'COLLMNG01010', listObj.itp_COLLMNG01010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(COLLMNG01010_GRID_ID).getDataIDs();
                     $.each(ids, function(idx, rowId) {
-                        $(COLLMNG01010_GRID_ID).jqGrid('setCell', rowId, 'pchPodrUnqNo', '', ITP_GRID_COL_STYLE.link);
+                        $(COLLMNG01010_GRID_ID).jqGrid('setCell', rowId, 'rtnPodrUnqNo', '', ITP_GRID_COL_STYLE.link);
                     });
 				},
 				onPaging: function(action) {
@@ -366,5 +365,117 @@ let listObj = {
 		unload: function() {
 			$.jgrid.gridUnload(COLLMNG01010_GRID_ID);
 		}
+	},
+	action: function() {
+		var _this = this;
+		// 납품장소 조회 버튼 클릭
+		$('#ITP_BTN_COLLMNG01010_SEARCH_WHS_NM').on('click', function() {
+			_this.popup();
+		});
+		// 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_BTN_COLLMNG01010_DELETE_WHS_NM').on('click', function() {
+			$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM').val('');
+			$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID').val('');
+		});
+	},
+	popup: function() {
+		// 팝업
+		var popFn = this.callback.create;
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+	},
+	callback: {
+		create: function(rowDataPop) {
+			if(rowDataPop) {
+				$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID').val(rowDataPop.whsId);
+			}
+		}
+	}
+}
+
+
+/*상세화면 Object*/
+let viewObj = {
+	init: function(param) {
+		this.load(param);
+	},
+	itp_COLLMNG01010_param: {},
+	itp_COLLMNG01010_search: false,
+	button: {
+		cancel: function() {
+			listObj.grid.search();
+		}
+	},
+	empty: {
+		init: function() {
+            var _this = this;
+            this.push();
+            $(COLLMNG01010_VIEW_GRID_EMPTY).on('click', function() {
+                _this.back();
+                viewObj.itp_COLLMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+                $(COLLMNG01010_DETAIL_GRID_ID).setGridParam({'postData': JSON.stringify(viewObj.itp_COLLMNG01010_param)}).trigger('reloadGrid');
+            });
+        },
+        push: function() {
+            let param = $('#ITP_FORM_COLLMNG01010_DETAIL').serializeObject();
+            viewObj.itp_COLLMNG01010_param = param;
+        },
+        back: function() {
+            $('#ITP_FORM_COLLMNG01010_SERVICE_BRAND_TYPE').val(viewObj.itp_COLLMNG01010_param.brandType);
+            $('#ITP_FORM_COLLMNG01010_SERVICE_ST_CD').val(viewObj.itp_COLLMNG01010_param.stCd);
+            $('#ITP_FORM_COLLMNG01010_SEARCH_BRAND_NM').val(viewObj.itp_COLLMNG01010_param.brandNm);
+        }
+	},
+	load: function(param) {
+		fn_ajax_call(API_RTNMNG_RTN_INFO_INFO_RTNODR, param, this.callback, 'GET');
+	},
+	callback: function(result) {
+		console.log(result);
+		
+		pageObj.switchScreen('MODIFY');
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnBrandNm').text(result.brandNm);							// 브랜드명
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);				// 발주번호
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrRegDt').text(result.rtnOdrRegDt);					// 수거일자
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrStNm').text(result.rtnOdrStNm);					// 수거상태
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnWhsNm').text(result.rtnWhsNm);						// 수거장소
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnDodrTotalAmt').text(result.rtnDodrTotalAmt);			// 수거 총 금액
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrNm').text(result.rtnMgrNm);						// 발주담당자
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrTelNo').text(result.rtnMgrTelNo);					// 발주담당자연락처
+		
+		for(var i = 0; i < result.rtnOdrDtlList.length; i++){
+			result.rtnOdrDtlList[i].colReqDt = result.colReqDt;
+		}
+		
+		viewObj.grid.init(result.rtnOdrDtlList);
+	},
+	grid: {
+		init: function(gridData) {
+			this.mode = 'MODIFY';
+			this.gridId = COLLMNG01010_DETAIL_GRID_ID;
+			this.gridList = COLLMNG01010_DETAIL_GRID_LIST;
+			this.gridEmpty = COLLMNG01010_DETAIL_GRID_EMPTY;
+			this.unload();
+			this.load(gridData);
+		},
+		mode: '',
+		colModel: gridColModel.detail,
+		load: function(gridData) {
+			var _this = this;
+			var option = {
+				gridId: _this.gridId,
+				colModel: gridColModel.detail,
+				data: gridData,
+				multiselect: true,
+				loadComplete: function(data) {
+					console.log(data);
+					itp_fn_grid_load_complete(data, COLLMNG01010_DETAIL_GRID_ID, true, 'number', 'COLLMNG01010', viewObj.itp_COLLMNG01010_search, viewObj.empty, true, data.gridRecords, true);
+				}
+			};
+			itp_fn_grid_make_local(option);
+		},
+		unload: function() {
+			$.jgrid.gridUnload(this.gridId);
+		}
 	}
-}
+};