From 3bc00a9f9ccfad8cacc78c3fb68b6880f5522d5c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 14:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/departmentExamine/list.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/user/departmentExamine/list.vue b/src/views/user/departmentExamine/list.vue
index 9dd0732..4d7b64b 100644
--- a/src/views/user/departmentExamine/list.vue
+++ b/src/views/user/departmentExamine/list.vue
@@ -12,14 +12,14 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="userName" label="鐢ㄦ埛鍚�" />
- <el-table-column prop="departmentName" label="閮ㄩ棬鍚嶇О" />
- <el-table-column prop="nowDepartmentName" label="鍘熼儴闂ㄥ悕绉�" />
+ <el-table-column prop="userName" label="鐢ㄦ埛" />
+ <el-table-column prop="departmentName" label="璋冨姩閮ㄩ棬" />
+ <el-table-column prop="nowDepartmentName" label="鍘熼儴闂�" />
<el-table-column prop="reason" label="璋冨姩鍘熷洜" show-overflow-tooltip/>
<el-table-column prop="attachment" label="闄勪欢" show-overflow-tooltip>
<template slot-scope="scope">
<div v-for="item in getUrl(scope.row.attachment)" :key="item.url">
- <el-link type="primary" :href="'/api/upload/download?url=' + item.url +'&fileName=' + item.name" >{{ item.name }}</el-link>
+ <el-link :underline="false" type="primary" :href="'/api/upload/download?url=' + item.url +'&fileName=' + item.name" >{{ item.name }}</el-link>
</div>
</template>
</el-table-column>
@@ -31,7 +31,7 @@
<el-table-column prop="remark" label="瀹℃牳鎰忚" show-overflow-tooltip />
<el-table-column prop="createUserName" label="鍒涘缓浜�" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px" />
- <el-table-column label="鎿嶄綔" align="center" v-if="isDeptAdmin()">
+ <el-table-column label="鎿嶄綔" align="center" v-if="!deptAdmin()">
<template slot-scope="{row}">
<el-button v-if="row.result === '寰呭鏍�'" type="primary" size="mini" @click="transposition(row)" class="link-left">瀹℃牳</el-button>
<el-popconfirm title="纭鍒犻櫎" @confirm="deleteUser(row)">
@@ -89,16 +89,16 @@
getUrl(urlJson) {
return urlJson ? JSON.parse(urlJson) : [];
},
- isDeptAdmin() {
- return sessionStorage.getItem('deptAdmin') !== '1'
+ deptAdmin() {
+ return sessionStorage.getItem('deptAdmin') === '1'
},
transposition(user) {
this.statusVisible = true;
this.user = { ...user };
},
statusConfirm() {
- if (this.user.result === null) {
- this.$message.error("璇烽�夋嫨鐘舵��")
+ if (this.user.result === "寰呭鏍�") {
+ this.$message.error("璇烽�夋嫨瀹℃牳缁撴灉")
return
}
departmentExamineApi.audit(this.user).then(res => {
--
Gitblit v1.8.0