From bf4cb195c34e79dae5576b21a215118b7ef1357f Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 11 七月 2024 21:33:39 +0800
Subject: [PATCH] 修改了bug和用户管理配偶显示问题
---
ruoyi-ui/src/views/system/user/index.vue | 417 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 284 insertions(+), 133 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 83b2fbc..dcb53c0 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">
@@ -187,27 +187,19 @@
<el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="瑙掕壊" prop="roleIds">
- <el-select v-model="rt" placeholder="璇烽�夋嫨瑙掕壊" @change="getRole">
+ <el-col :span="12">
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ </el-form-item>
+ </el-col>
- <el-option
- v-for="item in roleOptions"
- :key="item.roleId"
- :label="item.roleName"
- :value="item.roleId"
- :disabled="item.status == 1"
- ></el-option>
- </el-select>
- </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"
@@ -230,72 +222,83 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password">
- <el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password/>
- </el-form-item>
- </el-col>
+
+ <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"
+ :label="item.roleName"
+ :value="item.roleId"
+ :disabled="item.status == 1"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+
+
+ <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-col :span="12">
- <el-form-item label="瀹跺涵鍙�">
- <el-select v-model="fid" placeholder="璇烽�夋嫨瀹跺涵鍙�" @change="handleChange">
-
- <el-option
- key="-1"
- label="鏃�"
- value="-1"
- ></el-option>
- <el-option
- v-for="item in famiInfo"
- :key="item.id"
- :label="item.name"
- :value="item.id"
-
- ></el-option>
- </el-select>
-
- </el-form-item>
- </el-col>
-
- </el-row>
-
- <el-row v-if="isshowMar">
-
- <el-col :span="12">
- <el-form-item label="鏄惁鏈" prop="isMyFamily">
- <el-select v-model="form.isMyFamily" placeholder="璇疯緭鍏ユ槸鍚︽湰瀹�" @change="handleFamily">
+ <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">
<el-option
- key=1
- label="鏄�"
- value=1
- ></el-option>
- <el-option
- key=0
- label="鍚�"
- value=0
+ v-for="item in fathorInfo"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
></el-option>
</el-select>
- </el-form-item>
- </el-col>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="姣嶄翰" prop="mid">
+ <el-select v-model="form.mid" placeholder="璇烽�夋嫨姣嶄翰" @change="hanldeLoopMon">
+ <el-option
+ v-for="item in motherInfo"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ ></el-option>
+ </el-select>
+
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row >
+
+
</el-row>
- <el-row v-if="isshowMri">
- <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>
@@ -354,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
- changeUserStatus, deptTreeSelect } 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";
@@ -365,6 +368,10 @@
components: { Treeselect },
data() {
return {
+ // 淇敼閰嶅伓鏃剁殑鐢ㄦ埛id鍜宻ex
+ sex:'',
+ pOID:'',
+ a:undefined,
// 閬僵灞�
loading: true,
//瑙掕壊淇濆瓨
@@ -402,10 +409,15 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
+ famOptions:[{"opsi":1,"opName":"鏄�"},{"opsi":0,"opName":"鍚�"}],
// 琛ㄥ崟鍙傛暟
+ cuid: undefined,
+ orfid: undefined,
+ ormid: undefined,
motherInfo:[],
fathorInfo:[],
allInfo:[],
+ allInfo2:[],
faid: 0,
maid: 0,
form: {},
@@ -466,9 +478,7 @@
deptId: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
- spouseId: [
- { required: true, message: "閰嶅伓淇℃伅涓嶈兘涓虹┖", trigger: "blur" }
- ],
+
password: [
{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{ min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -501,21 +511,17 @@
this.getFamlilyInfo();
this.getDeptTree();
//鎷垮埌鑷繁瀹氫箟鐨勭敤鎴蜂俊鎭�
- // this.getAllIn();
+ this.getAllIn();
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
});
},
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)
@@ -527,19 +533,154 @@
this.isshowMar = false
}
},
- handleFamily()
- {
+ 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 = []
+ // alert(this.pOID)
+ },
+
+ hanldeLoop(){
+ let fid = this.form.fid
+ let _this = this
+ if(this.cuid==undefined)
+ {
+ let jsd = true
+ for(var i = 0; i < _this.allInfo.length; i++)
+ {
+ if(_this.allInfo[i].userId==_this.form.fid)
+ {
+ //_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)
+ if(!response.data)
+ {
+ for(var i = 0; i < _this.allInfo.length; i++)
+ {
+ if(_this.allInfo[i].userId==_this.form.fid)
+ {
+ //_this.form.mid = _this.allInfo[i].spouseId
+ _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
+
+ }
+ }
+ }else
+ {
+ //alert(fid)
+ _this.$set(_this.form,'fid',_this.orfid);
+ this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒");
+ }
+ })
+ },
+ hanldeLoopMon(){
+ //alert(this.cuid)
+ let fid = this.form.mid
+ let _this = this
+ if(this.cuid==undefined)
+ {
+ let jsd = true
+ for(var i = 0; i < _this.allInfo.length; i++)
+ {
+ if(_this.allInfo[i].userId==_this.form.mid)
+ {
+ //_this.form.fid = _this.allInfo[i].spouseId
+ jsd = false
+ _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
+
+ }
+ }
+ if(jsd == true)
+ _this.$set(_this.form,'fid','');
+ return;
+ }
+
+ //alert(fid)
+ updateFM(this.cuid, fid).then(response => {
+ //alert(response.data)
+ if(!response.data)
+ {
+ for(var i = 0; i < _this.allInfo.length; i++)
+ {
+ if(_this.allInfo[i].userId==_this.form.mid)
+ {
+ //_this.form.fid = _this.allInfo[i].spouseId
+ _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
+
+ }
+ }
+ }else
+ {
+ //alert(fid)
+ _this.$set(_this.form,'mid',_this.ormid);
+ this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒");
+ }
+ })
+ },
+ handleFamily(value)
+ {
if(this.form.isMyFamily=="0")
this.isshowMri = true
},
getAllIn(){
getAllInfo().then(response => {
- // this.allInfo = response.data;
- // console.log(response.data)
+ this.allInfo = response.data;
+ console.log(response.data,'allInfoallInfoallInfoallInfo')
+ for(var i = 0; i < this.allInfo.length; i++)
+ {
+ //alert(this.allInfo[i].sex == 1)
+ if(this.allInfo[i].sex == 0)
+ this.fathorInfo.push(this.allInfo[i])
+ else
+ this.motherInfo.push(this.allInfo[i])
+ }
+ // alert(98)
+ //console.log(this.fathorInfo)
+ //console.log('----sdfdsfds')
})
},
- getRole(){
+ getRole(value){
this.form.roleIds = []
this.form.roleIds.push(this.rt)
},
@@ -653,6 +794,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
+ this.a = 1
this.reset();
getUser().then(response => {
this.postOptions = response.posts;
@@ -660,6 +802,8 @@
this.roleOptions= []
this.roleOptions.push(response.roles[1])
this.roleOptions.push(response.roles[3])
+ console.log(this.roleOptions)
+ console.log("0-009888")
this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
this.form.password = this.initPassword;
@@ -667,34 +811,56 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
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;
// this.fid = response.data.familyId
//alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
- console.log(response.data)
+ console.log(response.data,'formformformformform')
+ console.log(this.form.spouseId,'浼翠荆id')
+ // console.log(response.data)
this.postOptions = response.posts;
this.roleOptions = response.roles;
+ // console.log(this.roleOptions)
+ // this.$set(this.form, "postIds", response.postIds);
+ // this.$set(this.form, "roleIds", response.roleIds);
// alert(response.roleIds.length)
- if(response.roleIds.length!=0)
- this.rt = response.roleIds[0]
+ // if(response.roleIds.length!=0)
+ // this.rt = response.roleIds[0]
let _this = this
getIndividual(userId).then(response => {
// alert(123)
- console.log('++++++++-----0000((((((9999))))))')
- console.log(response.data)
+ // console.log('++++++++-----0000((((((9999))))))')
+ console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
{
- _this.fid = response.data.familyId;
+
+ _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);
+ _this.$set(_this.form,'spouseId',response.data.spouseId);
+ if(response.data.roleId==3)
+ _this.$set(_this.form,'role',102);
+ else
+ _this.$set(_this.form,'role',response.data.roleId);
+ // alert(_this.form.fid)
_this.zinfid = response.data.userId
+ // alert(78)
}
}
);
- this.$set(this.form, "postIds", response.postIds);
- this.$set(this.form, "roleIds", response.roleIds);
+
this.open = true;
this.title = "淇敼鐢ㄦ埛";
this.form.password = "";
@@ -725,50 +891,39 @@
let ps = true
- if(this.fid=="鏃�")
- this.fid = -1
- let _this = this
- if(this.rt===2 && (this.fid!=-1))
- {
- ps = false
- }
- if(this.rt!=2&&this.fid==-1)
- {
- this.$modal.msgSuccess("瀹跺涵鎴愬憳锛屽繀椤昏鎷ユ湁瀹跺涵鍙凤紒");
- return
- }
-
+ let _this = this
+
+
if(ps)
{
let fm = {}
fm.userId = _this.zinfid;
fm.nickName = this.form.nickName
- fm.roleId =this.rt
+ // alert(this.form.role)
+ fm.roleId = this.form.role
fm.sex = this.form.sex
+ // alert(fm.sex)
fm.status = this.form.status
- fm.familyId = this.fid
-
- fm.isMyFamily = this.form.isMyFamily
+ 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
-
- if(_this.fid==="鏃�")
- fm.familyId= -1
- else
- fm.familyId = _this.fid
- this.form.familyId = fm.familyId
+ 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.rt = undefined
- _this.fid = "鏃�"
- this.isshowMar = false
- this.isshowMri = false
+ // this.isshowMar = false
+ // this.isshowMri = false
// updateUserInfo(fm).then(response=>{
// this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
@@ -780,25 +935,21 @@
// })
});
} else {
-
- addUser(this.form).then(response => {
+ addUser(fm).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
_this.rt = undefined
- _this.fid = "鏃�"
- this.isshowMar = false
- this.isshowMri = false
+ // this.isshowMar = false
+ // this.isshowMri = false
});
}
}
-
-
}
else{
this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�");
// _this.rt = undefined
- _this.fid = "鏃�"
+ // _this.fid = "鏃�"
_this.isshowMar = false
}
});
--
Gitblit v1.9.1