From b76ed70f00e438c7391116bf5e27312abce3f148 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:55 +0800
Subject: [PATCH] 修改了相关bug

---
 ruoyi-ui/src/views/economy/index.vue |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 6079dc1..3a55ec7 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -511,6 +511,7 @@
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 import {getInfo} from "@/api/login";
+import {getAllInfo} from "@/api/system/user"
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
@@ -521,7 +522,7 @@
 import {listUserAll} from "@/api/root/index";
 import {showShareUser} from "@/api/bignote/index";
 export default {
-  name: "Role",
+  name: "ZfEconomy",
   dicts: ['sys_normal_disable'],
   data() {
     return {
@@ -848,6 +849,26 @@
         				   this.userOptions.push({label: element.oldName,value: element.userId})
         			  })
        })
+	   
+	   let clanId = this.$store.state.user.clanId
+	   
+	    getAllInfo(clanId).then(response => {
+	        this.listRoot = response.data;
+	        const kon = {}
+	   			         console.log(response.data,'userListuserListuserList99999999999999')
+	        this.listRoot.forEach(element => {
+	          kon[element['nickName']] = element['userId']
+	        })
+	        // for(let i in kon){
+	        //   this.userOptions.push({label: i,value: kon[i]})
+	        // }
+	        // for(let i in this.userOptions){
+	        //   this.userList.push(this.userOptions[i].value)
+	        // }
+	        // console.log(this.userList,'userListuserListuserList99999999999999')
+	        this.loading1 = false;
+	      }
+	    );
         },
     // 纭鍒嗕韩
     subShare(row) {
@@ -1024,6 +1045,7 @@
     handleCheck(row){
      // alert(123)
       const id = row.id;
+	  this.open2 = false; 
       this.$router.push("/familymodel/economy/economyInfo/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.1