수거현황 진행1

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

@@ -21,15 +21,13 @@
 								<form id="ITP_FORM_COLLMNG01010_SEARCH" class="form-horizontal">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_COLLMNG01010_SERVICE_COL_DT" class="form-control itp_input" name="colDt">
-												<option value="A">수거일자*</option>											
-											</select>
+											<label>수거 일자 *</label>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_COL_REQ_TM" class="form-control itp_input" name="colReqDt" value="">
+												<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_COL_REQ_DT" class="form-control itp_input" name="colDt" value="">
+												<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
 											</div>
 										</div>
 									</div>
@@ -110,10 +108,10 @@
 											<h4 class="itp_table_tit">발주 품목</h4>
 										</div>
 										<div id="ITP_COLLMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_COLLMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
-										  <table id="ITP_COLLMNG01010_DETAIL_jqGrid"></table>
-										  <div id="ITP_COLLMNG01010_DETAIL_jqGridPager"></div>
-										  <div id="ITP_COLLMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
+											<div id="ITP_COLLMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
+											<table id="ITP_COLLMNG01010_DETAIL_jqGrid"></table>
+											<div id="ITP_COLLMNG01010_DETAIL_jqGridPager"></div>
+											<div id="ITP_COLLMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
 										</div>
 									</div>
 								</section>												

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

