From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/reportRecord.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 98ee6a0..fcb9c59 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -6,6 +6,10 @@
@handleQuery="getList(1)"
@clear="clear"
/>
+ <div style="margin: 16px 0 0" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
+ <el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">鏂板缓</el-button>
+ <el-button type="primary" :loading="exLoading" @click="exportExcel" v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button>
+ </div>
<el-table
v-loading="loading"
:data="dataList"
@@ -92,6 +96,7 @@
:pagination="pagination"
/>
<ReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
+ <OperaVisitsReportWindow @close="isShowEdit = false" @success="getList" v-if="isShowEdit" ref="operaVisitsWindowRef" />
</div>
</template>
@@ -100,18 +105,25 @@
import QueryForm from '@/components/common/QueryForm'
// import ReportDetail from './page-components/ReportDetail.vue'
import ReportDetail from '@/views/task/visReportDetail.vue'
-import { fetchList } from '@/api/business/visits'
+import OperaVisitsReportWindow from '@/components/business/operaVisitsReportWindow.vue'
+import { fetchList, exportExcel } from '@/api/business/visits'
export default {
components: {
ReportDetail,
QueryForm,
- Pagination
+ Pagination,
+ OperaVisitsReportWindow
},
data () {
return {
+ isShowEdit: false,
+ exLoading: false,
+
isShowReport: false,
activeTab: '0',
- filters: {},
+ filters: {
+ type: 2
+ },
dataList: [],
queryFormConfig: {
formItems: [
@@ -144,6 +156,32 @@
this.getList()
},
methods: {
+ exportExcel () {
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ exportExcel({
+ page: this.pagination.page,
+ capacity: 1000000,
+ model: this.filters
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ },
+ handleEdit () {
+ this.isShowEdit = true
+ this.$nextTick(() => {
+ this.$refs.operaVisitsWindowRef.isShowModal = true
+ })
+ },
handleDetail (row) {
this.isShowReport = true
this.$nextTick(() => {
@@ -159,14 +197,16 @@
const { pagination, filters } = this
pagination.page = page || pagination.page
fetchList({
- model: { ...filters, type: 2 },
+ model: { ...filters },
...pagination
}).then(res => {
this.dataList = res.records || []
})
},
clear () {
- this.filters = {}
+ this.filters = {
+ type: 2
+ }
this.getList(0)
},
handleSizeChange (capacity) {
--
Gitblit v1.9.3