From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug

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

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e6ca814..f5d1815 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嚱鏁�  --鎺ュソ浜�
@@ -519,13 +520,14 @@
 } from "@/api/economy/index";
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import {listUserAll} from "@/api/root/index";
-
+import {showShareUser} from "@/api/bignote/index";
 export default {
-  name: "Role",
+  name: "ZfEconomy",
   dicts: ['sys_normal_disable'],
   data() {
     return {
       // 鍒嗕韩缁欒皝鐨刲ist
+	  total1:0,
       listRoot: [],
       open1:false,
       open2:false,
@@ -838,24 +840,35 @@
     },
     getList1() {
           this.loading1 = true;
-          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
-          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
-          listUserAll(this.queryParams1).then(response => {
-              this.listRoot = response.data.data;
-              const kon = {}
-              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,'userListuserListuserList')
-              this.loading1 = false;
-            }
-          );
+       let userId = this.$store.state.user.userId
+        showShareUser(userId, 2023).then(response=>{
+        			  console.log("===========ddddddddddddd")
+        			  console.log(response.data)
+        			  console.log("--------------------")
+        			  response.data.forEach(element =>{
+        				   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) {
@@ -868,6 +881,7 @@
       }).then(() => {
 
         this.getList();
+		this.getList1();
         this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
         this.id1 = undefined
         this.open1 = false;
@@ -961,12 +975,12 @@
     getCateInfor()
     {
       let _this = this
-      getCategory().then(response=>{
+      // getCategory().then(response=>{
 
-        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-        })
-      })
+      //   response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+      //     _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+      //   })
+      // })
     },
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -1032,6 +1046,7 @@
     handleCheck(row){
      // alert(123)
       const id = row.id;
+	  this.open2 = false; 
       this.$router.push("/familymodel/economy/economyInfo/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.1