From f68cd81000a7480050e84d2f32c1251648d59b4d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 20:31:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/departmentExamine/list.vue | 7 +++++--
src/router.js | 6 ++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/router.js b/src/router.js
index 23690a2..81a3245 100644
--- a/src/router.js
+++ b/src/router.js
@@ -478,6 +478,12 @@
name: 'UserStudentPageList',
meta: { title: '瀛︾敓鍒楄〃', noCache: true }
},
+ {
+ path: 'departmentExamine/list',
+ component: () => import('@/views/user/departmentExamine/list'),
+ name: 'departmentExamineList',
+ meta: { title: '璋冨姩瀹℃牳', noCache: true }
+ },
]
},
{
diff --git a/src/views/user/departmentExamine/list.vue b/src/views/user/departmentExamine/list.vue
index 1fcf1de..511e447 100644
--- a/src/views/user/departmentExamine/list.vue
+++ b/src/views/user/departmentExamine/list.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input v-model="queryParam.userName" clearable @clear="search"></el-input>
+ <el-input v-model="queryParam.userName"></el-input>
</el-form-item>
<el-form-item>
<div style="display: flex">
@@ -23,7 +23,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">
+ <el-table-column label="鎿嶄綔" align="center" v-if="isDeptAdmin()">
<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)">
@@ -78,6 +78,9 @@
this.search()
},
methods: {
+ isDeptAdmin() {
+ return sessionStorage.getItem('deptAdmin') !== '1'
+ },
transposition(user) {
this.statusVisible = true;
this.user = { ...user };
--
Gitblit v1.8.0