分公司业绩分页

src/views/financial/branchCompany.vue

@@ -7,9 +7,9 @@
 				</el-form-item>
 				<el-form-item label="统计方式">
 					<el-radio-group v-model="listQuery.statisticalWay" @change="changeType">
-						<el-radio-button label=1>日</el-radio-button>
-						<el-radio-button label=2>周</el-radio-button>
-						<el-radio-button label=3>月</el-radio-button>
+						<el-radio-button label="1">日</el-radio-button>
+						<el-radio-button label="2">周</el-radio-button>
+						<el-radio-button label="3">月</el-radio-button>
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item label="所属公司">
@@ -28,7 +28,13 @@
 				<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出报表</el-button>
 			</el-form>
 
-			<el-table :data="tableData" border style="width: 100%" header-align="center">
+			<el-table
+				:data="tableData"
+				border
+				style="width: 100%"
+				header-align="center"
+				v-loading="loadingTab"
+			>
 				<el-table-column
 					prop="date"
 					label="时间"
@@ -83,6 +89,7 @@ export default {
 	},
 	data() {
 		return {
+			loadingTab: false,
 			tableData: [], //表格数据
 			time: null, //时间
 			excelLoading: false, //导出loading
@@ -136,45 +143,52 @@ export default {
 			this.excelLoading = true
 			var u = navigator.userAgent,
 				app = navigator.appVersion
-			excelExport(this.listQuery, { responseType: 'arraybuffer' }).then(res => {
-				const content = res
-				const blob = new Blob([content], {
-					type: 'application/vnd.ms-excel'
-				})
-				const fileName = '报表.xlsx'
-				if (u.indexOf('Edge') > -1) {
-					window.navigator.msSaveBlob(blob, fileName)
-				} else {
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'none'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href) // 释放URL 对象
-					document.body.removeChild(elink)
+			excelExport(this.listQuery, { responseType: 'arraybuffer' }).then(
+				res => {
+					const content = res
+					const blob = new Blob([content], {
+						type: 'application/vnd.ms-excel'
+					})
+					const fileName = '分公司报表.xlsx'
+					if (u.indexOf('Edge') > -1) {
+						window.navigator.msSaveBlob(blob, fileName)
+					} else {
+						const elink = document.createElement('a')
+						elink.download = fileName
+						elink.style.display = 'none'
+						elink.href = URL.createObjectURL(blob)
+						document.body.appendChild(elink)
+						elink.click()
+						URL.revokeObjectURL(elink.href) // 释放URL 对象
+						document.body.removeChild(elink)
+					}
+					this.excelLoading = false
 				}
-				this.excelLoading = false
-			})
+			)
 		},
 		//表格数据
 		getList() {
+			this.loadingTab = true
 			company_performance(this.listQuery).then(data => {
 				if (data.status == 200) {
 					this.tableData = data.data.data
 					this.total = data.data.totalCount
+					window.scrollTo(0, 0)
 				} else {
 					this.$message.error(data.message)
 				}
+				setTimeout(() => {
+					this.loadingTab = false
+				}, 300)
 			})
 		},
 		//分页
 		handleSizeChange(val) {
-			this.listquery.limit = val
+			this.listQuery.limit = val
 			this.getList()
 		},
 		handleCurrentChange(val) {
-			this.listquery.page = val
+			this.listQuery.page = val
 			this.getList()
 		}
 	}

src/views/financial/memberPerformance.vue

@@ -268,7 +268,7 @@ export default {
 				const blob = new Blob([content], {
 					type: 'application/vnd.ms-excel'
 				})
-				const fileName = '报表.xlsx'
+				const fileName = '总公司报表.xlsx'
 				if (u.indexOf('Edge') > -1) {
 					window.navigator.msSaveBlob(blob, fileName)
 				} else {

src/views/financial/staffPerformance.vue

@@ -264,7 +264,7 @@ export default {
 						type: 'application/vnd.ms-excel'
 					})
 					const fileName =
-						this.timestamp(new Date()) + '员工业绩统计.xlsx'
+						this.timestamp(new Date()) + '员工业绩报表.xlsx'
 					if (u.indexOf('Edge') > -1) {
 						window.navigator.msSaveBlob(blob, fileName)
 						console.log('ie')