From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visits.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 6e28c5b..bfac6a3 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -89,14 +89,15 @@
<el-table-column v-if="containPermissions(['business:visits:update', 'business:visits:delete'])" label="鎿嶄綔"
min-width="200" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲巶</el-button>
- <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']"
- icon="el-icon-delete" style="color: red" v-if="row.status == 5">鍙栨秷棰勭害</el-button>
+ <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲満</el-button>
+ <!-- <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']"
+ icon="el-icon-delete" style="color: red" v-if="row.status == 5">鍙栨秷棰勭害</el-button>-->
<el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']"
icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</el-button>
<!-- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" icon="el-icon-view">璇︽儏</el-button> -->
<el-button type="text" @click="handleDetail(row)" icon="el-icon-view">璇︽儏</el-button>
- <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
+ <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -164,15 +165,16 @@
})
},
departure(id) {
- this.$confirm('纭畾绂诲巶鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ this.$confirm('纭畾杩涜绂诲満鎿嶄綔鍚楋紝璇ユ搷浣滀笉鍙�嗚璋ㄦ厧鎿嶄綔, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- level(id)
+ this.api.level(id)
.then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
this.page = 1
- this.getData()
+ this.search()
})
}).catch(() => {
@@ -184,10 +186,10 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- visitCancel(id)
+ this.api.visitCancel(id)
.then(res => {
this.page = 1
- this.getData()
+ this.search()
})
}).catch(() => {
@@ -202,7 +204,7 @@
this.api.visitResend(id)
.then(res => {
this.page = 1
- this.getData()
+ this.search()
})
}).catch(() => {
--
Gitblit v1.9.3