From 818b6bcad239c4ca079383a43663e1f4cd9ed257 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 17:50:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8F=AA=E6=9C=89MASTER=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=98=BE=E7=A4=BA=E8=A7=A3?=
 =?UTF-8?q?=E5=86=BB=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 40860dc7c..1f96093d4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -80,7 +80,7 @@
                     v-hasPermi="['system:permission:assign-user-role']">
                     <Icon icon="ep:circle-check" />分配角色
                   </el-button>
-                <el-button type="primary" link @click="handleFree(scope.row.id)">
+                <el-button type="primary" link @click="handleFree(scope.row.id)" v-hasPermi="['system:user:update-password']"  v-if="userStore.getUser.userType=='MASTER'">
                   <Icon icon="ep:edit" />解冻
                 </el-button>
                 <el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">
@@ -116,6 +116,9 @@ import UserImportForm from './UserImportForm.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
+
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemUser' })