From 412e7319d576d1471f9b714835a155d87fe2f95e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 18 Mar 2025 16:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 50 ++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 14c3fcab..d42ddd14 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -195,28 +195,28 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="所属区域" prop="areaIds">
-          <el-cascader v-model="form.areaIds"
+        <el-form-item label="所属区域" prop="areaIdList">
+          <el-cascader v-model="form.areaIdList"
             :options="areaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
             :props="{ 
               multiple:true,
-              emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+              // emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的
               // checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
               value:'id',label:'treeName'
             }" collapse-tags
-            clearable >
+            clearable @change="handleAreaChange">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="食堂/超市" prop="dataIds">
-          <el-cascader v-model="form.dataIds"
+        <el-form-item label="食堂/超市" prop="dataIdList">
+          <el-cascader v-model="form.dataIdList"
             :options="tenantOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
             :props="{ 
               multiple:true,
-              emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+              // emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
               // checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
               value:'id',label:'treeName'
             }" collapse-tags
-            clearable >
+            clearable @change="handleAreaChange2">
           </el-cascader>
         </el-form-item>
         <el-form-item label="菜单权限">
@@ -390,7 +390,7 @@ export default {
         roleSort: [
           { required: true, message: '角色顺序不能为空', trigger: 'blur' }
         ],
-        areaIds: [
+        areaIdList: [
           { required: true, message: '所属区域不能为空', trigger: 'change' }
         ],
       }
@@ -427,10 +427,33 @@ export default {
         this.tenantOptions = response; 
       });
     },
-    handleAreaChange(e){
-      console.log(e)
-      console.log(this.form.areaIds)
+    handleAreaChange(e){ 
+      console.log(this.form.areaIdList)
+      // 使用 concat 方法将二维数组扁平化为一维数组
+      let flatArray = [].concat(...this.form.areaIdList); 
+      // 使用 Set 去重 
+      this.form.areaIds = Array.from(new Set(flatArray)); 
     },
+    handleAreaChange2(e){ 
+      console.log(this.form.dataIdList)
+      // 使用 concat 方法将二维数组扁平化为一维数组
+      let flatArray = [].concat(...this.form.dataIdList); 
+      // 使用 Set 去重 
+      this.form.dataIds = Array.from(new Set(flatArray)); 
+    }, 
+    // getCheckTag(list, id) {
+    //     for (let i in list) {
+    //         if (list[i].id === id) {
+    //             return [list[i]]
+    //         }
+    //         if (list[i].children != null) {
+    //             let node = this.getCheckTag(list[i].children, id)
+    //             if (node !== undefined) {
+    //                 return node.concat(list[i])
+    //             }
+    //         }
+    //     }
+    // }, 
     /** 查询菜单树结构 */
     getMenuTreeselect() {
       menuTreeselect().then(response => {
@@ -592,7 +615,8 @@ export default {
       const roleId = row.roleId || this.ids
       const roleMenu = this.getRoleMenuTreeselect(roleId)
       getRole(roleId).then(response => {
-        this.form = response.data
+        this.form = response.data;
+        
         this.open = true
         this.$nextTick(() => {
           roleMenu.then(res => {