From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/visits.vue | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index a781692..2bf9f22 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -42,7 +42,7 @@
<li><el-button type="primary" :loading="isWorking.export" @click="exportExcel"
v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button></li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ <el-table :max-height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="璁垮濮撳悕" min-width="100px"></el-table-column>
@@ -90,20 +90,16 @@
<span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
</el-table-column>
+ <el-table-column prop="remark" label="涓嬪彂澶囨敞" min-width="100px"></el-table-column>
<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="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="resend(row.id)" v-permissions="['business:visits:update']" icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</el-button>
<el-button type="text" @click="handleDetail(row)" icon="el-icon-view">璇︽儏</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>-->
+ <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" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3