정산 현황

src/main/webapp/app/settmng/SETTMNG03010.html

@@ -5,7 +5,6 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>정산현황</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_SETTMNG03010_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_SETTMNG03010_SRH" class="btn btn-success btn-sm DRT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;상세정보&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_SETTMNG03010_NEWREG" class="btn btn-primary btn-sm RJT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;요청&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_SETTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
@@ -16,43 +15,42 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_SETTMNG03010_SEARCH" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_ID" name="sstoreId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
+								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_SETTMNG03010_SERVICE_" class="form-control itp_input" name="">
-												<option value="A"></option>											
+											<select id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN" class="form-control itp_input" name="sgubun">
+												<option value="1">매장</option>											
+												<option value="2">공급업체</option>											
 											</select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_COL_PLACE" class="form-control itp_input" name="sStoreNm" placeholder="매장명" />
+											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="매장명" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
-											<button type="button" id="ITP_BTN_SETTMNG03010_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_SETTMNG03010_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_SETTMNG03010_SEARCH_STORE_POP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_SETTMNG03010_SEARCH_ERASE" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-1 itp_ip itp_noMar" style="width:9%; top:3px;" >
+										<div class="col-xs-1 itp_ip itp_noMar" style="top:3px; margin-right: -15px;" >
 											<label>정산요청일</label>
 										</div>
-										<div class="col-xs-3 itp_ip itp_noMar">
+										<div class="col-xs-2 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_" class="form-control itp_input" name="" value="">
+												<input type="text" id="ITP_FORM_SETTMNG03010_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_SETTMNG03010_SEARCH_" class="form-control itp_input" name="" value="">
+												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value=""> 
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_SETTMNG03010_SEARCH_COL_REQ_DT" class="form-control itp_input" name="sStCd">
-												<option value="A">대기/완료/반려</option>											
-											</select>
+											<select id="ITP_FORM_SETTMNG03010_SEARCH_STTL_ST_CD" data-select-code="STTL_ST_CD" class="form-control itp_input" name="ssttlStCd"></select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_COL_PLACE" class="form-control itp_input" name="sItemNm" placeholder="품목명" />
+											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목명" />
 										</div>
