From 598fe738b22d39172b068db5309476e08481e868 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 10 九月 2024 16:20:31 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/system/user/index.vue | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 26a2558..88d13cc 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -373,6 +373,7 @@
data() {
return {
// 淇敼閰嶅伓鏃剁殑鐢ㄦ埛id鍜宻ex
+ originRole: undefined,
sex:'',
pOID:'',
a:undefined,
@@ -547,7 +548,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
@@ -559,14 +560,15 @@
}
console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
})
- }else{
- updatePO(tpfid,this.sex).then(response =>{
- for(let i in response.data[0]){
- this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
- }
- console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
- })
}
+ // else{
+ // updatePO(tpfid,this.sex).then(response =>{
+ // for(let i in response.data[0]){
+ // this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
+ // }
+ // console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
+ // })
+ // }
// console.log(sex,'sexsexsex')
},
// 鍏抽棴寮圭獥鍚�
@@ -579,6 +581,7 @@
hanldeLoop(){
let fid = this.form.fid
+ alert(fid)
let _this = this
if(this.cuid==undefined)
{
@@ -599,8 +602,8 @@
}
//alert(this.cuid)
+ let clanId = this.$store.state.user.clanId
- //alert(fid)
updateFM(this.cuid, fid).then(response => {
//alert(response.data)
if(!response.data)
@@ -645,8 +648,9 @@
_this.$set(_this.form,'fid','');
return;
}
-
- //alert(fid)
+ let clanId = this.$store.state.user.clanId
+ alert(fid)
+ alert(this.cuid)
updateFM(this.cuid, fid).then(response => {
//alert(response.data)
if(!response.data)
@@ -679,7 +683,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 +692,7 @@
})
if(this.form.isMyFamily=="0")
this.isshowMri = true
+
}
},
getAllIn(){
@@ -696,6 +701,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 +713,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){
@@ -844,19 +853,31 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.reset();
this.a = 2
this.pOID = row.userId
this.sex = row.sex
this.getSex();
- this.reset();
+
+ 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)
+ addPO(this.sex, clanId).then(response =>{
+ for(let i in response.data[0]){
+ this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
+ }
+ })
// this.fid = response.data.familyId
//alert(this.fid)
+ let _this = this
getUser(userId).then(response => {
+ console.log(response.data)
this.form = response.data;
console.log(response.data,'formformformformform')
- console.log(this.form.spouseId,'浼翠荆id')
+ // console.log(_this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
this.roleOptions= []
this.roleOptions.push(response.roles[1])
@@ -884,11 +905,20 @@
_this.$set(_this.form,'fid',response.data.fatherId);
_this.$set(_this.form,'mid',response.data.momId);
_this.$set(_this.form,'isMyFamily',response.data.isMyFamily);
+ console.log(response.data.spouseId)
+ console.log("==============_________________000000000")
_this.$set(_this.form,'spouseId',response.data.spouseId);
if(response.data.roleId==3)
+ {
+ _this.originRole = 102
+
_this.$set(_this.form,'role',102);
+ }
else
+ {
+ _this.originRole = 2
_this.$set(_this.form,'role',response.data.roleId);
+ }
// alert(_this.form.fid)
_this.zinfid = response.data.userId
// alert(78)
@@ -940,8 +970,15 @@
fm.sex = this.form.sex
// alert(fm.sex)
fm.status = this.form.status
+ if(this.originRole==102 && fm.roleId==2)
+ {
+ 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.isMyFamily)
fm.isMyFamily = this.form.isMyFamily=='1'?1:0
@@ -976,6 +1013,7 @@
this.open = false;
this.getList();
_this.rt = undefined
+ this.getAllIn()
// this.isshowMar = false
// this.isshowMri = false
});
--
Gitblit v1.9.1