From 1dbcc7c8bf3434048b74a8b762976d7549c00013 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 21 九月 2025 10:59:06 +0800
Subject: [PATCH] 修改祖先的代码
---
ruoyi-ui/src/views/system/user/index.vue | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 88d13cc..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"
@@ -122,7 +122,7 @@
<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="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
@@ -475,7 +475,10 @@
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
],
- roleIds: [
+ roleIds: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ role: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
isMyFamily: [
@@ -581,7 +584,7 @@
hanldeLoop(){
let fid = this.form.fid
- alert(fid)
+ //alert(fid)
let _this = this
if(this.cuid==undefined)
{
@@ -649,8 +652,8 @@
return;
}
let clanId = this.$store.state.user.clanId
- alert(fid)
- alert(this.cuid)
+ // alert(fid)
+ // alert(this.cuid)
updateFM(this.cuid, fid).then(response => {
//alert(response.data)
if(!response.data)
@@ -692,7 +695,7 @@
})
if(this.form.isMyFamily=="0")
this.isshowMri = true
-
+
}
},
getAllIn(){
@@ -715,7 +718,7 @@
// alert(98)
console.log(this.fathorInfo)
console.log('----sdfdsfds')
-
+
console.log(this.motherInfo)
})
},
@@ -812,7 +815,7 @@
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ // this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -842,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")
@@ -857,11 +860,14 @@
this.a = 2
this.pOID = row.userId
this.sex = row.sex
+
this.getSex();
-
+
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)
@@ -874,8 +880,9 @@
//alert(this.fid)
let _this = this
getUser(userId).then(response => {
- console.log(response.data)
+ console.log(response)
this.form = response.data;
+
console.log(response.data,'formformformformform')
// console.log(_this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
@@ -890,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)
@@ -911,7 +924,7 @@
if(response.data.roleId==3)
{
_this.originRole = 102
-
+
_this.$set(_this.form,'role',102);
}
else
@@ -923,6 +936,9 @@
_this.zinfid = response.data.userId
// alert(78)
}
+ else{
+ _this.$set(_this.form,'role',2);
+ }
}
);
@@ -969,16 +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.fid)
+ // alert(this.form.mid)
// alert(this.form.isMyFamily)
fm.isMyFamily = this.form.isMyFamily=='1'?1:0
--
Gitblit v1.9.1