From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/companyUserApply.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/company/src/views/business/companyUserApply.vue b/company/src/views/business/companyUserApply.vue
index 9993b73..4a4e0cd 100644
--- a/company/src/views/business/companyUserApply.vue
+++ b/company/src/views/business/companyUserApply.vue
@@ -35,9 +35,9 @@
<el-table-column prop="createDate" label="鐢宠鏃堕棿"></el-table-column>
<el-table-column label="鐢宠鐘舵��">
<template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span style="color: #216EEE;" v-if="row.status === 0">寰呭鏍�</span>
+ <span style="color: #00BA92;" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+ <span style="color: red;" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column
@@ -48,7 +48,7 @@
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaCompanyUserApplyDescWindow.open('鐢宠璁板綍璇︽儏', row.id)" icon="el-icon-view">鏌ョ湅</el-button>
<el-button type="text" v-if="userInfo.type === 0 && row.status === 0" @click="$refs.operaCompanyUserApplyCarefulWindow.open('闆嗗洟鐢宠璁板綍瀹℃牳', row.id)">瀹℃牳</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1 && row.status === 0" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3