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/visits.vue | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 3a1dabd..25ebbb8 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -33,10 +33,10 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
-<!-- <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:delete']">-->
-<!-- <li><el-button type="primary" @click="$refs.operaVisitsWindow.open('鏂板缓璁垮鐢宠淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:visits:create']">鏂板缓</el-button></li>-->
-<!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:visits:delete']">鍒犻櫎</el-button></li>-->
-<!-- </ul>-->
+ <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
+ <li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" :loading="isWorking.export" @click="exportExcel" v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -110,6 +110,8 @@
</pagination>
<!-- 璇︽儏 -->
<OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
+ <!-- 鏂板缓 -->
+ <OperaVisitsWindow @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="operaVisitsWindowRef" />
</template>
</TableLayout>
</template>
@@ -119,13 +121,15 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
+import OperaVisitsWindow from '@/components/business/operaVisitsWindow'
export default {
name: 'Visits',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaVisitsDesWindow },
+ components: { TableLayout, Pagination, OperaVisitsDesWindow, OperaVisitsWindow },
data () {
return {
+ isShowEdit: false,
// 鎼滅储
searchForm: {
name: '',
@@ -145,36 +149,42 @@
this.search()
},
methods: {
- departure(id) {
+ handleEdit () {
+ this.isShowEdit = true
+ this.$nextTick(() => {
+ this.$refs.operaVisitsWindowRef.isShowModal = true
+ })
+ },
+ departure (id) {
this.$confirm('纭畾绂诲満鍚�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
level(id)
- .then(res => {
- this.page = 1
- this.getData()
- })
+ .then(res => {
+ this.page = 1
+ this.getData()
+ })
}).catch(() => {
- });
+ })
},
- cancel(id) {
+ cancel (id) {
this.$confirm('纭畾鍙栨秷棰勭害鍚�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
visitCancel(id)
- .then(res => {
- this.page = 1
- this.getData()
- })
+ .then(res => {
+ this.page = 1
+ this.getData()
+ })
}).catch(() => {
- });
- },
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3