From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/unionChange.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index b06f1e6..3a5e242 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -31,9 +31,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionchange:create']">
- <li><el-button type="primary" @click="$refs.OpearaUnionChange.open('鍔犲噺淇濈敵璇�')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>
- </ul>
+<!-- <ul class="toolbar" v-if="userInfo.type==2 && " v-permissions="['business:unionchange:create']">-->
+<!-- <li><el-button type="primary" @click="$refs.OpearaUnionChange.open('鍔犲噺淇濈敵璇�')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>-->
+<!-- </ul>-->
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -49,7 +49,7 @@
<span :class="'union-change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 3">宸查��鍥�</span>
+ <span style="color: red;" v-if="row.status === 3">宸查��鍥�</span>
</template>
</el-table-column>
<el-table-column align="center" prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="150px"></el-table-column>
--
Gitblit v1.9.3