From ea90b63bc05f28dc0df0981ca4594777a738f1ab Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 23 Jul 2025 11:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=8E=92=E7=89=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index f68c6b2..b4ea5ad 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -391,15 +391,16 @@ const getRoles = async function () {
 
 // 打开编辑用户权限弹窗
 const openUserEditVisible = function () {
-  getRoles()
   userEditVisible.value = true
 }
 // 关闭编辑用户权限弹窗
 const closeUserEditVisible = function () {
   userEditVisible.value = false
+  data.value = []
 }
 // 编辑用户权限初始化
 const permissionEditInit = async function (row) {
+  getRoles()
   console.log('row', row)
   permissionEditObj.value = {}
   permissionEditObj.value.id = row.id
@@ -427,7 +428,10 @@ const permissionEditInit = async function (row) {
   permissionEditObj.value.parentId = result.data?.fatherId
   permissionEditObj.value.parentName = result.data?.fatherName
   console.log('get前', permissionEditObj.value.roleId);
-
+  permissionEditObj.value.roleName = row.roleName
+  if(permissionEditObj.value.roleId==0){
+    permissionEditObj.value.roleId = ''
+  }
   getUserLists(row.roleId)
 
   let machineIdsRef = await request({
@@ -449,7 +453,6 @@ const permissionEditInit = async function (row) {
   permissionEditObj.value.machineId = permissionEditObj.value.machineIds[0]
   //permissionEditObj.value.permission = row.permission
 
-  permissionEditObj.value.roleName = row.roleName
   console.log('编辑用户权限', permissionEditObj.value)
   console.log('11111111111111', permissionEditObj.value.machineId)
   openUserEditVisible()
@@ -1328,7 +1331,7 @@ onMounted(async function () {
         </el-select>
       </el-form-item>
       <el-form-item prop="parentName" label="上级角色:">
-        <el-select v-model="permissionEditObj.parentId" placeholder="无上级角色" :disabled="!!parentRoleTip"
+        <el-select v-model="permissionEditObj.parentId" :placeholder="permissionEditObj.parentName ||'无上级角色'" :disabled="!!parentRoleTip"
           style="width: 220px">
           <el-option v-if="parentRoleTip" :key="0" :label="parentRoleTip" :value="null" disabled />
           <el-option v-else v-for="item in permissionList" :key="item.value" :label="item.label" disabled
@@ -1336,9 +1339,12 @@ onMounted(async function () {
         </el-select>
       </el-form-item>
       <el-form-item prop="permissionSelect" label="权限列表:">
-        <el-tree :data="data" :disabled="true" show-checkbox node-key="id"
+        <el-tree v-if="data.length>0" :data="data" :disabled="true" show-checkbox node-key="id"
           :props="{ label: 'menuName', children: 'children' }" :default-checked-keys="permissionEditObj.checkedKeys">
         </el-tree>
+        <div v-else style="display: flex; align-items: center; gap: 8px;">
+            <span style="color: #999;">暂未分配权限</span>
+          </div>
       </el-form-item>
       <el-form-item prop="machineIds" label="机器码:">
         <div style="display: flex; align-items: center; flex-wrap: wrap; gap: 10px;">
@@ -1371,17 +1377,17 @@ onMounted(async function () {
         <el-form-item prop="roleName" label="角色名称:" required>
           <el-input v-model="addRole.roleName" placeholder="请输入用户名" style="width: 220px" />
         </el-form-item>
-        <el-form-item prop="market" label="所属地区:" required>
-          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable>
-            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="parentName" label="上级角色:">
+         <el-form-item prop="parentName" label="上级角色:">
           <el-select v-model="addRole.parentId" placeholder="请选择上级角色" style="width: 220px" @change="getLists" clearable>
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="market" label="所属地区:" required>
+          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable>
+            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="checkedKeys" label="权限列表:" required>
           <el-tree v-if="data.length > 0" :data="data" show-checkbox node-key="id"
             :props="{ label: 'menuName', children: 'children' }" :checked-keys="addRole.checkedKeys"