From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/views/system/user.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/company/src/views/system/user.vue b/company/src/views/system/user.vue
index 6ebbe61..e43e158 100644
--- a/company/src/views/system/user.vue
+++ b/company/src/views/system/user.vue
@@ -54,6 +54,7 @@
<el-table-column label="鍚敤鐘舵��" min-width="100px">
<template slot-scope="{row}">
<el-switch
+ v-if="!row.fixed"
@change="changeStatus($event, row)"
v-model="row.status"
active-color="#13ce66"
@@ -69,9 +70,10 @@
width="270"
fixed="right"
>
- <template v-if="isAdmin || (row.id !== userInfo.id && row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
+<!-- row.id !== userInfo.id &&-->
+ <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('缂栬緫鐢ㄦ埛', row)" v-permissions="['system:user:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)">鍒嗛厤浼佷笟</el-button>
+ <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)" v-if="userInfo.type !== 1">鍒嗛厤浼佷笟</el-button>
<el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">閰嶇疆瑙掕壊</el-button>
<el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-button>
<!-- <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:user:delete']">鍒犻櫎</el-button>-->
--
Gitblit v1.9.3