From 61cfd79f90f7463ba1f9149d8d988bb081f6a3a1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 12:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/system/user/index.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index baf41eb..89eccb6 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -447,6 +447,7 @@
pageSize: 10,
userName: undefined,
phonenumber: undefined,
+ clanId: undefined,
status: undefined,
deptId: undefined
},
@@ -566,6 +567,7 @@
handleClose(){
this.pOID = ''
this.allInfo2 = []
+ // this.reset();
// alert(this.pOID)
},
@@ -611,6 +613,8 @@
//alert(fid)
_this.$set(_this.form,'fid',_this.orfid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
@@ -655,6 +659,8 @@
//alert(fid)
_this.$set(_this.form,'mid',_this.ormid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
@@ -664,7 +670,10 @@
this.isshowMri = true
},
getAllIn(){
- getAllInfo().then(response => {
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ console.log(response)
+ console.log('-------00000000000000000-----------')
this.allInfo = response.data;
console.log(response.data,'allInfoallInfoallInfoallInfo')
for(var i = 0; i < this.allInfo.length; i++)
@@ -699,6 +708,9 @@
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getList() {
this.loading = true;
+ // alert(this.state.clanId)
+ // alert(this.state.name)
+ this.queryParams.clanId = this.$store.state.user.clanId
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
console.log(this.userList,'userList')
@@ -915,7 +927,8 @@
fm.spouseId = this.form.spouseId
fm.sysId = this.form.userId
fm.userName = this.form.userName
- fm.remark = this.form.remark
+ fm.remark = this.form.remark
+ fm.clanId = this.$store.state.user.clanId
// alert(fm.remark)
console.log(fm,'fmfmfmfmfmfmfmfm')
--
Gitblit v1.9.1