From 72e734d02f0a1bb3ab321be57c07714bb2f419d4 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 13 Mar 2025 20:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                      |  4 ++--
 src/views/admin/system/user/form.vue  | 10 +++++++++-
 src/views/admin/system/user/index.vue |  8 +++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index a98491e..97e4ea2 100644
--- a/.env.development
+++ b/.env.development
@@ -8,10 +8,10 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-# VITE_ADMIN_PROXY_PATH = http://192.168.101.60:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.60:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index e860b02..d837d35 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -46,13 +46,21 @@
 						<el-form-item :label="$t('sysuser.dept')" prop="deptId">
 							<el-tree-select
 								:data="deptData"
-								:props="{ value: 'id', label: 'name', children: 'children' }"
+								:props="{ value: 'id', label: 'name', children: 'children', disabled: 'isLock' }"
 								check-strictly
 								class="w100"
 								clearable
 								placeholder="请选择所属部门"
 								v-model="dataForm.deptId"
 							>
+								<template #default="{ node, data }">
+									<el-tooltip v-if="data.isLock" effect="dark" content="无数据权限" placement="right">
+										<span>
+											{{ node.label }}
+											<SvgIcon name="ele-Lock" />
+										</span>
+									</el-tooltip>
+								</template>
 							</el-tree-select>
 						</el-form-item>
 					</el-col>
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 67a2e69..a13a911 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -75,7 +75,7 @@
 					>
 						<el-table-column :selectable="handleSelectable" type="selection" width="40" />
 						<el-table-column label="#" type="index" width="60" fixed="left" />
-						<el-table-column label="用户名" prop="username" fixed="left" show-overflow-tooltip min-width="150" />
+						<el-table-column label="用户名" prop="username" fixed="left" show-overflow-tooltip />
 						<el-table-column label="姓名" prop="name" show-overflow-tooltip min-width="150" />
 						<el-table-column label="手机号" prop="phone" show-overflow-tooltip min-width="150" />
 						<el-table-column label="部门" prop="deptName" show-overflow-tooltip min-width="150" />
@@ -87,6 +87,7 @@
 						<el-table-column label="启用" show-overflow-tooltip min-width="150">
 							<template #default="scope">
 								<el-switch
+									v-if="scope.processStatus == '2'"
 									:disabled="!auth('sys_user_edit')"
 									v-model="scope.row.lockFlag"
 									@change="changeSwitch(scope.row)"
@@ -117,18 +118,18 @@
 							label="操作"
 							width="380"
 							fixed="right"
-							show-overflow-tooltip
 						>
 							<template #default="scope">
 								<div style="display: flex; justify-content: center">
 									<!-- 重置密码 -->
-									<popover-input v-model="inputPassword" @confirm="changePassword(scope.row)">
+									<popover-input v-if="scope.processStatus == '2'" v-model="inputPassword" @confirm="changePassword(scope.row)">
 										<template #default>
 											<el-button v-auth="'sys_user_edit'" icon="RefreshLeft" text type="primary" class="mr-4">密码</el-button>
 										</template>
 									</popover-input>
 									<!-- 修改信息 -->
 									<el-button
+										v-if="scope.processStatus == '2'"
 										v-auth="'sys_user_edit'"
 										icon="edit-pen"
 										text
@@ -139,6 +140,7 @@
 									</el-button>
 									<!-- 人脸管理 -->
 									<el-button
+										v-if="scope.processStatus == '2'"
 										v-auth="'userFace_sysUserFace_view'"
 										icon="User"
 										text