From d536d795bb0648b27fbe50e8b9b6d221bb9f1c29 Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Wed, 23 Jul 2025 22:50:43 +0800
Subject: [PATCH 1/6] edit role success

---
 .env.development                     | 4 ++--
 src/views/permissions/permission.vue | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index 82d8d16..c5af22d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
-#  VITE_API_BASE='http://192.168.9.28:8081/'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+ VITE_API_BASE='http://192.168.9.28:8081/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 
diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index b56656b..5298be2 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -81,7 +81,6 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
-<<<<<<< HEAD
 const viewRole =ref([])
 const getRolePermission = async function(){
     const result = await request({
@@ -93,10 +92,8 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-=======
 
 
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],

From 5a2393f476a34b1d605fc774b08abe74cb51d355 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 23 Jul 2025 23:23:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?refactor(permissions):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 5298be2..bc9ce7f 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -1427,17 +1427,18 @@ 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-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>
+                       :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"

From 9c12d21709a6a9e5db51c556e9ce2b9f16e47ead Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 23 Jul 2025 23:42:11 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat(permissions):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=BA=E5=9F=9F=E6=8E=A5=E5=8F=A3=E5=92=8C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index bc9ce7f..3943b57 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -211,8 +211,10 @@ const reset = function () {
 const getArea = async function () {
   try {
     const result = await request({
-      url: '/permission/getmarket',
-      data: {}
+      url: '/general/adminMarkets',
+      data: {
+        account: adminData.value.account
+      }
     })
     market.value = result.data
   } catch (error) {

From c2029686d15a6be40c2f887a56b82a9268163bd2 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 24 Jul 2025 00:15:11 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 163 +++++++++++++++++++++--------------
 1 file changed, 97 insertions(+), 66 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index bc9ce7f..f8e8c49 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -92,8 +92,6 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-
-
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],
@@ -348,10 +346,13 @@ const permissionAdd = async function () {
 }
 const addUserRules = {
   account: [
-    { required: true, message: '请输入OA号', trigger: 'blur' }
+    { required: true, message: '请输入OA号', trigger: 'blur' },
+    { pattern: /^\d+$/, message: 'OA号必须为数字', trigger: 'blur' },
+    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
   ],
   name: [
-    { required: true, message: '请输入用户名', trigger: 'blur' }
+    { required: true, message: '请输入用户名', trigger: 'blur' },
+    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
   ],
   market: [
     { required: true, message: '请选择所属地区', trigger: 'change' }
@@ -360,7 +361,8 @@ const addUserRules = {
     { required: true, message: '请选择角色名称', trigger: 'change' }
   ],
   postiton: [
-    { required: true, message: '请输入职位', trigger: 'blur' }
+    { required: true, message: '请输入职位', trigger: 'blur' },
+    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
   ],
   machineIds: [
     {
@@ -403,15 +405,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
@@ -439,7 +442,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({
@@ -461,7 +467,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()
@@ -527,21 +532,62 @@ const getUserLists = async function (selectedRoleId) {
     console.log('请求失败', error)
   }
 }
+//编辑用户表单校验
+const editAdminRules = {
+  market: [
+    { required: true, message: '请选择所属地区', trigger: 'change' }
+  ],
+  postiton: [
+    { required: true, message: '请输入职位', trigger: 'blur' },
+    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
+  ],
+  machineIds: [
+    {
+      required: true,
+      message: '请至少输入一个机器码',
+      trigger: 'change',
+      validator: (rule, value, callback) => {
+        // 检查是否有非空的机器码
+        const hasValid = value.some(item => item.trim() !== '');
+        if (!hasValid) {
+          callback(new Error('请至少输入一个机器码'));
+        } else {
+          callback();
+        }
+      }
+    }
+  ]
+};
 // 编辑用户权限提交
 const permissionEdit = async function () {
-  const { adminName: userName, roleName: oldRole, roleId: newRoleId } = permissionEditObj.value;
+  let { adminName: userName, roleName: oldRole, roleId: newRoleId } = permissionEditObj.value;
+  console.log('oldRole', oldRole);
+
+  if (oldRole == null) {
+    oldRole = '未分配权限'
+  }
   const newRole = permissionList.value.find(item => item.value === newRoleId)?.label || '未知角色';
   try {
-    await ElMessageBox.confirm(
-      `确认修改权限角色？\n您正在将【${userName}】的权限角色从【${oldRole}】修改为【${newRole}】\n变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。`,
-      '警告',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: "warning",
-        lockScroll: false
-      }
-    );
+    await new Promise((resolve, reject) => {
+      Ref.value.validate((valid) => {
+        if (valid) {
+          resolve(); // 验证通过，继续执行后续代码
+        } else {
+          reject(new Error('请检查并完善表单信息')); // 验证失败，抛出错误
+        }
+      });
+    });
+   await ElMessageBox.confirm(
+  `确认修改权限角色？<br>您正在将【${userName}】的权限角色从【${oldRole}】修改为【${newRole}】<br>变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。`,
+  '警告',
+  {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: "warning",
+    lockScroll: false,
+    dangerouslyUseHTMLString: true //允许解析 HTML 标签
+  }
+);
     closeUserEditVisible();
     const result = await request({
       url: '/permission/updateAdmin',
@@ -568,6 +614,7 @@ const permissionEdit = async function () {
         }
       );
       get();
+      closeUserEditVisible()
     } else {
       ElMessage.error(result.msg)
     }
@@ -575,7 +622,6 @@ const permissionEdit = async function () {
   } catch (error) {
     console.log('编辑用户权限失败', error)
     ElMessage.error('编辑用户权限失败')
-    closeUserEditVisible()
   }
 }
 const throttledPermissionEdit = _.throttle(permissionEdit, 5000, {
@@ -731,11 +777,13 @@ const getLists = async function () {
     }
     console.log('看看data', data.value)
     console.log('parentID:', addRole.value.parentId, 'roleId:', roleId)
-    if (addRole.value.parentId) {
+    if (addRole.value.parentId&& addRole.value.parentId!=2) {
       const result = await API({
         url: '/general/roleMarket',
         data: { id: addRole.value.parentId }
       })
+      console.log('result11',result.data);
+      
       if (result.code == 200) {
         if (typeof result.data === 'string' && result.data) {
           addRoleMarket.value = result.data.split(',');
@@ -751,17 +799,16 @@ const getLists = async function () {
 
       }
       console.log('addRoleMarket.value', addRoleMarket.value);
-    } else {
-      if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
-        addRoleMarket.value = adminData.value.markets.split(',');
-      } else if (Array.isArray(adminData.value.markets)) {
-        addRoleMarket.value = adminData.value.markets
+    } else{
+      if (typeof market.value === 'string' && market.value) {
+        addRoleMarket.value = market.value.split(',');
+      } else if (Array.isArray(market.value)) {
+        addRoleMarket.value = market.value
       }
       else {
         addRoleMarket.value = [];
       }
     }
-
   } catch (error) {
     console.log('请求失败', error)
   }
@@ -794,8 +841,8 @@ const EdithandleMarketChange = (values) => {
     // 如果选择了总部，只保留总部
     permissionEditObj.value.market = ['总部'];
   }
-  console.log('看看现在的地区',permissionEditObj.value.market);
-  
+  console.log('看看现在的地区', permissionEditObj.value.market);
+
 };
 
 // 处理编辑角色权限时的勾选事件
@@ -950,21 +997,6 @@ const permissionEditRoleObj = ref({
 // 编辑角色弹窗
 const permissionEditRoleVisible = ref(false);
 
-const collectIds2 = (tree) => {
-  let ids = [];
-  tree.forEach((node) => {
-    // 如果当前节点没有 children 或 children 为空，说明是叶子节点
-    if (!node.children || node.children.length === 0) {
-      ids.push(node.id);
-    } else {
-      // 如果有 children，递归收集子节点的叶子节点
-      ids = ids.concat(collectIds2(node.children));
-    }
-  });
-  return ids;
-};
-
-
 // 编辑角色初始化
 const permissionEditRoleInit = async function (row) {
   console.log('row', row);
@@ -979,7 +1011,7 @@ const permissionEditRoleInit = async function (row) {
   // // 直接使用当前行的权限树数据
   // if (row.tree && row.tree.length > 0) {
   //   // 收集当前行权限树的所有 id
-  //   permissionEditRoleObj.value.checkedKeys = collectIds2(row.tree);
+  //   permissionEditRoleObj.value.checkedKeys = collectIds(row.tree);
   //   // 以当前行的权限树数据作为 el-tree 的数据源
   //   data.value = row.tree;
   // } else {
@@ -988,11 +1020,8 @@ const permissionEditRoleInit = async function (row) {
   // }
 
   try {
-
-    
-
     let roleId = permissionEditRoleObj.value.parentId;
-    // 如果没有上级角色，设置为管理员的id
+    // 如果没有上级角色，可根据实际情况设置默认值，这里假设为 2
     if (permissionEditRoleObj.value.parentId === null || permissionEditRoleObj.value.parentId === undefined) {
       roleId = 2;
     }
@@ -1005,7 +1034,7 @@ const permissionEditRoleInit = async function (row) {
 
     // 收集当前行权限树的所有 id
     if (row.tree && row.tree.length > 0) {
-      permissionEditRoleObj.value.checkedKeys = collectIds2(row.tree);
+      permissionEditRoleObj.value.checkedKeys = collectIds(row.tree);
     } else {
       permissionEditRoleObj.value.checkedKeys = [];
     }
@@ -1014,7 +1043,7 @@ const permissionEditRoleInit = async function (row) {
     data.value = [];
     permissionEditRoleObj.value.checkedKeys = [];
   }
-  
+
 
   console.log('编辑角色', permissionEditRoleObj.value);
   permissionEditRoleVisible.value = true;
@@ -1279,9 +1308,9 @@ onMounted(async function () {
           </el-table-column> -->
           <el-table-column prop="operation" label="操作" width="200px">
             <template #default="scope">
-            <el-button type="warning" text @click="permissionEditRoleInit(scope.row)">
-            编辑
-          </el-button>
+              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)">
+                编辑
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1361,7 +1390,8 @@ onMounted(async function () {
 
   <!-- 这是编辑用户权限弹窗 -->
   <el-dialog v-model="userEditVisible" title="编辑用户权限" width="800px" :close-on-click-modal="false">
-    <el-form ref="Ref" :model="permissionEditObj" label-width="auto" style="max-width: 600px; align-items: center">
+    <el-form ref="Ref" :rules="editAdminRules" :model="permissionEditObj" label-width="auto"
+      style="max-width: 600px; align-items: center">
       <el-form-item prop="account" label="用户账号:" clearable>
         <el-input v-model="permissionEditObj.account" placeholder="请输入OA号" style="width: 220px" disabled />
       </el-form-item>
@@ -1384,17 +1414,20 @@ onMounted(async function () {
         </el-select>
       </el-form-item>
       <el-form-item prop="parentName" label="上级角色:">
-        <el-select v-model="permissionEditObj.parentId" placeholder="无上级角色" :disabled="!!parentRoleTip"
-          style="width: 220px">
+        <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
             :value="item.value"></el-option>
         </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;">
@@ -1430,7 +1463,7 @@ onMounted(async function () {
         <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>
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="market" label="所属地区:" required>
@@ -1438,7 +1471,6 @@ onMounted(async function () {
             <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"
@@ -1489,16 +1521,15 @@ onMounted(async function () {
 
 
   <!-- 編輯角色彈窗 -->
-   <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
+  <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
     <template #footer>
       <el-form ref="Ref" :rules="Rolerules" :model="permissionEditRoleObj" label-width="auto"
         style="max-width: 600px; align-items: center">
         <el-form-item prop="roleName" label="角色名称:" required>
           <el-input v-model="permissionEditRoleObj.roleName" placeholder="请输入角色名称" style="width: 220px" />
         </el-form-item>
-        <el-form-item prop="parentName" label="上级角色:" >
-          <el-input v-model="permissionEditRoleObj.parentName" placeholder="无上级角色" disabled
-            style="width: 220px">
+        <el-form-item prop="parentName" label="上级角色:">
+          <el-input v-model="permissionEditRoleObj.parentName" placeholder="无上级角色" disabled style="width: 220px">
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-input>
@@ -1508,8 +1539,8 @@ onMounted(async function () {
         </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' }" :default-checked-keys="permissionEditRoleObj.checkedKeys"
-            @check="handleEditRolePermissionCheck">
+            :props="{ label: 'menuName', children: 'children' }"
+            :default-checked-keys="permissionEditRoleObj.checkedKeys" @check="handleEditRolePermissionCheck">
             <template #default="{ node, data }">
               <span>{{ node.label }}</span>
             </template>

From 8973d906250b14ac9257e0132d49d29e49673066 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 24 Jul 2025 01:09:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E7=AD=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 8eec8ef..43261c2 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -772,9 +772,12 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
-    if(addRole.value.roleId ==null ||addRole.value.roleId ==undefined){
+
+    if(addRole.value.parentId ==null ||addRole.value.parentId ==undefined){
        data.value = data.value
+      console.log('111')
     }else if (addRole.value.parentId != 2) {
+      console.log('222')
       data.value = data.value.filter(item => item.id !== 9);
     }
     console.log('看看data', data.value)
@@ -789,11 +792,14 @@ const getLists = async function () {
       if (result.code == 200) {
         if (typeof result.data === 'string' && result.data) {
           addRoleMarket.value = result.data.split(',');
+          addRole.value.market = ''
         } else if (Array.isArray(result.data)) {
           addRoleMarket.value = result.data
+          addRole.value.market = ''
         }
         else {
           addRoleMarket.value = [];
+          addRole.value.market = ''
         }
       } else {
         ElMessage.error('该上级角色无所属地区')
@@ -804,11 +810,14 @@ const getLists = async function () {
     } else{
       if (typeof market.value === 'string' && market.value) {
         addRoleMarket.value = market.value.split(',');
+        addRole.value.market = ''
       } else if (Array.isArray(market.value)) {
         addRoleMarket.value = market.value
+        addRole.value.market = ''
       }
       else {
         addRoleMarket.value = [];
+        addRole.value.market = ''
       }
     }
   } catch (error) {

From 5a21fb1b36bf5e4a2d2ae0a204a5f01fca90ed86 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 24 Jul 2025 09:59:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:7.24=20=E5=87=8C=E6=99=A8=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 169 ++++++++++++++---------------------
 1 file changed, 65 insertions(+), 104 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 43261c2..16d2c64 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -209,10 +209,8 @@ const reset = function () {
 const getArea = async function () {
   try {
     const result = await request({
-      url: '/general/adminMarkets',
-      data: {
-        account: adminData.value.account
-      }
+      url: '/permission/getmarket',
+      data: {}
     })
     market.value = result.data
   } catch (error) {
@@ -348,13 +346,10 @@ const permissionAdd = async function () {
 }
 const addUserRules = {
   account: [
-    { required: true, message: '请输入OA号', trigger: 'blur' },
-    { pattern: /^\d+$/, message: 'OA号必须为数字', trigger: 'blur' },
-    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
+    { required: true, message: '请输入OA号', trigger: 'blur' }
   ],
   name: [
-    { required: true, message: '请输入用户名', trigger: 'blur' },
-    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
+    { required: true, message: '请输入用户名', trigger: 'blur' }
   ],
   market: [
     { required: true, message: '请选择所属地区', trigger: 'change' }
@@ -363,8 +358,7 @@ const addUserRules = {
     { required: true, message: '请选择角色名称', trigger: 'change' }
   ],
   postiton: [
-    { required: true, message: '请输入职位', trigger: 'blur' },
-    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
+    { required: true, message: '请输入职位', trigger: 'blur' }
   ],
   machineIds: [
     {
@@ -407,16 +401,15 @@ 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
@@ -444,10 +437,7 @@ 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({
@@ -469,6 +459,7 @@ 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()
@@ -534,62 +525,21 @@ const getUserLists = async function (selectedRoleId) {
     console.log('请求失败', error)
   }
 }
-//编辑用户表单校验
-const editAdminRules = {
-  market: [
-    { required: true, message: '请选择所属地区', trigger: 'change' }
-  ],
-  postiton: [
-    { required: true, message: '请输入职位', trigger: 'blur' },
-    { max: 20, message: '长度不能超过20位', trigger: 'blur' }
-  ],
-  machineIds: [
-    {
-      required: true,
-      message: '请至少输入一个机器码',
-      trigger: 'change',
-      validator: (rule, value, callback) => {
-        // 检查是否有非空的机器码
-        const hasValid = value.some(item => item.trim() !== '');
-        if (!hasValid) {
-          callback(new Error('请至少输入一个机器码'));
-        } else {
-          callback();
-        }
-      }
-    }
-  ]
-};
 // 编辑用户权限提交
 const permissionEdit = async function () {
-  let { adminName: userName, roleName: oldRole, roleId: newRoleId } = permissionEditObj.value;
-  console.log('oldRole', oldRole);
-
-  if (oldRole == null) {
-    oldRole = '未分配权限'
-  }
+  const { adminName: userName, roleName: oldRole, roleId: newRoleId } = permissionEditObj.value;
   const newRole = permissionList.value.find(item => item.value === newRoleId)?.label || '未知角色';
   try {
-    await new Promise((resolve, reject) => {
-      Ref.value.validate((valid) => {
-        if (valid) {
-          resolve(); // 验证通过，继续执行后续代码
-        } else {
-          reject(new Error('请检查并完善表单信息')); // 验证失败，抛出错误
-        }
-      });
-    });
-   await ElMessageBox.confirm(
-  `确认修改权限角色？<br>您正在将【${userName}】的权限角色从【${oldRole}】修改为【${newRole}】<br>变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。`,
-  '警告',
-  {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: "warning",
-    lockScroll: false,
-    dangerouslyUseHTMLString: true //允许解析 HTML 标签
-  }
-);
+    await ElMessageBox.confirm(
+      `确认修改权限角色？\n您正在将【${userName}】的权限角色从【${oldRole}】修改为【${newRole}】\n变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。`,
+      '警告',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: "warning",
+        lockScroll: false
+      }
+    );
     closeUserEditVisible();
     const result = await request({
       url: '/permission/updateAdmin',
@@ -616,7 +566,6 @@ const permissionEdit = async function () {
         }
       );
       get();
-      closeUserEditVisible()
     } else {
       ElMessage.error(result.msg)
     }
@@ -624,6 +573,7 @@ const permissionEdit = async function () {
   } catch (error) {
     console.log('编辑用户权限失败', error)
     ElMessage.error('编辑用户权限失败')
+    closeUserEditVisible()
   }
 }
 const throttledPermissionEdit = _.throttle(permissionEdit, 5000, {
@@ -772,23 +722,18 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
-
     if(addRole.value.parentId ==null ||addRole.value.parentId ==undefined){
        data.value = data.value
-      console.log('111')
     }else if (addRole.value.parentId != 2) {
-      console.log('222')
       data.value = data.value.filter(item => item.id !== 9);
     }
     console.log('看看data', data.value)
     console.log('parentID:', addRole.value.parentId, 'roleId:', roleId)
-    if (addRole.value.parentId&& addRole.value.parentId!=2) {
+    if (addRole.value.parentId) {
       const result = await API({
         url: '/general/roleMarket',
         data: { id: addRole.value.parentId }
       })
-      console.log('result11',result.data);
-      
       if (result.code == 200) {
         if (typeof result.data === 'string' && result.data) {
           addRoleMarket.value = result.data.split(',');
@@ -807,12 +752,12 @@ const getLists = async function () {
 
       }
       console.log('addRoleMarket.value', addRoleMarket.value);
-    } else{
-      if (typeof market.value === 'string' && market.value) {
-        addRoleMarket.value = market.value.split(',');
+    } else {
+      if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
+        addRoleMarket.value = adminData.value.markets.split(',');
         addRole.value.market = ''
-      } else if (Array.isArray(market.value)) {
-        addRoleMarket.value = market.value
+      } else if (Array.isArray(adminData.value.markets)) {
+        addRoleMarket.value = adminData.value.markets
         addRole.value.market = ''
       }
       else {
@@ -820,6 +765,7 @@ const getLists = async function () {
         addRole.value.market = ''
       }
     }
+
   } catch (error) {
     console.log('请求失败', error)
   }
@@ -852,8 +798,8 @@ const EdithandleMarketChange = (values) => {
     // 如果选择了总部，只保留总部
     permissionEditObj.value.market = ['总部'];
   }
-  console.log('看看现在的地区', permissionEditObj.value.market);
-
+  console.log('看看现在的地区',permissionEditObj.value.market);
+  
 };
 
 // 处理编辑角色权限时的勾选事件
@@ -1008,6 +954,21 @@ const permissionEditRoleObj = ref({
 // 编辑角色弹窗
 const permissionEditRoleVisible = ref(false);
 
+const collectIds2 = (tree) => {
+  let ids = [];
+  tree.forEach((node) => {
+    // 如果当前节点没有 children 或 children 为空，说明是叶子节点
+    if (!node.children || node.children.length === 0) {
+      ids.push(node.id);
+    } else {
+      // 如果有 children，递归收集子节点的叶子节点
+      ids = ids.concat(collectIds2(node.children));
+    }
+  });
+  return ids;
+};
+
+
 // 编辑角色初始化
 const permissionEditRoleInit = async function (row) {
   console.log('row', row);
@@ -1022,7 +983,7 @@ const permissionEditRoleInit = async function (row) {
   // // 直接使用当前行的权限树数据
   // if (row.tree && row.tree.length > 0) {
   //   // 收集当前行权限树的所有 id
-  //   permissionEditRoleObj.value.checkedKeys = collectIds(row.tree);
+  //   permissionEditRoleObj.value.checkedKeys = collectIds2(row.tree);
   //   // 以当前行的权限树数据作为 el-tree 的数据源
   //   data.value = row.tree;
   // } else {
@@ -1031,8 +992,11 @@ const permissionEditRoleInit = async function (row) {
   // }
 
   try {
+
+    
+
     let roleId = permissionEditRoleObj.value.parentId;
-    // 如果没有上级角色，可根据实际情况设置默认值，这里假设为 2
+    // 如果没有上级角色，设置为管理员的id
     if (permissionEditRoleObj.value.parentId === null || permissionEditRoleObj.value.parentId === undefined) {
       roleId = 2;
     }
@@ -1045,7 +1009,7 @@ const permissionEditRoleInit = async function (row) {
 
     // 收集当前行权限树的所有 id
     if (row.tree && row.tree.length > 0) {
-      permissionEditRoleObj.value.checkedKeys = collectIds(row.tree);
+      permissionEditRoleObj.value.checkedKeys = collectIds2(row.tree);
     } else {
       permissionEditRoleObj.value.checkedKeys = [];
     }
@@ -1054,7 +1018,7 @@ const permissionEditRoleInit = async function (row) {
     data.value = [];
     permissionEditRoleObj.value.checkedKeys = [];
   }
-
+  
 
   console.log('编辑角色', permissionEditRoleObj.value);
   permissionEditRoleVisible.value = true;
@@ -1319,9 +1283,9 @@ onMounted(async function () {
           </el-table-column> -->
           <el-table-column prop="operation" label="操作" width="200px">
             <template #default="scope">
-              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)">
-                编辑
-              </el-button>
+            <el-button type="warning" text @click="permissionEditRoleInit(scope.row)">
+            编辑
+          </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1401,8 +1365,7 @@ onMounted(async function () {
 
   <!-- 这是编辑用户权限弹窗 -->
   <el-dialog v-model="userEditVisible" title="编辑用户权限" width="800px" :close-on-click-modal="false">
-    <el-form ref="Ref" :rules="editAdminRules" :model="permissionEditObj" label-width="auto"
-      style="max-width: 600px; align-items: center">
+    <el-form ref="Ref" :model="permissionEditObj" label-width="auto" style="max-width: 600px; align-items: center">
       <el-form-item prop="account" label="用户账号:" clearable>
         <el-input v-model="permissionEditObj.account" placeholder="请输入OA号" style="width: 220px" disabled />
       </el-form-item>
@@ -1425,20 +1388,17 @@ onMounted(async function () {
         </el-select>
       </el-form-item>
       <el-form-item prop="parentName" label="上级角色:">
-        <el-select v-model="permissionEditObj.parentId" :placeholder="permissionEditObj.parentName || '无上级角色'"
-          :disabled="!!parentRoleTip" style="width: 220px">
+        <el-select v-model="permissionEditObj.parentId" placeholder="无上级角色" :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
             :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="permissionSelect" label="权限列表:">
-        <el-tree v-if="data.length > 0" :data="data" :disabled="true" show-checkbox node-key="id"
+        <el-tree :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;">
@@ -1471,7 +1431,7 @@ 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="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>
@@ -1532,15 +1492,16 @@ onMounted(async function () {
 
 
   <!-- 編輯角色彈窗 -->
-  <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
+   <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
     <template #footer>
       <el-form ref="Ref" :rules="Rolerules" :model="permissionEditRoleObj" label-width="auto"
         style="max-width: 600px; align-items: center">
         <el-form-item prop="roleName" label="角色名称:" required>
           <el-input v-model="permissionEditRoleObj.roleName" placeholder="请输入角色名称" style="width: 220px" />
         </el-form-item>
-        <el-form-item prop="parentName" label="上级角色:">
-          <el-input v-model="permissionEditRoleObj.parentName" placeholder="无上级角色" disabled style="width: 220px">
+        <el-form-item prop="parentName" label="上级角色:" >
+          <el-input v-model="permissionEditRoleObj.parentName" placeholder="无上级角色" disabled
+            style="width: 220px">
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-input>
@@ -1550,8 +1511,8 @@ onMounted(async function () {
         </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' }"
-            :default-checked-keys="permissionEditRoleObj.checkedKeys" @check="handleEditRolePermissionCheck">
+            :props="{ label: 'menuName', children: 'children' }" :default-checked-keys="permissionEditRoleObj.checkedKeys"
+            @check="handleEditRolePermissionCheck">
             <template #default="{ node, data }">
               <span>{{ node.label }}</span>
             </template>