From 2d881714a7b35ec6208946a06243c9db6690aff7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 23 十一月 2024 15:26:47 +0800
Subject: [PATCH] 修改性别
---
ruoyi-ui/src/views/system/user/index.vue | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 110 insertions(+), 33 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 89eccb6..6514b48 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -15,7 +15,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+<!-- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
@@ -23,7 +23,7 @@
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鐘舵��" prop="status">
<el-select
v-model="queryParams.status"
@@ -89,7 +89,7 @@
v-hasPermi="['system:user:remove']"
>鍋滅敤</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="info"
plain
@@ -98,7 +98,7 @@
@click="handleImport"
v-hasPermi="['system:user:import']"
>瀵煎叆</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@@ -115,10 +115,14 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢ㄦ埛濮撳悕" align="center" key="userName" prop="userName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" v-if="columns[2].visible" :show-overflow-tooltip="true" >
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+ <template slot-scope="scope">{{scope.row.sex==0? '鐢�': '濂�'}}</template>
+
+ </el-table-column>
+<!-- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
<el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<el-switch
@@ -183,13 +187,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName">
+ <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ <el-form-item label="鐢ㄦ埛濮撳悕" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" maxlength="30" />
</el-form-item>
</el-col>
@@ -369,6 +373,7 @@
data() {
return {
// 淇敼閰嶅伓鏃剁殑鐢ㄦ埛id鍜宻ex
+ originRole: undefined,
sex:'',
pOID:'',
a:undefined,
@@ -470,7 +475,10 @@
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
],
- roleIds: [
+ roleIds: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ role: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
isMyFamily: [
@@ -543,24 +551,27 @@
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
- if(this.a == 1){
- addPO(this.sex).then(response =>{
+ this.allInfo2 = []
+ if(this.a ===1){
+ addPO(this.sex, clanId).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')
- })
}
+ // 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')
},
// 鍏抽棴寮圭獥鍚�
@@ -573,6 +584,7 @@
hanldeLoop(){
let fid = this.form.fid
+ //alert(fid)
let _this = this
if(this.cuid==undefined)
{
@@ -593,8 +605,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)
@@ -639,8 +651,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)
@@ -666,8 +679,24 @@
},
handleFamily(value)
{
+ if(this.form.sex==undefined){
+ this.$modal.msgSuccess("璇峰厛閫夋嫨鎬у埆锛�");
+ return;
+ }
+ else{
+ let clanId = this.$store.state.user.clanId
+ this.allInfo2 = []
+ //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)})
+ }
+ console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
+ })
if(this.form.isMyFamily=="0")
this.isshowMri = true
+
+ }
},
getAllIn(){
let clanId = this.$store.state.user.clanId
@@ -675,6 +704,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++)
{
@@ -685,8 +716,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){
@@ -782,7 +815,7 @@
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ // this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -812,7 +845,7 @@
this.postOptions = response.posts;
// this.roleOptions = response.roles;
this.roleOptions= []
- this.roleOptions.push(response.roles[1])
+ // this.roleOptions.push(response.roles[1])
this.roleOptions.push(response.roles[3])
console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
console.log("0-009888")
@@ -823,19 +856,35 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
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)
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])
@@ -848,9 +897,15 @@
// if(response.roleIds.length!=0)
// this.rt = response.roleIds[0]
let _this = this
-
+ // alert(response.data.roles[0].roleName)
+ // console.log(response.data.role)
+ // if(response.data.role!=102)
+ // {
+ // return
+ // }
getIndividual(userId).then(response => {
- // alert(123)
+
+
// console.log('++++++++-----0000((((((9999))))))')
console.log(response.data,'getIndividualgetIndividualgetIndividual')
if(response.data!=undefined)
@@ -863,15 +918,27 @@
_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)
}
+ else{
+ _this.$set(_this.form,'role',2);
+ }
}
);
@@ -918,9 +985,18 @@
fm.roleId = this.form.role
fm.sex = this.form.sex
// alert(fm.sex)
+
fm.status = this.form.status
+ if(this.originRole==102 && fm.roleId==2)
+ {
+ this.originRole = undefined
+ 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
@@ -955,6 +1031,7 @@
this.open = false;
this.getList();
_this.rt = undefined
+ this.getAllIn()
// this.isshowMar = false
// this.isshowMri = false
});
--
Gitblit v1.9.1