From b9bbbc298193293ba72a505c20878edd31a590ad Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 31 八月 2024 21:37:13 +0800
Subject: [PATCH] 修改了家族管理员
---
ruoyi-ui/src/views/travel/index.vue | 1 +
ruoyi-ui/src/views/bignote/index.vue | 12 ++++++++----
ruoyi-ui/src/views/contacts/index.vue | 1 +
ruoyi-ui/src/views/system/user/index.vue | 13 +++++++++----
ruoyi-ui/src/views/economy/index.vue | 1 +
ruoyi-ui/src/views/pet/index.vue | 5 +++--
ruoyi-ui/src/views/secret/index.vue | 1 +
ruoyi-ui/src/views/wish/index.vue | 1 +
ruoyi-ui/src/views/collection/index.vue | 1 +
ruoyi-ui/src/views/doctor/index.vue | 1 +
ruoyi-ui/src/views/honor/index.vue | 1 +
ruoyi-ui/src/views/self/show.vue | 1 +
ruoyi-ui/src/views/device/index.vue | 1 +
ruoyi-ui/src/views/clean/index.vue | 1 +
ruoyi-ui/src/views/selfeconomy/index.vue | 1 +
ruoyi-ui/src/views/note/index.vue | 1 +
16 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 6b06362..6ad7398 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -521,7 +521,7 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-
+import {getAllInfo} from "@/api/system/user"
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {listFamilyevent,enload, delFamilyevent , addFamilyevent , uploadPic,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -822,9 +822,13 @@
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;
+ // alert(this.$store.state.user.clanId)
+ this.listRoot = []
+ 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']
})
@@ -834,7 +838,7 @@
for(let i in this.userOptions){
this.userList.push(this.userOptions[i].value)
}
- console.log(this.userList,'userListuserListuserList')
+ console.log(this.userList,'userListuserListuserList99999999999999')
this.loading1 = false;
}
);
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index f6d4dfd..c7d3ee6 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -869,6 +869,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index fa25d3c..760c740 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -938,6 +938,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 0bb73e2..339f1d8 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -952,6 +952,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 53974cb..61db026 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -860,6 +860,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index a09ac1c..d0dbc35 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -885,6 +885,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e6ca814..1aeb72d 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -840,6 +840,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index afcaf30..5c5ba9c 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -857,6 +857,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index fa96064..10e0795 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -834,6 +834,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 2dcfda0..9337b4a 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -479,7 +479,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涓鍏ユ帴鍙ｅ嚱鏁�
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1,
@@ -875,7 +875,8 @@
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 => {
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
this.listRoot.forEach(element => {
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 2df9200..f736a4c 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -891,6 +891,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index f1d9fe2..1204088 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1611,6 +1611,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 5ac7589..c1c5a02 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -938,6 +938,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 26a2558..db0e228 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -547,7 +547,7 @@
if(value != undefined){
this.sex = value
}
- alert(this.sex)
+ // alert(this.sex)
const tpfid = this.pOID
let clanId = this.$store.state.user.clanId
// 鏂板a=1,淇敼a=2
@@ -679,7 +679,7 @@
else{
let clanId = this.$store.state.user.clanId
this.allInfo2 = []
- alert(this.form.sex)
+ //alert(this.form.sex)
addPO(this.form.sex, clanId).then(response =>{
for(let i in response.data[0]){
this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
@@ -688,6 +688,7 @@
})
if(this.form.isMyFamily=="0")
this.isshowMri = true
+ this.getAllIn()
}
},
getAllIn(){
@@ -696,6 +697,8 @@
console.log(response)
console.log('-------00000000000000000-----------')
this.allInfo = response.data;
+ this.fathorInfo = []
+ this.motherInfo = []
console.log(response.data,'allInfoallInfoallInfoallInfo')
for(var i = 0; i < this.allInfo.length; i++)
{
@@ -706,8 +709,10 @@
this.motherInfo.push(this.allInfo[i])
}
// alert(98)
- //console.log(this.fathorInfo)
- //console.log('----sdfdsfds')
+ console.log(this.fathorInfo)
+ console.log('----sdfdsfds')
+
+ console.log(this.motherInfo)
})
},
getRole(value){
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index c8d917f..0787a47 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -1158,6 +1158,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index dd9f410..9d1254e 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -897,6 +897,7 @@
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
--
Gitblit v1.9.1