-										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
-											<button type="button" id="ITP_BTN_SETTMNG03010_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_SETTMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
-						                </div>
 									</div>
 								</form>
 							</div>

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -41,25 +41,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.viewCd,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
-		},
-		{
-			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
-			label: "정산관리고유번호", 
-			width: '0', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
-		{
-			index: 'STTL_MGNT_DTL_NO', name: 'sttlMgntDtlNo',
-			label: '정산관리상세번호',
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
-		{
-			index: 'MGNT_UNQ_NO', name: 'mgntUnqNo',
-			label: '관리고유번호',
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
+		},		
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: "브랜드",
@@ -73,15 +55,15 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'LOAN_DVSN', name: 'loanDvsn',
-			label: "정산타입", 
-			width: '8', fixed: false, align: 'center',
+			index: 'SPPLY_NM', name: 'spplyNm',
+			label: "공급사명",
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
 		{
-			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
-			label: "정산타입", 
-			width: '8', fixed: false, align: 'center',
+			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
+			label: "정산번호", 
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -93,92 +75,48 @@ const gridColModel = {
 		{
 			index: 'STTL_ST_NM', name: 'sttlStNm',
 			label: "정산상태", 
-			width: '8', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},		
 		{
-			index: 'ITEM_ID', name: 'itemId',
-			label: "품목코드",
+			index: 'STTL_REQ_DT', name: 'sttlReqDt',
+			label: "정산요청일",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
-			index: 'ITEM_NM', name: 'itemNm',
-			label: "품목명",
+			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
+			label: "정산요청금액",
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
-		},
-		{
-			index: 'UNIT', name: 'unit',
-			label: "단위",
-			width: '6', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
-		},
-		{
-			index: 'UNIT_AMT', name: 'unitAmt',
-			label: "단가",
-			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-		},
+		}, 
 		{
-			index: 'PODR_QTY', name: 'podrQty',
-			label: "발주수량",
-			width: '7', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text', 
-			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+			index: 'STTL_DT', name: 'sttlDt',
+			label: "정산일",
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text'
 		},
 		{
-			index: 'DLV_QTY', name: 'dlvQty',
-			label: "납품수량",
-			width: '7', fixed: false, align: 'center',
+			index: 'STTL_REQ_AMT', name: 'sttlAmt',
+			label: "정산금액",
+			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'WHS_COL_QTY', name: 'whsColQty',
-			label: "입고/수거수량",
+			index: 'ACCT_BAL', name: 'acctBal',
+			label: "잔금",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
 		{
-			index: 'WHS_COL_DT', name: 'whsColDt',
-			label: "입고/수거일자",
-			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
-		},
-		{
-			index: 'WHS_COL_AMT', name: 'whsColAmt',
-			label: "입고/수거금액",
+			index: 'STTL_REG_MGR_NM', name: 'sttlRegMgrNm',
+			label: "등록자",
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text', 
-			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-		},
-		{
-			index: 'STTL_DVSN', name: 'sttlDvsn',
-			label: "정산구분",
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
-		{
-			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
-			label: "정산구분",
-			width: '8', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
-		},
-		{
-			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
-			label: "발주번호",
-			width: '8', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
-		},
-		{
-			index: 'PODR_DTL_NO', name: 'podrDtlNo',
-			label: "발주항번",
-			width: '7', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
-		}	
+		}
 	],
 	view: [
 		{
@@ -343,6 +281,7 @@ let pageObj = {
 	event: {
 		init: function () {
 			this.button();
+			this.change();
 		},
 		button: function () {
 			// 버튼 클릭 이벤트
@@ -352,8 +291,8 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						case 'ITP_BTN_SETTMNG03010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
-						case 'ITP_BTN_SETTMNG03010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
+						// case 'ITP_BTN_SETTMNG03010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
+						// case 'ITP_BTN_SETTMNG03010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
 					}
 				});
 			});
@@ -365,6 +304,29 @@ let pageObj = {
 				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'SETTMNG03010_DETAIL');
 			});
 
+		}, 
+		change: function() {
+			$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN').on('change', function() {
+				var gubunVal = $('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN').val();
+				if(gubunVal == '1') { // 매장
+					$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').attr('placeholder', '매장명');
+					
+					$(SETTMNG03010_GRID_ID).jqGrid('hideCol', ["spplyNm"]);
+					$(SETTMNG03010_GRID_ID).jqGrid('showCol', ["storeNm"]);		
+					// $(SETTMNG03010_GRID_ID).setColProp('spplyNm', {hidden: true});
+					// $(SETTMNG03010_GRID_ID).setColProp('storeNm', {hidden: false});
+								
+				} else if(gubunVal == '2') { // 공급업체
+					$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').attr('placeholder', '공급사명');
+					
+					$(SETTMNG03010_GRID_ID).jqGrid('hideCol', ["storeNm"]);
+					$(SETTMNG03010_GRID_ID).jqGrid('showCol', ["spplyNm"]);
+					// $(SETTMNG03010_GRID_ID).setColProp('storeNm', {hidden: true});
+					// $(SETTMNG03010_GRID_ID).setColProp('spplyNm', {hidden: false});
+				}	
+				listObj.button.search();	
+				// itp_fn_jqgrid_resize(SETTMNG03010_GRID_ID, SETTMNG03010_GRID_LIST, 'lg');							
+			});			
 		}
 	},
 	switchScreen: function(mode) {
@@ -415,68 +377,6 @@ let listObj = {
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
 			$(SETTMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
-		},
-		reqSttl: function() { // 정산요청
-			// 매장선택 체크
-			if($('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val() == '') {
-				itp_fn_modal_alert_ajax('정산요청을 위한 매장을 선택하세요.');
-				return;
-			}
-		
-			// 그리드에서 최소1개는 선택해야 함
-			const rowKey = $(SETTMNG03010_GRID_ID).getGridParam('selrow');
-		    if (!rowKey) {
-				itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.ajax.noData);
-		    	return;
-		    }
-
-			var selectedIds = $(SETTMNG03010_GRID_ID).getGridParam('selarrrow');
-			let sttlReqDataList = [];			
-			var check = true;
-			$.each(selectedIds, function(key, value) {
-				var sttlMgntUnqNo = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).sttlMgntUnqNo;				
-				var sttlMgntDtlNo = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).sttlMgntDtlNo;
-				var loanDvsn = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).loanDvsn;		// 여신구분
-				var sttlStCd = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).sttlStCd;		// 정산상태코드
-				var sttlDvsn = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).sttlDvsn;		// 정산구분
-				var mgntUnqNo = $(SETTMNG03010_GRID_ID).jqGrid('getRowData', value).mgntUnqNo;
-								
-				if(sttlStCd == 'ST10' || sttlStCd == 'ST20') { // 정산요청 및 정산확정 건은 정산요청이 불가능 
-					check = false;	
-				}
-				let data = {}
-				data.sttlMgntUnqNo = sttlMgntUnqNo;
-				data.sttlMgntDtlNo = sttlMgntDtlNo;
-				data.loanDvsn = loanDvsn;
-				data.sttlDvsn = sttlDvsn;
-				data.mgntUnqNo = mgntUnqNo;
-				sttlReqDataList.push(data);
-			});
-			if(!check) {
-				itp_fn_modal_alert_ajax('정산요청 및 확정된 건은 정산 요청이 불가능합니다.');
-				return;
-			}
-			
-			let param = {};
-			param.brandId = $('#ITP_FORM_SETTMNG03010_SEARCH_BRAND_ID').val();
-			param.storeId = $('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val();
-			param.sttlReqDataList = sttlReqDataList;
-			fn_ajax_call(STTL_REQ_REQUEST_STTL, JSON.stringify(param), function(result) {
-				
-				// alert(JSON.stringify(result));
-				// $('#ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
-				
-				const sttlMgntUnqNoVal = result.sttlMgntUnqNo;
-				const key = {sttlMgntUnqNo: sttlMgntUnqNoVal, viewCd: 'R'};
-				var param = $.param(key);
-				modifyObj.init(param);
-				
-			}, 'POST');
-			
-			// pageObj.switchScreen('ADD');			
-			// itp_fn_form_clear_validate(null, '#ITP_FORM_SETTMNG03010_DETAIL');						
-			// 로케이션 리스트 조회
-			// createObj.init();
 		}
 	},
 	empty: {
@@ -524,11 +424,10 @@ let listObj = {
 				param: param,
 				url: DOMAIN + STTL_STATE_DETAIL_GRID_LIST,
 				pager: SETTMNG03010_GRID_PAGER,
-				multiselect: true, 
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
 					var colNm = cm[cellIdx].name;
-					if (colNm == 'sttlReqDt') {
+					if (colNm == 'sttlMgntUnqNo') {
 						const sttlMgntUnqNoVal = $(this).jqGrid('getCell', rowId, 'sttlMgntUnqNo');
 						
 						const key = {sttlMgntUnqNo: sttlMgntUnqNoVal, viewCd: 'R'};
@@ -541,7 +440,7 @@ let listObj = {
 					itp_fn_grid_load_complete(data, SETTMNG03010_GRID_ID, true, 'number', 'SETTMNG03010', listObj.itp_SETTMNG03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(SETTMNG03010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
-						// $(SETTMNG03010_GRID_ID).jqGrid('setCell', rowId, 'sttlReqDt', '', ITP_GRID_COL_STYLE.link);
+						$(SETTMNG03010_GRID_ID).jqGrid('setCell', rowId, 'sttlMgntUnqNo', '', ITP_GRID_COL_STYLE.link);
 					});
 				},
 				onPaging: function(action) {
@@ -570,37 +469,6 @@ let modifyObj = {
 	button: {
 		cancel: function() {
 			listObj.grid.search();
-		},
-		request: function() {
-			
-			const formId = '#ITP_FORM_SETTMNG03010_DETAIL';
-			itp_fn_form_clear_validate(null, formId);
-			
-			var vali_sttlReqDt = itp_fn_form_validate(formId, formId + '_STTL_REQ_DT', ['empty'], undefined); // 정산요청일자
-			
-			if (vali_sttlReqDt) {
-				let sttlReqDataList = [];
-				const rowData = $(SETTMNG03010_DETAIL_GRID_ID).getRowData();
-				// const keyValue = $(formId + '_WHS_ID').val();
-				$.each(rowData, function(key, value) {
-					sttlReqDataList.push(value);
-				});
-				let param = $(formId).serializeObject();
-				param.sttlReqDataList = sttlReqDataList;
-				
-				// console.log(JSON.stringify(param));
-				var confirmFn= {
-					callBack: function() {
-						//
-						var searhFn = function() {
-							ITP_FORM_SETTMNG03010_DETAIL_IS_WRITING = false;
-							listObj.grid.search();
-						};
-						fn_ajax_call(STTL_REQ_REQUEST_STTL_PROC, JSON.stringify(param), searhFn, 'POST'); 	
-					}
-				};
-				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.form.procData, confirmFn, null);				
-			}
 		}
 	}, 
 	load: function(param) {