From e8cdd22396d68871bed48610530a89063d63bb40 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 06 八月 2024 08:33:28 +0800
Subject: [PATCH] 修改了直播时间和用户管理父母
---
ruoyi-ui/src/views/system/user/index.vue | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2084858..1ca6548 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -297,8 +297,8 @@
<el-form-item label="閰嶅伓淇℃伅" prop="spouseId" >
<el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅" @change="handleSpouse">
<el-option
- v-for="item in allInfo"
- :key="item.userId"
+ v-for="(item, index) in allInfo2"
+ :key="index"
:label="item.nickName"
:value="item.userId"
></el-option>
@@ -357,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
- changeUserStatus, deptTreeSelect ,updateFM, updatePO} from "@/api/system/user";
+ changeUserStatus, deptTreeSelect ,updateFM, updatePO, addPO} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -546,11 +546,18 @@
const tpfid = this.pOID
// 鏂板a=1,淇敼a=2
if(this.a == 1){
- alert('鏂板a=1')
+ addPO(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=1鏂板a=1鏂板a=1')
+ })
}else{
updatePO(tpfid,this.sex).then(response =>{
- this.allInfo2 = response.data
- console.log(this.allInfo2,'淇敼a=2')
+ 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')
@@ -558,6 +565,8 @@
// 鍏抽棴寮圭獥鍚�
handleClose(){
this.pOID = ''
+ this.allInfo2 = []
+ // this.reset();
// alert(this.pOID)
},
@@ -603,6 +612,8 @@
//alert(fid)
_this.$set(_this.form,'fid',_this.orfid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
@@ -647,6 +658,8 @@
//alert(fid)
_this.$set(_this.form,'mid',_this.ormid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
@@ -794,7 +807,7 @@
this.roleOptions= []
this.roleOptions.push(response.roles[1])
this.roleOptions.push(response.roles[3])
- console.log(this.roleOptions)
+ console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
console.log("0-009888")
this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
@@ -814,11 +827,14 @@
//alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
- console.log(response.data)
- console.log(response.data)
+ console.log(response.data,'formformformformform')
+ console.log(this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
- this.roleOptions = response.roles;
- console.log(this.roleOptions)
+ this.roleOptions= []
+ this.roleOptions.push(response.roles[1])
+ this.roleOptions.push(response.roles[3])
+ // this.roleOptions = response.roles;
+ console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
// this.$set(this.form, "postIds", response.postIds);
// this.$set(this.form, "roleIds", response.roleIds);
// alert(response.roleIds.length)
@@ -829,7 +845,7 @@
getIndividual(userId).then(response => {
// alert(123)
// console.log('++++++++-----0000((((((9999))))))')
- // console.log(response.data)
+ console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
{
@@ -891,10 +907,10 @@
let fm = {}
fm.userId = _this.zinfid;
fm.nickName = this.form.nickName
- alert(this.form.role)
+ // alert(this.form.role)
fm.roleId = this.form.role
fm.sex = this.form.sex
- alert(fm.sex)
+ // alert(fm.sex)
fm.status = this.form.status
fm.fid = this.form.fid
fm.mid = this.form.mid
@@ -904,20 +920,19 @@
fm.spouseId = this.form.spouseId
fm.sysId = this.form.userId
fm.userName = this.form.userName
+ fm.remark = this.form.remark
+ // alert(fm.remark)
- console.log(fm)
+ console.log(fm,'fmfmfmfmfmfmfmfm')
if (valid) {
if (this.form.userId != undefined) {
updateUser(fm).then(response => {
-
- this.open = false;
+ this.open = false;
this.getList();
-
-
// this.isshowMar = false
// this.isshowMri = false
// updateUserInfo(fm).then(response=>{
- // this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
// this.getList();
// _this.rt = undefined
@@ -927,20 +942,16 @@
// })
});
} else {
-
addUser(fm).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
_this.rt = undefined
-
// this.isshowMar = false
// this.isshowMri = false
});
}
}
-
-
}
else{
this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�");
--
Gitblit v1.9.1