From 7eb199649939226c3f11fd6f4cda830a389253b8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 20 四月 2025 19:14:09 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/clanManager/ancestor/index.vue |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 51c32da..31d67dd 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -76,12 +76,12 @@
 
           <el-table-column label="鐢ㄦ埛瑙掕壊" align="center" key="roleName" prop="roleName" width="120" />
       <el-table-column label="鎬у埆" align="center" key="sex" prop="sex"  width="120" >
-            <template slot-scope="scope">{{scope.row.sex==0? '濂�': '鐢�'}}</template>
+            <template slot-scope="scope">{{scope.row.sex==1? '濂�': '鐢�'}}</template>
             
           </el-table-column>
       
           <el-table-column
-            label="鎿嶄綔"
+           fixed="right" label="鎿嶄綔"
             align="center"
             width="160"
             class-name="small-padding fixed-width"
@@ -161,8 +161,8 @@
             </el-form-item>
           </el-col>
 	<el-col :span="12">
-	  <el-form-item label="鐢ㄦ埛鎬у埆">
-	    <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+	  <el-form-item label="绁栧厛鎬у埆">
+	    <el-select v-model="form.sex" placeholder="璇烽�夋嫨绁栧厛鎬у埆">
 	      <el-option
 	        v-for="dict in dict.type.sys_user_sex"
 	        :key="dict.value"
@@ -181,7 +181,7 @@
             </el-form-item>
           </el-col>
 	<el-col :span="12">
-	  <el-form-item label="鐢ㄦ埛鎬у埆">
+	  <el-form-item label="绁栧厛鎬у埆">
 	    <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
 	      <el-option
 	        v-for="dict in dict.type.sys_user_sex"
@@ -425,7 +425,7 @@
     /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
     getList() {
       this.loading = true;
-	  alert(this.queryParams.name)
+	 // alert(this.queryParams.name)
 	  //alert(this.queryParams.pageNum)
       listAncestor(this.queryParams).then(response => {
           this.userList = response.data.data;
@@ -484,14 +484,23 @@
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+	 
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+	  this.queryParams = {
+	    pageNum: 1,
+	    pageSize: 10,
+	    name: undefined,
+	    role: undefined,
+	    sex: undefined,
+	    
+	  },
+      
+     // this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -533,18 +542,21 @@
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.a = 2
-      this.pOID = row.userId
+	  console.log(row)
+	  console.log("000000000--")
+      this.pOID = row.id
       this.sex = row.sex
     //  this.getSex();
       this.reset();
-      const userId = row.userId || this.ids;
-	  this.cuid= row.userId || this.ids;
+      const userId = row.id || this.ids;
+	  this.cuid= row.id || this.ids;
       //  this.fid = response.data.familyId
+	// alert(userId)
         //alert(this.fid)
       getUser(userId).then(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])
@@ -585,7 +597,7 @@
         );
 
         this.open = true;
-        this.title = "淇敼鐢ㄦ埛";
+        this.title = "娣诲姞鐢ㄦ埛";
         this.form.password = "";
       });
     },
@@ -684,7 +696,7 @@
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
   const Ids = this.ids;
-alert(Ids)
+//alert(Ids)
       if(Ids.length==0)
       {
         this.download('/ZfAncestor/export', {

--
Gitblit v1.9.1