From 17dae88049b0a1023c4add8aa2348f911e313d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 10 Sep 2024 18:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=B9=E7=94=A8=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/finance.js                      |   7 +
 src/components/scEcharts/index.vue            |   6 +-
 src/components/scSearch/index.vue             |   2 +
 src/layout/components/userbar.vue             |  18 +-
 src/layout/index.vue                          |   1 -
 src/style/app.scss                            |   3 +-
 src/views/cost/feeRecords/index.vue           |   4 +-
 .../shipmentStatistics/components/table.vue   |  97 +++++
 src/views/cost/shipmentStatistics/index.vue   | 376 ++++++++----------
 .../feesStatistics/components/table.vue       |  96 +++++
 src/views/finance/feesStatistics/index.vue    | 337 ++++++----------
 src/views/home/widgets/components/echarts.vue |   2 +-
 src/views/setting/company/index.vue           |  39 +-
 13 files changed, 546 insertions(+), 442 deletions(-)
 create mode 100644 src/views/cost/shipmentStatistics/components/table.vue
 create mode 100644 src/views/finance/feesStatistics/components/table.vue

diff --git a/src/api/model/finance.js b/src/api/model/finance.js
index f3127cf..f555665 100644
--- a/src/api/model/finance.js
+++ b/src/api/model/finance.js
@@ -73,5 +73,12 @@ export default {
 				return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'});
 			}
 		},
+		summary:{
+			url: `${config.API_URL}/cost.summary.list`,
+			name: "成本汇总",
+			post: async function (params) {
+				return await http.post(this.url, params);
+			}
+		}
 	},
 };
diff --git a/src/components/scEcharts/index.vue b/src/components/scEcharts/index.vue
index 9e2112c..8819cd0 100644
--- a/src/components/scEcharts/index.vue
+++ b/src/components/scEcharts/index.vue
@@ -27,7 +27,9 @@
 			option: {
 				deep:true,
 				handler (v) {
-					unwarp(this.myChart).setOption(v);
+					if(unwarp(this.myChart)){
+						unwarp(this.myChart).setOption(v);
+					}
 				}
 			}
 		},
@@ -54,7 +56,7 @@
 		},
 		methods: {
 			draw(){
-				var myChart = echarts.init(this.$refs.scEcharts, 'T');
+				const myChart = echarts.init(this.$refs.scEcharts, 'T');
 				myChart.setOption(this.myOptions);
 				this.myChart = myChart;
 				window.addEventListener('resize', () => myChart.resize());
diff --git a/src/components/scSearch/index.vue b/src/components/scSearch/index.vue
index ebd2dba..3d1f114 100644
--- a/src/components/scSearch/index.vue
+++ b/src/components/scSearch/index.vue
@@ -12,6 +12,7 @@
 		</div>
 		<div class="searchItem" v-if="item.type == 'select' && ((item.isOpen && item.show) || item.show)">
 			<label class="name">{{item.name}}</label>
+
 			<el-select class="input" :size="size" v-model="params[item.code]" @visible-change="getSelect(item,$event)" :placeholder="item.placeholder" filterable clearable>
 				<el-option v-for="em in item.data" :key="em" :label="em.label" :value="em[item.code[0]] || em.active_status"></el-option>
 			</el-select>
@@ -31,6 +32,7 @@
 			</div>
 		</div>
 	</div>
+	<slot></slot>
 </template>
 
 <script>
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 7c624e8..dd5595f 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -98,28 +98,28 @@
 						id: 1,
 						type: 'user',
 						avatar: "img/avatar.jpg",
-						title: "Skuya",
+						title: "dragon",
 						describe: "如果喜欢就点个星星支持一下哦",
-						link: "https://gitee.com/lolicode/scui",
+						link: "",
 						time: "5分钟前"
 					},
 					{
 						id: 2,
 						type: 'user',
 						avatar: "img/avatar2.gif",
-						title: "Lolowan",
+						title: "ykxiao",
 						describe: "点进去Gitee获取最新开源版本",
-						link: "https://gitee.com/lolicode/scui",
+						link: "",
 						time: "14分钟前"
 					},
 					{
 						id: 3,
 						type: 'system',
-						avatar: "img/logo.png",
-						title: "感谢登录SCUI Admin",
-						describe: "Vue 3.0 + Vue-Router 4.0 + ElementPlus + Axios 后台管理系统。",
-						link: "https://gitee.com/lolicode/scui",
-						time: "2020年7月24日"
+						avatar: "img/logo1.png",
+						title: "感谢登录象玮云科",
+						describe: "后台管理系统。",
+						link: "",
+						time: "2024年7月24日"
 					}
 				]
 			}
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 003d353..e8c5ee0 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -59,7 +59,6 @@
 						<img class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/logo.png" alt="">
 					</span>
 					<img v-else class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/login_logo.png">