@@ -0,0 +1,370 @@
+require(['config'], function() {
+    require([
+    ], function($) {
+        pageObj.init();
+    });
+});
+
+
+//화면변수
+const COLLMNG01010_GRID_ID = '#ITP_COLLMNG01010_jqGrid';
+const COLLMNG01010_GRID_LIST = '#ITP_COLLMNG01010_jqGrid_list';
+const COLLMNG01010_GRID_PAGER = '#ITP_COLLMNG01010_jqGridPager';
+const COLLMNG01010_GRID_EMPTY = '#ITP_COLLMNG01010_jqGridEmpty';
+
+const COLLMNG01010_DETAIL_GRID_ID = '#ITP_COLLMNG01010_DETAIL_jqGrid';
+const COLLMNG01010_DETAIL_GRID_LIST = '#ITP_COLLMNG01010_DETAIL_jqGrid_list';
+const COLLMNG01010_DETAIL_GRID_PAGER = '#ITP_COLLMNG01010_DETAIL_jqGridPager';
+const COLLMNG01010_DETAIL_GRID_EMPTY = '#ITP_COLLMNG01010_DETAIL_jqGridEmpty';
+
+
+//API URL
+let API_RTNMNG_RTN_SPPLY_RTN_GRID_LIST = '/api/rtnmng/rtn/spply-rtn-grid-list';
+let API_RTNMNG_RTN_INFO_INFO_RTNODR = '/api/rtnmng/rtn/info-rtnOdr';
+
+
+//화면 grid ColModel
+const gridColModel = {
+	list:[
+		{
+			index: 'VIEW_CD', name: 'viewCd',
+			label: ITP_MSG_LOCALE.label.viewCd,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: ITP_MSG_LOCALE.label.brandNm, 			// 브랜드명
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
+			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, 		// 반품발주번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_ODR_STNM', name: 'rtnOdrStNm',
+			label: ITP_MSG_LOCALE.label.rtnOdrStNm, 		// 번품발주상태명
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_ODR_REG_DT', name: 'rtnOdrRegDt',
+			label: ITP_MSG_LOCALE.label.rtnOdrRegDt, 		// 반품발주일자
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'COL_REQ_DT', name: 'colReqDt',
+			label: ITP_MSG_LOCALE.label.colReqDt, 			// 수거요청일
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
+			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_DODR_TOTAL_AMT', name: 'rtnDodrTotalAmt',
+			label: ITP_MSG_LOCALE.label.rtnDodrTotalAmt, 	// 총 수거금액
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_DODR_ITEM_QTY', name: 'rtnDodrItemQty',
+			label: ITP_MSG_LOCALE.label.rtnDodrItemQty, 	// 수거품목수
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
+			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	],
+	view: [],
+	detail: [
+		{
+			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
+			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, 		// 반품발주항번
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'UNIT_AMT', name: 'unitAmt',
+			label: ITP_MSG_LOCALE.label.unitAmt, 			// 단가
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: ITP_MSG_LOCALE.label.unit, 				// 기본단위
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_REQ_QTY', name: 'rtnReqQty',
+			label: ITP_MSG_LOCALE.label.rtnReqQty, 			// 수거수량
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'RTN_AMT', name: 'rtnAmt',
+			label: ITP_MSG_LOCALE.label.rtnAmt, 			// 수거금액
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'COL_REQ_DT', name: 'colReqDt',
+			label: ITP_MSG_LOCALE.label.colReqDt, 			// 반품발주항번
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	]
+};
+
+
+/*화면공통 Object*/
+let pageObj = {
+	init: function() {
+		this.ui.init();
+		this.event.init();
+	},
+	ui: {
+		init: function() {
+			this.view();
+			this.grid();
+			this.ready();
+		},
+		view: function() {
+			// 버튼 권한설정
+			fn_proc_btn_auth('COLLMNG01010');
+			// 공통코드 표시
+			$('select').each(function() {
+				if($(this).data('select-code')) {
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+				}
+			});
+			// 조회일자 지정	
+			var now = new Date();
+			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');
+		},
+		grid: function() {
+			itp_fn_jqgrid_resize(COLLMNG01010_GRID_ID, COLLMNG01010_GRID_LIST, 'lg');
+			listObj.empty.init();
+			itp_fn_fire_window_resize();
+		},
+		ready: function() {
+			listObj.init();
+		}
+	},
+	event: {
+		init: function() {
+			this.button();
+		},
+		button: function() {
+			// 버튼 클릭 이벤트
+			$('button').each(function() {
+				var id = $(this).attr('id');
+				$(this).on('click', function() {
+					switch (id) {
+						case 'ITP_BTN_COLLMNG01010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
+						case 'ITP_BTN_COLLMNG01010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
+						case 'ITP_BTN_COLLMNG01010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
+						case 'ITP_BTN_COLLMNG01010_CANCELLIST'		: viewObj.button.cancel(); 		break;	// 취소/목록 버튼
+						case 'ITP_BTN_COLLMNG01010_DELETE'			: 								break;	// 삭제 버튼
+					}
+				});
+			});
+		}
+	},
+	switchScreen: function(mode) {
+        $('.itp_det_head').find('button[id^="ITP_BTN_COLLMNG01010_"]').each(function(i) {
+            $(this).hide();
+        });
+        $('#ITP_TAB_COLLMNG01010').find('div[id$="_CONTAINER"]').each(function(i) {
+            $(this).hide();
+        });
+        if(mode == 'LIST') { // 목록
+            fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_SRH', '#ITP_BTN_COLLMNG01010_NEWREG']);
+            $('#ITP_AJAX_COLLMNG01010_LIST_CONTAINER').show();
+            $('#ITP_FORM_COLLMNG01010_SEARCH #ITP_FORM_COLLMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+            $('#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') { // 등록
+            $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
+
+            $('#ITP_FORM_COLLMNG01010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
+                $(this).attr('id') === 'ITP_FORM_COLLMNG01010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
+                if(elem.type === 'select') {
+                    $(this).val('').prop('selected', true);
+                }
+            });
+            $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_FILE_NO').val('');
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').removeAttr('readonly');
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BRAND_NM').removeAttr('readonly');
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BSNS_REG_NO').removeAttr('readonly');
+            $('#ITP_FORM_COLLMNG01010_DETAIL_CORP_REG_NO').removeAttr('readonly');
+            // $('#ITP_FORM_COLLMNG01010_DETAIL_SEARCH_AFFL_SHOP').removeAttr('disabled');
+            // $('#ITP_FORM_COLLMNG01010_DETAIL_DELETE_AFFL_SHOP').removeAttr('disabled');
+            $('#ITP_FORM_COLLMNG01010_DETAIL_SEARCH_AFFL_SHOP').show();
+            $('#ITP_FORM_COLLMNG01010_DETAIL_DELETE_AFFL_SHOP').show();
+			$('#ITP_FORM_COLLMNG01010_DETAIL .itp_form_info').hide();
+			$('#ITP_FORM_COLLMNG01010_DETAIL .itp_form_change').show();
+
+            $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
+            $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+
+            $('.fnBrandId').text('(자동부여)');
+        } else if(mode == 'MODIFY') { // 수정
+            $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
+
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').attr('readonly', true);
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BRAND_NM').attr('readonly', true);
+            $('#ITP_FORM_COLLMNG01010_DETAIL_BSNS_REG_NO').attr('readonly', true);
+            $('#ITP_FORM_COLLMNG01010_DETAIL_CORP_REG_NO').attr('readonly', true);
+            // $('#ITP_FORM_COLLMNG01010_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
+            // $('#ITP_FORM_COLLMNG01010_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
+            $('#ITP_FORM_COLLMNG01010_DETAIL_SEARCH_AFFL_SHOP').hide();
+            $('#ITP_FORM_COLLMNG01010_DETAIL_DELETE_AFFL_SHOP').hide();
+			$('#ITP_FORM_COLLMNG01010_DETAIL .itp_form_info').show();
+			$('#ITP_FORM_COLLMNG01010_DETAIL .itp_form_change').hide();
+
+            $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+        } else if(mode == 'VIEW') { // 보기
+            $('#ITP_AJAX_COLLMNG01010_VIEW_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_MODIFY', '#ITP_BTN_COLLMNG01010_CANCELLIST']);
+        }
+    }
+};
+
+
+/*목록화면 Object*/
+let listObj = {
+	init: function() {
+		this.grid.init();
+	},
+	itp_COLLMNG01010_param: {},
+	itp_COLLMNG01010_search: false,
+	button: {
+		search: function() {
+			listObj.itp_COLLMNG01010_search = true;
+			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';
+            console.log(JSON.stringify(param));
+            $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+        }
+	},
+	empty: {
+		init: function() {
+            var _this = this;
+            this.push();
+            $(COLLMNG01010_GRID_EMPTY).on('click', function() {
+                _this.back();
+                listObj.itp_COLLMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+                $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_COLLMNG01010_param)}).trigger('reloadGrid');
+            });
+        },
+        push: function() {
+            let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
+            listObj.itp_COLLMNG01010_param = param;
+            listObj.itp_COLLMNG01010_param.sidx = '0';
+        },
+        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);            
+        }
+	},
+	grid: {
+		init: function() {
+			// 데이터 없을때
+            listObj.empty.push();
+            this.search();
+		},
+		colModel: gridColModel.list,
+		search: function() {
+			pageObj.switchScreen('LIST');
+			this.unload();
+			this.load();
+		},
+		load: function() {
+            let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
+            param.gridSize = $.jgrid.defaults.rowNum;
+            param.sbrandId = 'BRD221100002';            
+            param.sspplyId = 'SPY221100004';
+            param.sidx = '0';
+            console.log(JSON.stringify(param));
+            var option = {
+            	gridId: COLLMNG01010_GRID_ID,
+            	colModel: gridColModel.list,
+            	param: param,
+            	url: DOMAIN + API_RTNMNG_RTN_SPPLY_RTN_GRID_LIST,
+            	pager: COLLMNG01010_GRID_PAGER,
+            	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');
+                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
+                        const spplyIdVal = fn_make_user_info.get('spplyId'); 
+                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
+                        var param = $.param(key);
+                        viewObj.init(param);
+                    }
+				},
+				loadComplete: function(data) {
+					console.log(data);
+                    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);
+                    });
+				},
+				onPaging: function(action) {
+                    itp_fn_grid_paging(COLLMNG01010_GRID_ID, action, param);
+                }
+            };
+            itp_fn_grid_make_remote(option);
+		},
+		clearData: function() {
+			$(COLLMNG01010_GRID_ID).jqGrid('clearGridData', true);
+            $(COLLMNG01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+            $(COLLMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+            $(COLLMNG01010_GRID_EMPTY).show();
+		},
+		unload: function() {
+			$.jgrid.gridUnload(COLLMNG01010_GRID_ID);
+		}
+	}
+}

