From 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 09 七月 2024 16:56:14 +0800
Subject: [PATCH] 修改了一些报错，完善了用户管理配偶的选择模块
---
ruoyi-ui/src/views/system/user/index.vue | 86 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 71b31d9..4f0408d 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">
@@ -199,7 +199,7 @@
<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"
@@ -292,12 +292,12 @@
</el-row>
- <el-row v-if="form.role != 2 && form.isMyFamily == 0">
+ <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="璇烽�夋嫨閰嶅伓淇℃伅">
+ <el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅" @change="handleSpouse">
<el-option
- v-for="item in allInfo"
+ v-for="item in allInfo2"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
@@ -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: {},
@@ -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)
@@ -531,6 +532,41 @@
else{
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':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':i})
+ }
+ console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
+ })
+ }
+ // console.log(sex,'sexsexsex')
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.pOID = ''
+ this.allInfo2 = []
+ // alert(this.pOID)
},
hanldeLoop(){
@@ -630,7 +666,7 @@
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)
@@ -758,6 +794,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
+ this.a = 1
this.reset();
getUser().then(response => {
this.postOptions = response.posts;
@@ -774,6 +811,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;
@@ -781,8 +822,8 @@
//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(response.data)
this.postOptions = response.posts;
this.roleOptions = response.roles;
console.log(this.roleOptions)
@@ -858,10 +899,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
@@ -871,16 +912,15 @@
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)
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=>{
@@ -894,20 +934,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