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 | 177 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 67 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 0621b09..1ca6548 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -179,7 +179,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body @close="handleClose">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -192,14 +192,14 @@
<el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
</el-form-item>
</el-col>
-
+
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="鐢ㄦ埛鎬у埆">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆" @change="getSex">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
@@ -222,11 +222,11 @@
</el-col>
</el-row>
<el-row>
-
+
<el-col :span="12">
<el-form-item label="瑙掕壊" prop="role">
<el-select v-model="form.role" placeholder="璇烽�夋嫨瑙掕壊" @change="getRole">
-
+
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@@ -237,28 +237,28 @@
</el-select>
</el-form-item>
</el-col>
-
-
- <el-col :span="12">
- <el-form-item label="鏄惁鏈" prop="isMyFamily">
+
+
+ <el-col :span="12" v-if="form.role == 102">
+ <el-form-item label="鏄惁鏈" prop="isMyFamily" >
<el-select v-model="form.isMyFamily" placeholder="璇疯緭鍏ユ槸鍚︽湰瀹�" @change="handleFamily">
-
+
<el-option
v-for="item in famOptions"
:key="item.opsi"
:label="item.opName"
:value="item.opsi"
-
+
></el-option>
-
+
</el-select>
-
+
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-if="form.role != 2 && form.isMyFamily == 1">
-
+
<el-col :span="12">
<el-form-item label="鐖朵翰" prop="fid">
<el-select v-model="form.fid" placeholder="璇烽�夋嫨鐖朵翰" @change="hanldeLoop">
@@ -282,23 +282,23 @@
:value="item.userId"
></el-option>
</el-select>
-
+
</el-form-item>
</el-col>
</el-row>
<el-row >
-
+
</el-row>
- <el-row >
- <el-col :span="12">
- <el-form-item label="閰嶅伓淇℃伅" prop="spouseId">
- <el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅">
+ <el-row v-if="form.role == 102 && form.isMyFamily == 0">
+ <el-col :span="12" >
+ <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} 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";
@@ -368,6 +368,10 @@
components: { Treeselect },
data() {
return {
+ // 淇敼閰嶅伓鏃剁殑鐢ㄦ埛id鍜宻ex
+ sex:'',
+ pOID:'',
+ a:undefined,
// 閬僵灞�
loading: true,
//瑙掕壊淇濆瓨
@@ -413,6 +417,7 @@
motherInfo:[],
fathorInfo:[],
allInfo:[],
+ allInfo2:[],
faid: 0,
maid: 0,
form: {},
@@ -473,7 +478,7 @@
deptId: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
-
+
password: [
{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{ min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -512,15 +517,11 @@
});
},
methods: {
- handleChange()
- {
- // alert(this.fid)
+ handleChange(){
if(this.fid=="鏃�")
this.fid = "-1"
- if(this.fid!="-1")
- {
+ if(this.fid!="-1"){
//鏌ヨ涓嶆槸鏈鐨勬椂鍊欙紝鍙互閫夋嫨鐨勯厤鍋朵俊鎭�
-
getInfoByFid(this.fid).then(response=>{
console.log("--------------------")
console.log(response.data)
@@ -532,7 +533,43 @@
this.isshowMar = false
}
},
-
+
+ handleSpouse(value){
+
+ },
+ // 鑾峰彇鎬у埆
+ getSex(value){
+ if(value != undefined){
+ this.sex = value
+ }
+ // alert(this.sex)
+ const tpfid = this.pOID
+ // 鏂板a=1,淇敼a=2
+ if(this.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 =>{
+ 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')
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.pOID = ''
+ this.allInfo2 = []
+ // this.reset();
+ // alert(this.pOID)
+ },
+
hanldeLoop(){
let fid = this.form.fid
let _this = this
@@ -546,16 +583,16 @@
//_this.form.mid = _this.allInfo[i].spouseId
_this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
jsd = false
-
+
}
if(jsd == true)
_this.$set(_this.form,'mid','');
}
return;
}
-
+
//alert(this.cuid)
-
+
//alert(fid)
updateFM(this.cuid, fid).then(response => {
//alert(response.data)
@@ -567,7 +604,7 @@
{
//_this.form.mid = _this.allInfo[i].spouseId
_this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
-
+
}
}
}else
@@ -575,6 +612,8 @@
//alert(fid)
_this.$set(_this.form,'fid',_this.orfid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
@@ -592,7 +631,7 @@
//_this.form.fid = _this.allInfo[i].spouseId
jsd = false
_this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
-
+
}
}
if(jsd == true)
@@ -611,7 +650,7 @@
{
//_this.form.fid = _this.allInfo[i].spouseId
_this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
-
+
}
}
}else
@@ -619,19 +658,20 @@
//alert(fid)
_this.$set(_this.form,'mid',_this.ormid);
this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒");
+ this.form.fid = undefined
+ this.form.mid = undefined
}
})
},
- handleFamily()
+ handleFamily(value)
{
-
if(this.form.isMyFamily=="0")
this.isshowMri = true
},
getAllIn(){
getAllInfo().then(response => {
this.allInfo = response.data;
- console.log(response.data)
+ console.log(response.data,'allInfoallInfoallInfoallInfo')
for(var i = 0; i < this.allInfo.length; i++)
{
//alert(this.allInfo[i].sex == 1)
@@ -645,7 +685,7 @@
//console.log('----sdfdsfds')
})
},
- getRole(){
+ getRole(value){
this.form.roleIds = []
this.form.roleIds.push(this.rt)
},
@@ -759,6 +799,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
+ this.a = 1
this.reset();
getUser().then(response => {
this.postOptions = response.posts;
@@ -766,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 = "娣诲姞鐢ㄦ埛";
@@ -775,6 +816,10 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.a = 2
+ this.pOID = row.userId
+ this.sex = row.sex
+ this.getSex();
this.reset();
const userId = row.userId || this.ids;
this.cuid= row.userId || this.ids;
@@ -782,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)
@@ -797,14 +845,14 @@
getIndividual(userId).then(response => {
// alert(123)
// console.log('++++++++-----0000((((((9999))))))')
- // console.log(response.data)
+ console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
{
-
+
_this.orfid = response.data.fatherId
_this.ormid = response.data.momId
//alert(response.data.roleId)
-
+
_this.$set(_this.form,'fid',response.data.fatherId);
_this.$set(_this.form,'mid',response.data.momId);
_this.$set(_this.form,'isMyFamily',response.data.isMyFamily);
@@ -850,42 +898,41 @@
let ps = true
-
+
let _this = this
-
-
+
+
if(ps)
{
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
// alert(this.form.isMyFamily)
fm.isMyFamily = this.form.isMyFamily=='1'?1:0
-
+
fm.spouseId = this.form.spouseId
fm.sysId = this.form.userId
fm.userName = this.form.userName
-
- console.log(fm)
+ fm.remark = this.form.remark
+ // alert(fm.remark)
+
+ 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
@@ -895,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