From b075e99a05e05649d24ed59a74cae29fc3192875 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 10 十一月 2024 22:20:30 +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 | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 047804e..468fce1 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -475,7 +475,10 @@
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
],
- roleIds: [
+ roleIds: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ role: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
isMyFamily: [
@@ -692,7 +695,7 @@
})
if(this.form.isMyFamily=="0")
this.isshowMri = true
-
+
}
},
getAllIn(){
@@ -715,7 +718,7 @@
// alert(98)
console.log(this.fathorInfo)
console.log('----sdfdsfds')
-
+
console.log(this.motherInfo)
})
},
@@ -857,11 +860,14 @@
this.a = 2
this.pOID = row.userId
this.sex = row.sex
+
this.getSex();
-
+
this.getAllIn()
+
const userId = row.userId || this.ids;
this.cuid= row.userId || this.ids;
+
let clanId = this.$store.state.user.clanId
this.allInfo2 = []
//alert(this.form.sex)
@@ -874,8 +880,9 @@
//alert(this.fid)
let _this = this
getUser(userId).then(response => {
- console.log(response.data)
+ console.log(response)
this.form = response.data;
+
console.log(response.data,'formformformformform')
// console.log(_this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
@@ -890,9 +897,15 @@
// if(response.roleIds.length!=0)
// this.rt = response.roleIds[0]
let _this = this
-
+ // alert(response.data.roles[0].roleName)
+ // console.log(response.data.role)
+ // if(response.data.role!=102)
+ // {
+ // return
+ // }
getIndividual(userId).then(response => {
- // alert(123)
+
+
// console.log('++++++++-----0000((((((9999))))))')
console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
@@ -911,7 +924,7 @@
if(response.data.roleId==3)
{
_this.originRole = 102
-
+
_this.$set(_this.form,'role',102);
}
else
@@ -923,6 +936,9 @@
_this.zinfid = response.data.userId
// alert(78)
}
+ else{
+ _this.$set(_this.form,'role',2);
+ }
}
);
@@ -969,16 +985,18 @@
fm.roleId = this.form.role
fm.sex = this.form.sex
// alert(fm.sex)
+
fm.status = this.form.status
if(this.originRole==102 && fm.roleId==2)
{
+ this.originRole = undefined
this.$modal.msgSuccess("瀹跺涵鐢ㄦ埛涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
return
}
fm.fid = this.form.fid
fm.mid = this.form.mid
- alert(this.form.fid)
- alert(this.form.mid)
+ // alert(this.form.fid)
+ // alert(this.form.mid)
// alert(this.form.isMyFamily)
fm.isMyFamily = this.form.isMyFamily=='1'?1:0
--
Gitblit v1.9.1