src/main/webapp/js/app/locales/locale-ko.js

@@ -234,7 +234,19 @@ const ITP_MSG_LOCALE = (function() {
 			"expryYn": "유통기한여부",
 			"expryDate": "유통기한일자",
 			"shmtWhsNm": "출하창고명",
-			"selChk": "대상선택"
+			"selChk": "대상선택",
+			"rtnPodrUnqNo": "반품발주번호",
+			"rtnOdrStCd": "반품발주상태코드",
+			"rtnOdrStNm": "번품발주상태명",
+			"rtnOdrRegDt": "반품발주일자",
+			"colReqDt": "수거요청일",
+			"rtnWhsNm": "수거장소",
+			"rtnDodrTotalAmt": "총 수거금액",
+			"rtnDodrItemQty": "수거품목수",
+			"rtnMgrNm": "수거 담당자",
+			"rtnPodrDtlNo": "반품발주항번",
+			"rtnReqQty": "수거수량",
+			"rtnAmt": "수거금액"
 		},
 		"table": {
 			"brandId": "브랜드ID",

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -321,8 +321,6 @@ let listObj = {
             $('#ITP_FORM_ORDMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG01010_param.brandType);
             $('#ITP_FORM_ORDMNG01010_SERVICE_ST_CD').val(listObj.itp_ORDMNG01010_param.stCd);
             $('#ITP_FORM_ORDMNG01010_SEARCH_BRAND_NM').val(listObj.itp_ORDMNG01010_param.brandNm);
-        	console.log('here');
-        	console.log(listObj.itp_ORDMNG01010_param);            
         }
 	},
 	grid: {
@@ -342,8 +340,6 @@ let listObj = {
             param.gridSize = $.jgrid.defaults.rowNum;
             //param.sspplyId = LOGIN_USER_INFO.spplyId;
             param.sidx = '0';
-            console.log(LOGIN_USER_INFO.spplyId);
-            console.log(fn_make_user_info.get('spplyId'));
             console.log(JSON.stringify(param));
             var option = {
             	gridId: ORDMNG01010_GRID_ID,