From b3e00f677518d8c0a5ad7d74c427af4abba810b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 八月 2024 08:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/system/family/index.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index 33546cb..1d5db73 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -197,9 +197,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- roleName: undefined,
- roleKey: undefined,
- status: undefined
+ name: undefined,
+ clanId: undefined
},
personInfos:[],
personInfos1:[],
@@ -268,7 +267,9 @@
},
getAllUser(){
- getAllInfo().then(response=>{
+ let clanId = this.$store.state.user.clanId
+
+ getAllInfo(clanId).then(response=>{
let fams = response.data
let _this = this;
console.log(fams)
@@ -287,10 +288,13 @@
getList() {
this.loading = true;
let clanId = this.$store.state.user.clanId
- alert(clanId)
- listFamily().then(response => {
- this.roleList = response.data;
- // this.total = response.total;
+ // alert(clanId)
+ //alert(clanId)
+ this.queryParams.clanId = clanId;
+ listFamily(this.queryParams).then(response => {
+ console.log(response)
+ this.roleList = response.data.data;
+ this.total = response.data.total;
this.loading = false;
}
);
--
Gitblit v1.9.1