-<!--					<span v-else>{{ $CONFIG.APP_NAME }}</span>-->
 				</div>
 				<div class="adminui-side-bottom" @click="$store.commit('TOGGLE_menuIsCollapse')">
 					<el-icon><el-icon-expand v-if="menuIsCollapse"/><el-icon-fold v-else /></el-icon>
diff --git a/src/style/app.scss b/src/style/app.scss
index a7c8daf..d61a2f9 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -63,7 +63,8 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-side-top .adminui-side-collapse{width: 64px;display: flex;align-items: center;justify-content: center;cursor: pointer;}
 .adminui-side-top .adminui-side-collapse i{font-size: 16px;}
 .adminui-side-scroll {overflow: auto;overflow-x:hidden;flex: 1;}
-.adminui-side-bottom {border-top: 1px solid #ebeef5;height:51px;cursor: pointer;display: flex;align-items: center;justify-content: center;}
+//border-top: 1px solid #ebeef5;
+.adminui-side-bottom {height:51px;cursor: pointer;display: flex;align-items: center;justify-content: center;}
 .adminui-side-bottom i {font-size: 16px;}
 .adminui-side-bottom:hover {color: var(--el-color-primary);}
 .aminui-side.isCollapse {width: 65px;}
diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
index 6ba0537..3ee1b84 100644
--- a/src/views/cost/feeRecords/index.vue
+++ b/src/views/cost/feeRecords/index.vue
@@ -90,8 +90,8 @@ export default {
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'费用类型',type:'select',code:'type_name', data:[], placeholder:"请选择费用类型",show:true},
-				{name:'费用类别',type:'select',code:'category_name', data:[], placeholder:"请选择费用类别",isOpen:true,show:false},
+				{name:'费用类型',type:'select',code:['type_name'], data:[], placeholder:"请选择费用类型",show:true},
+				{name:'费用类别',type:'select',code:['category_name'], data:[], placeholder:"请选择费用类别",isOpen:true,show:false},
 				{name:'地址',type:'text',code:['location'],placeholder:"请输入地址",isOpen:true,show:false},
 				{name:'单号',type:'text',code:['identifier'],placeholder:"请输入单号",isOpen:true,show:false},
 				{name:'单位',type:'text',code:['unit'],placeholder:"请输入单位",isOpen:true,show:false},
diff --git a/src/views/cost/shipmentStatistics/components/table.vue b/src/views/cost/shipmentStatistics/components/table.vue
new file mode 100644
index 0000000..ef9a6a1
--- /dev/null
+++ b/src/views/cost/shipmentStatistics/components/table.vue
@@ -0,0 +1,97 @@
+<template>
+	<div class="feesTable">
+		<el-scrollbar>
+			<table>
+				<thead class="columnView">
+					<tr class="th" v-if="data.header">
+						<th class="td sq">序号</th>
+						<th class="td">成本类型</th>
+						<th class="td" v-for="(item,index) in data.header" :key="index">{{item}}</th>
+					</tr>
+				</thead>
+				<tbody class="rowView">
+					<tr class="tr" v-for="(item,index) in data.data" :key="index">
+						<td class="td sq">{{index + 1}}</td>
+						<td class="td" v-for="(em,ind) in item" :key="ind">{{em}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</el-scrollbar>
+	</div>
+</template>
+
+<script>
+export default {
+	name: "",
+	props:{
+		info:{
+			type:Object,
+		}
+	},
+	watch:{
+		info:{
+			handler(val){
+				if(val){
+					this.data = val;
+				}
+			},
+			deep:true
+		}
+	},
+	data(){
+		return{
+			data:this.info
+		}
+	},
+	mounted() {
+
+	},
+	methods:{
+
+	}
+}
+</script>
+
+<style scoped lang="scss">
+	.columnView{
+		display: flex;
+		flex-wrap: nowrap;
+		.th{
+			display: flex;
+			flex-wrap: nowrap;
+			background: #F5F7FA;
+			padding: 6px 5px;
+			.td{
+				white-space: nowrap;
+				margin: 0 10px;
+				line-height: 23px;
+				width: 90px;
+				text-align: left;
+				color: #606266;
+				font-weight: 400;
+			}
+			.sq{
+				width: 45px;
+			}
+		}
+	}
+	.rowView{
+		.tr{
+			display: flex;
+			flex-wrap: nowrap;
+			border-bottom: 1px solid #ebeef5;
+			padding: 6px 5px;
+			.td{
+				white-space: nowrap;
+				margin: 0 10px;
+				width: 90px;
+				line-height: 23px;
+				color: #606266;
+				font-weight: inherit;
+			}
+			.sq{
+				width: 45px;
+			}
+		}
+	}
+</style>
diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue
index e368930..5c3dfab 100644
--- a/src/views/cost/shipmentStatistics/index.vue
+++ b/src/views/cost/shipmentStatistics/index.vue
@@ -1,76 +1,48 @@
 <template>
-	<el-container class="mainBox mainHeaderNoBorderPadding">
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<template #header>
-						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
-					</template>
-					<template #download>
-						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
-					</template>
-				</scImport>
-			</div>
-			<div class="right-panel">
-				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
-					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
-				</scExport>
-			</div>
-		</el-header>
+	<el-container class="mainBox mainBoxHeaderNoBorder">
 		<el-main class="nopadding">
-			<div class="searchMain searchMainNoTop">
-				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
-
-				<div class="searchItem searchBtn">
-					<el-button :size="size" :icon="searchShow?'el-icon-ArrowUpBold':'el-icon-ArrowDownBold'" @click="searchShowClick">{{searchShow?'收起':'更多'}}</el-button>
-					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
-					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
+			<el-scrollbar>
+				<div class="searchMain">
+					<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData">
+						<div class="searchItem">
+							<label class="name">时间粒度</label>
+							<el-select :size="size" class="input" placeholder="请选择时间粒度" v-model="reqParams.date_type">
+								<el-option v-for="(item,index) in setMap.dataTypeList" :key="index" :label="item.label" :value="item.date_type"></el-option>
+							</el-select>
+						</div>
+						<div class="searchItem">
+							<label class="name">时间范围</label>
+							<el-date-picker :size="size" class="input" type="daterange" v-model="reqParams.dateSelect" value-format="YYYY-MM-DD" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
+						</div>
+					</scSearch>
+					<div class="searchItem searchBtn">
+						<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
+						<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
+						<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
+							<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
+						</scExport>
+					</div>
 				</div>
-			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
-				<el-table-column type="selection" align="center" width="40"></el-table-column>
-				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
-				<template #logo="scope">
-					<el-image class="logoCell" :src="scope.row.logo" preview-teleported :preview-src-list="[scope.row.logo]" fit="contain">
-						<template #error>
-							<div class="image-slot" style="text-align: center;font-size: 20px;">
-								<el-icon><el-icon-Picture /></el-icon>
-							</div>
-						</template>
-					</el-image>
-				</template>
-				<template #active_status="scope">
-					<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
-				</template>
-				<el-table-column label="操作" fixed="right" align="center" width="150">
-					<template #default="scope">
-						<el-dropdown>
-							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
-									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-AbilityAuthorization" @click="table_empower(scope.row)" divided>功能授权</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-DataAuthorization">数据授权</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-UserList" @click="table_user_ist(scope.row)" divided>用户列表</el-dropdown-item>
-									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-					</template>
-				</el-table-column>
-			</scTable>
+				<div class="mainMiddle">
+					<div class="echartsView">
+						<scEcharts ref="c1" height="300px" :option="option"></scEcharts>
+					</div>
+					<div class="tableView">
+						<feesTable :info="feesData.tableList"></feesTable>
+					</div>
+				</div>
+			</el-scrollbar>
 		</el-main>
 	</el-container>
-
 </template>
 
 <script>
-
+import scEcharts from '@/components/scEcharts';
+import feesTable from './components/table'
 export default {
 	components: {
-
+		scEcharts,
+		feesTable
 	},
 	data() {
 		return {
@@ -79,179 +51,145 @@ export default {
 				save: false,
 				show: false,
 			},
-			list: {
-				apiObj: {},
-				column: [],
+			setMap:{
+				dataTypeList:[
+					{date_type:'hour',label:'按时'},
+					{date_type:'day',label:'按天'},
+					{date_type:'month',label:'按月'},
+					{date_type:'year',label:'按年'},
+				],
 			},
+			option:{},
+			feesData:{
+				tableList:{}
+			},
+
 			selection: [],
 			exportShow:false,
-			searchShow:false,
 			searchList:[
-				{name:'生产日期',type:'date',code:'activation_date'},
-				{name:'反厂日期',type:'date',code:'activation_date'},
-				{name:'处理时间',type:'date',code:'activation_date'},
-				{name:'客户名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:false},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:false},
-				{name:'工单号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
-				{name:'邮件地址',type:'text',code:['email'],placeholder:"请输入邮箱地址",isOpen:true,show:false},
-				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址",isOpen:true,show:false},
-				{name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人",isOpen:true,show:false},
-				{name:'关键字',type:'text',code:['domain','name'],keyword:true,show:true},
+				{name:'成本类型',type:'select',code:['type_name'], data:[], placeholder:"请选择费用类型",show:true},
+				{name:'成本类别',type:'select',code:['category_name'], data:[], placeholder:"请选择费用类别",show:true},
 			],
 			params: {},
+			reqParams:{
+				page:1,
+				pageSize:30,
+				date_type:'day',
+				dateSelect:[],
+				start:'',
+				end:'',
+			}
 		}
 	},
+	watch:{
+		'reqParams.dateSelect':function (val){
+			if(val){
+				this.reqParams.start = val[0];
+				this.reqParams.end = val[1];
+			}else{
+				this.reqParams.start = "";
+				this.reqParams.end = "";
+			}
+		}
+	},
+	computed:{
+
+	},
+	created(){
+
+	},
+	mounted() {
+		this.getData();
+	},
 	methods: {
-		searchShowClick(){
-			this.searchShow = !this.searchShow;
-			this.searchList.forEach(item=>{
-				if(item.isOpen){
-					item.show = this.searchShow
-				}
-			})
-		},
-		getSelectData(item){
-			let {data,params} = item;
+		async getSelectData(item) {
+			let {data, params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if (typeof data.code === 'string') {
+				searchParams.field = data.code;
+			} else {
+				searchParams.field = data.code[0];
 			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
+			if (data.type == 'select') {
+				const res = await this.$API.finance.cost.field.post(searchParams);
+				if (res.code == 200) {
+					if (res.data && res.data.length > 0) {
+						res.data.forEach(item => {
+							item.label = item[data.code];
+							item.value = item.id;
+						})
 					}
-				})
+					this.searchList.forEach(item => {
+						if (item.code == data.code) {
+							item.data = res.data;
+						}
+					})
+				}
 			}
 		},
-		async getStatusList(data,params) {
-			const res = await this.$API.oss.status.post(params);
+
+		async getData() {
+			const res = await this.$API.finance.cost.summary.post(this.reqParams);
 			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
+				res.data.tableList.data = this.setTableList(res.data.tableList.data);
+				this.feesData = res.data;
+				let option = {
+					tooltip: {
+						trigger: 'axis'
+					},
+					xAxis: {
+						boundaryGap: false,
+						type: 'category',
+						data: this.feesData.dateRange
+					},
+					yAxis: [{
+						type: 'value',
+						name: '',
+						splitLine: {
+							show: false
+						}
+					}],
+					series: this.setList(this.feesData.summaryList),
+				};
+				this.option = option;
 			}
 		},
-
-		//添加
-		add(){
-			this.dialog.save = true;
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open()
-			})
-		},
-
-		// 批量导入
-		importFile(){
-			this.$nextTick(()=>{
-				this.$refs.scImport.importFile();
-			})
-		},
-		async importTemplate() {
-			const res = await this.$API.orders.order.maintenance.template.post();
-			const blob = new Blob([res]);
-			const text = new Date().getTime();
-			const eLink = document.createElement('a');
-			eLink.download = "维保导入模版_"+text+'.xlsx';
-			eLink.style.display = 'none';
-			eLink.href = URL.createObjectURL(blob);
-			document.body.appendChild(eLink);
-			eLink.click();
-			URL.revokeObjectURL(eLink.href);
-			document.body.removeChild(eLink);
-		},
-		async importUpload(params) {
-			const res = await this.$API.orders.order.maintenance.import.post(params);
-			if(res.code == 200){
-				this.$message.success('上传成功，开始导入数据');
+		setList(data){
+			let newData = data[0].cost_item.map(item => ({
+				name: item,
+				data: [],
+				type:'bar',
+				symbol: 'none',
+				stack:'fees'
+			}));
+			if(data && data.length>0){
+				data.forEach(item => {
+					item.cost_amount.forEach((amount, index) => {
+						newData[index].data.push(amount);
+					});
+				});
 			}
+			return newData
 		},
-		importSuccess(){
-			this.$refs.table.refresh()
+		setTableList(data){
+			let newData = data.columns.map(column => [column]);
+			if(data.rows && data.rows.length>0){
+				data.rows.forEach((row, rowIndex) => {
+					data.columns.forEach((columnName, columnIndex) => {
+						newData[columnIndex][1 + rowIndex] = row[columnIndex]==0?'-':'¥'+row[columnIndex];
+					});
+				});
+			}
+			return newData
 		},
 
-		//编辑
-		table_edit(row){
-			this.dialog.save = true
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open('edit').setData(row)
-			})
-		},
-		//查看
-		table_show(row){
-			this.dialog.show = true
-			this.$nextTick(() => {
-				this.$refs.showDialog.open('show').setData(row);
-			})
-		},
-		//删除
-		async table_del(row){
-			this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {
-				type: 'warning'
-			}).then(async () => {
-				const reqData = {id: row.id};
-				const res = await this.$API.system.company.delete.post(reqData);
-				if(res.code == 200){
-					this.$refs.table.refresh()
-					this.$message.success("删除成功")
-				}else{
-					await this.$alert(res.message, "提示", {type: 'error'})
-				}
-			}).catch(()=>{})
-		},
-		// 功能授权
-		table_empower(row){
-			this.$router.push({
-				path: '/setting/company/add-permission',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
-		// 公司用户列表
-		table_user_ist(row){
-			this.$router.push({
-				path: '/setting/user/company-user-list',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
 		//表格选择后回调事件
 		selectionChange(selection){
 			this.selection = selection;
 		},
-		// 状态
-		changeSwitch(val, row) {
-			row.$switch_yx = true;
-			setTimeout(async () => {
-				let params = {
-					id: row.id,
-					status: row.active_status,
-				};
-				const res = await this.$API.system.company.status.post(params);
-				if(res.code !=200){
-					row.active_status = !row.active_status;
-				}
-				delete row.$switch_status;
-				delete row.$switch_yx;
-			}, 500);
-		},
+
 		// 下载导出
 		exportChangeShow(params){
 			if(params.type == 11){
@@ -266,15 +204,23 @@ export default {
 			}
 		},
 		upSearch(){
-			this.$refs.table.upData(this.params);
+			this.reqParams = {...this.reqParams,...this.params};
+			this.getData();
 		},
 		reset(){
-			this.params = {};
+			this.reqParams = {
+				page:1,
+				pageSize:30,
+				date_type:'day',
+				dateSelect:[],
+				start:'',
+				end:''
+			};
 			this.$refs.scSearch.reload();
-			this.$refs.table.reload();
+			this.getData();
 		},
 		handleSaveSuccess(){
-			this.$refs.table.refresh();
+			// this.$refs.table.refresh();
 		},
 	}
 }
diff --git a/src/views/finance/feesStatistics/components/table.vue b/src/views/finance/feesStatistics/components/table.vue
new file mode 100644
index 0000000..20e2c3b
--- /dev/null
+++ b/src/views/finance/feesStatistics/components/table.vue
@@ -0,0 +1,96 @@
+<template>
+	<div class="feesTable">
+		<el-scrollbar>
+			<table>
+				<thead class="columnView">
+					<tr class="th">
+						<th class="td sq">序号</th>
+						<th class="td">成本类型</th>
+						<th class="td" v-for="(item,index) in data.header" :key="index">{{item}}</th>
+					</tr>
+				</thead>
+				<tbody class="rowView">
+					<tr class="tr" v-for="(item,index) in data.data" :key="index">
+						<td class="td sq">{{index + 1}}</td>
+						<td class="td" v-for="(em,ind) in item" :key="ind">{{em}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</el-scrollbar>
+	</div>
+</template>
+
+<script>
+export default {
+	name: "",
+	props:{
+		info:{
+			type:Object,
+		}
+	},
+	watch:{
+		info:{
+			handler(val){
+				if(val){
+					this.data = val;
+				}
+			},
+			deep:true
+		}
+	},
+	data(){
+		return{
+			data:this.info
+		}
+	},
+	mounted() {
+
+	},
+	methods:{
+
+	}
+}
+</script>
+
+<style scoped lang="scss">
+	.columnView{
+		display: flex;
+		flex-wrap: nowrap;
+		.th{
+			display: flex;
+			flex-wrap: nowrap;
+			background: #F5F7FA;
+			padding: 4px 5px;
+			.td{
+				white-space: nowrap;
+				margin: 0 10px;
+				line-height: 23px;
+				width: 90px;
+				text-align: left;
+				color: #606266;
+				font-weight: 400;
+			}
+			.sq{
+				width: 45px;
+			}
+		}
+	}
+	.rowView{
+		.tr{
+			display: flex;
+			flex-wrap: nowrap;
+			border-bottom: 1px solid #ebeef5;
+			padding: 4px 5px;
+			.td{
+				white-space: nowrap;
+				margin: 0 10px;
+				width: 90px;
+				line-height: 23px;
+				color: #222;
+			}
+			.sq{
+				width: 45px;
+			}
+		}
+	}
+</style>
diff --git a/src/views/finance/feesStatistics/index.vue b/src/views/finance/feesStatistics/index.vue
index ae7fc30..b568ca2 100644
--- a/src/views/finance/feesStatistics/index.vue
+++ b/src/views/finance/feesStatistics/index.vue
@@ -1,73 +1,38 @@
 <template>
-	<el-container class="mainBox mainHeaderNoBorderPadding">
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<template #header>
-						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
-					</template>
-					<template #download>
-						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
-					</template>
-				</scImport>
-			</div>
-			<div class="right-panel">
-				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
-					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
-				</scExport>
-			</div>
-		</el-header>
+	<el-container class="mainBox mainBoxHeaderNoBorder">
 		<el-main class="nopadding">
-			<div class="searchMain searchMainNoTop">
-				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
-
-				<div class="searchItem searchBtn">
-					<el-button :size="size" :icon="searchShow?'el-icon-ArrowUpBold':'el-icon-ArrowDownBold'" @click="searchShowClick">{{searchShow?'收起':'更多'}}</el-button>
-					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
-					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
+			<el-scrollbar>
+				<div class="searchMain">
+					<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
+					<div class="searchItem searchBtn">
+						<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
+						<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
+						<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
+							<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
+						</scExport>
+					</div>
 				</div>
-			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
-				<el-table-column type="selection" align="center" width="40"></el-table-column>
-				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
-				<template #logo="scope">
-					<el-image class="logoCell" :src="scope.row.logo" preview-teleported :preview-src-list="[scope.row.logo]" fit="contain">
-						<template #error>
-							<div class="image-slot" style="text-align: center;font-size: 20px;">
-								<el-icon><el-icon-Picture /></el-icon>
-							</div>
-						</template>
-					</el-image>
-				</template>
-				<template #active_status="scope">
-					<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
-				</template>
-				<el-table-column label="操作" fixed="right" align="center" width="150">
-					<template #default="scope">
-						<el-dropdown>
-							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑费用</el-dropdown-item>
-									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除费用</el-dropdown-item>
-									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See" divided>查看详情</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-					</template>
-				</el-table-column>
-			</scTable>
+				<div class="mainMiddle">
+					<div class="echartsView">
+						<scEcharts ref="c1" height="300px" :option="option"></scEcharts>
+					</div>
+					<div class="tableView">
+						<feesTable :info="feesData.tableList"></feesTable>
+					</div>
+				</div>
+			</el-scrollbar>
 		</el-main>
 	</el-container>
 
 </template>
 
 <script>
-
+import scEcharts from '@/components/scEcharts';
+import feesTable from './components/table'
 export default {
 	components: {
-
+		scEcharts,
+		feesTable
 	},
 	data() {
 		return {
@@ -76,177 +41,131 @@ export default {
 				save: false,
 				show: false,
 			},
-			list: {
-				apiObj: this.$API.finance.cost.list,
-				column: [],
+			option:{},
+			feesData:{
+				tableList:{}
 			},
+
 			selection: [],
 			exportShow:false,
-			searchShow:false,
 			searchList:[
-				{name:'费用类型',type:'multiple',code:'type_name', data:[], placeholder:"请选择费用类型",show:true},
-				{name:'费用类别',type:'select',code:'category_name', data:[], placeholder:"请选择费用类别",show:false},
-				{name:'地址',type:'text',code:['location'],placeholder:"地址",isOpen:true,show:false},
-				{name:'单号',type:'text',code:['identifier'],placeholder:"请输入单号",isOpen:true,show:false},
-				{name:'单位',type:'text',code:['unit'],placeholder:"请输入单位",isOpen:true,show:false},
-				{name:'交付/快递日期',type:'date',code:'time',show:true},
-				{name:'新增日期',type:'date',code:'created_at',show:true},
-				{name:'关键字',type:'text',code:['quantity','amount','remark'],keyword:true,show:true},
+				{name:'成本类型',type:'select',code:['type_name'], data:[], placeholder:"请选择费用类型",show:true},
+				{name:'成本类别',type:'select',code:['category_name'], data:[], placeholder:"请选择费用类别",show:true},
+				{name:'时间粒度',type:'select',code:['date_type'],
+					data:[
+						{date_type:'hour',label:'按时'},
+						{date_type:'day',label:'按天'},
+						{date_type:'month',label:'按月'},
+						{date_type:'year',label:'按年'},
+					], placeholder:"请选择时间粒度",show:true},
+				{name:'时间范围',type:'date',code:'time',show:true},
 			],
-			params: {},
+			params: {
+				page:1,
+				pageSize:30,
+				date_type:'day',
+				// start:'2024-01-01',
+				// end:'2024-12-31'
+			},
 		}
 	},
+	created(){
+
+	},
+	mounted() {
+		this.getData();
+	},
 	methods: {
-		searchShowClick(){
-			this.searchShow = !this.searchShow;
-			this.searchList.forEach(item=>{
-				if(item.isOpen){
-					item.show = this.searchShow
-				}
-			})
-		},
-		getSelectData(item){
-			let {data,params} = item;
+		async getSelectData(item) {
+			let {data, params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if (typeof data.code === 'string') {
+				searchParams.field = data.code;
+			} else {
+				searchParams.field = data.code[0];
 			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
+			if (data.type == 'select') {
+				const res = await this.$API.finance.cost.field.post(searchParams);
+				if (res.code == 200) {
+					if (res.data && res.data.length > 0) {
+						res.data.forEach(item => {
+							item.label = item[data.code];
+							item.value = item.id;
+						})
 					}
-				})
+					this.searchList.forEach(item => {
+						if (item.code == data.code) {
+							item.data = res.data;
+						}
+					})
+				}
 			}
 		},
-		async getStatusList(data,params) {
-			const res = await this.$API.oss.status.post(params);
+
+		async getData() {
+			const res = await this.$API.finance.cost.summary.post(this.params);
 			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
+				res.data.tableList.data = this.setTableList(res.data.tableList.data);
+				this.feesData = res.data;
+
+				console.log(this.feesData)
+				let option = {
+					tooltip: {
+						trigger: 'axis'
+					},
+					xAxis: {
+						boundaryGap: false,
+						type: 'category',
+						data: this.feesData.dateRange
+					},
+					yAxis: [{
+						type: 'value',
+						name: '',
+						splitLine: {
+							show: false
+						}
+					}],
+					series: this.setList(this.feesData.summaryList),
+				};
+				this.option = option;
 			}
 		},
-
-		//添加
-		add(){
-			this.dialog.save = true;
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open()
-			})
-		},
-
-		// 批量导入
-		importFile(){
-			this.$nextTick(()=>{
-				this.$refs.scImport.importFile();
-			})
-		},
-		async importTemplate() {
-			const res = await this.$API.orders.order.maintenance.template.post();
-			const blob = new Blob([res]);
-			const text = new Date().getTime();
-			const eLink = document.createElement('a');
-			eLink.download = "维保导入模版_"+text+'.xlsx';
-			eLink.style.display = 'none';
-			eLink.href = URL.createObjectURL(blob);
-			document.body.appendChild(eLink);
-			eLink.click();
-			URL.revokeObjectURL(eLink.href);
-			document.body.removeChild(eLink);
-		},
-		async importUpload(params) {
-			const res = await this.$API.orders.order.maintenance.import.post(params);
-			if(res.code == 200){
-				this.$message.success('上传成功，开始导入数据');
+		setList(data){
+			let newData = data[0].cost_item.map(item => ({
+				name: item,
+				data: [],
+				type:'bar',
+				symbol: 'none',
+				stack:'fees'
+			}));
+			if(data && data.length>0){
+				data.forEach(item => {
+					item.cost_amount.forEach((amount, index) => {
+						newData[index].data.push(amount);
+					});
+				});
 			}
+			return newData
 		},
-		importSuccess(){
-			this.$refs.table.refresh()
+		setTableList(data){
+			let newData = data.columns.map(column => [column]);
+			if(data.rows && data.rows.length>0){
+				data.rows.forEach((row, rowIndex) => {
+					data.columns.forEach((columnName, columnIndex) => {
+						newData[columnIndex][1 + rowIndex] = row[columnIndex]==0?'-':'¥'+row[columnIndex];
+					});
+				});
+			}
+			return newData
 		},
 
-		//编辑
-		table_edit(row){
-			this.dialog.save = true
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open('edit').setData(row)
-			})
-		},
-		//查看
-		table_show(row){
-			this.dialog.show = true
-			this.$nextTick(() => {
-				this.$refs.showDialog.open('show').setData(row);
-			})
-		},
-		//删除
-		async table_del(row){
-			this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {
-				type: 'warning'
-			}).then(async () => {
-				const reqData = {id: row.id};
-				const res = await this.$API.system.company.delete.post(reqData);
-				if(res.code == 200){
-					this.$refs.table.refresh()
-					this.$message.success("删除成功")
-				}else{
-					await this.$alert(res.message, "提示", {type: 'error'})
-				}
-			}).catch(()=>{})
-		},
-		// 功能授权
-		table_empower(row){
-			this.$router.push({
-				path: '/setting/company/add-permission',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
-		// 公司用户列表
-		table_user_ist(row){
-			this.$router.push({
-				path: '/setting/user/company-user-list',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
 		//表格选择后回调事件
 		selectionChange(selection){
 			this.selection = selection;
 		},
-		// 状态
-		changeSwitch(val, row) {
-			row.$switch_yx = true;
-			setTimeout(async () => {
-				let params = {
-					id: row.id,
-					status: row.active_status,
-				};
-				const res = await this.$API.system.company.status.post(params);
-				if(res.code !=200){
-					row.active_status = !row.active_status;
-				}
-				delete row.$switch_status;
-				delete row.$switch_yx;
-			}, 500);
-		},
+
 		// 下载导出
 		exportChangeShow(params){
 			if(params.type == 11){
@@ -261,15 +180,15 @@ export default {
 			}
 		},
 		upSearch(){
-			this.$refs.table.upData(this.params);
+			// this.$refs.table.upData(this.params);
 		},
 		reset(){
 			this.params = {};
 			this.$refs.scSearch.reload();
-			this.$refs.table.reload();
+			// this.$refs.table.reload();
 		},
 		handleSaveSuccess(){
-			this.$refs.table.refresh();
+			// this.$refs.table.refresh();
 		},
 	}
 }
diff --git a/src/views/home/widgets/components/echarts.vue b/src/views/home/widgets/components/echarts.vue
index e9fd5ae..4e51300 100644
--- a/src/views/home/widgets/components/echarts.vue
+++ b/src/views/home/widgets/components/echarts.vue
@@ -79,7 +79,7 @@
 
 		},
 		mounted(){
-			 var _this = this;
+			var _this = this;
 			setInterval(function (){
 				var o = _this.option;
 
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index eb1c015..a8369c0 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -40,6 +40,11 @@
 						</template>
 					</el-image>
 				</template>
+				<template #company_type="scope">
+					<span v-for="(item,index) in setMap.companyType" :key="index">
+						<span v-if="item.company_type == scope.row.company_type">{{item.label}}</span>
+					</span>
+				</template>
 				<template #active_status="scope">
 					<el-switch :size="size" v-auth="'organizationUpdateStatus'" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
 				</template>
@@ -93,6 +98,9 @@ export default {
 				save: false,
 				show: false,
 			},
+			setMap:{
+				companyType:[]
+			},
 			list: {
 				apiObj: this.$API.system.company.list,
 				column: [],
@@ -102,8 +110,9 @@ export default {
 			searchShow:false,
 			searchList:[
 				{name:'开通日期',type:'date',code:'activation_date',show:true},
+				{name:'公司类型',type:'select',code:['company_type'], data:[], placeholder:"请选择公司类型",show:true},
 				{name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:true},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:true},
+				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",isOpen:true,show:false},
 				{name:'手机号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
 				{name:'邮件地址',type:'text',code:['email'],placeholder:"请输入邮箱地址",isOpen:true,show:false},
 				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址",isOpen:true,show:false},
@@ -113,6 +122,9 @@ export default {
 			params: {},
 		}
 	},
+	mounted() {
+		this.getCompanyTypeSelect();
+	},
 	methods: {
 		searchShowClick(){
 			this.searchShow = !this.searchShow;
@@ -129,9 +141,17 @@ export default {
 				this.getCompanyList(data,params)
 			}else if(data.code == "active_status"){
 				this.getStatusList(data,params);
+			}else if(data.code == "company_type"){
+				this.getCompanyTypeList(data,params);
+			}
+		},
+		// 加载公司类型
+		async getCompanyTypeSelect(){
+			const res = await this.$API.system.company.typeSelect.post();
+			if(res.code == 200){
+				this.setMap['companyType'] = res.data;
 			}
 		},
-
 		async getCompanyList(data,params) {
 			const res = await this.$API.system.company.select.post(params);
 			if(res.data && res.data.length>0){
@@ -157,6 +177,21 @@ export default {
 				})
 			}
 		},
+		async getCompanyTypeList(data,params) {
+			const res = await this.$API.system.company.typeSelect.post(params);
+			if (res.data && res.data.length > 0) {
+				res.data.forEach(item => {
+					item.value = item.id;
+				})
+			}
+			if(res.code == 200){
+				this.searchList.forEach(item=>{
+					if(item.code == data.code){
+						item.data = res.data;
+					}
+				})
+			}
+		},
 
 		//添加
 		add(){