From 47869ed41d8a0d329f770f1654b3794ba601d098 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 21 九月 2025 10:59:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/clanManager/ancestor/index.vue | 100 ++++++++++++++++++++++++++++----------------------
1 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 9d104a0..3fc500c 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -15,7 +15,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
-
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -44,7 +44,7 @@
v-hasPermi="['system:user:edit']"
>淇敼</el-button>
</el-col>
-
+
<!-- <el-col :span="1.5">
<el-button
type="info"
@@ -75,13 +75,13 @@
<el-table-column label="瀹舵棌鍙�" align="center" key="clanName" prop="clanName" :show-overflow-tooltip="true" />
<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>
-
+ <el-table-column label="" align="center" key="sex" prop="sex" width="120" >
+ <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"
@@ -94,13 +94,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>淇敼</el-button>
-
+
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
-
+
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -121,27 +121,27 @@
<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" >
<el-form-item label="閫夊鏃忓彿" prop="clanId">
<el-select v-model="form.clanId" placeholder="璇疯緭鍏ュ鏃忓悕绉�">
-
+
<el-option
v-for="item in famOptions"
:key="item.clanId"
:label="item.clanName"
:value="item.clanId"
-
+
></el-option>
-
+
</el-select>
-
+
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="瑙掕壊" prop="role" >
<el-select v-model="form.roleId" placeholder="璇烽�夋嫨瑙掕壊" @change="changeRole">
-
+
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@@ -152,7 +152,7 @@
</el-select>
</el-form-item>
</el-col>
-
+
</el-row>
<el-row v-if="!isShowAn">
<el-col :span="12">
@@ -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,8 +181,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"
@@ -203,8 +203,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绁栧厛鎬у埆">
- <el-select v-model="form.fsex" placeholder="璇烽�夋嫨鎬у埆">
+ <el-form-item label="鎬у埆">
+ <el-select v-model="form.fsex" placeholder="璇烽�夋嫨">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
@@ -214,10 +214,10 @@
</el-select>
</el-form-item>
</el-col>
-
+
</el-row>
-
+
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -328,10 +328,10 @@
name: undefined,
role: undefined,
sex: undefined,
-
+
},
// 鍒椾俊鎭�
-
+
// 琛ㄥ崟鏍￠獙
rules: {
userName: [
@@ -400,7 +400,7 @@
}
else
{
- this.isShowAn = true;
+ this.isShowAn = true;
}
return;
},
@@ -411,7 +411,7 @@
this.famOptions = response.data
})
},
-
+
// 鍏抽棴寮圭獥鍚�
handleClose(){
this.pOID = ''
@@ -465,13 +465,13 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
-
+
this.reset();
},
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
-
+
name: undefined,
fname: undefined,
fsex: undefined,
@@ -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();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -522,7 +531,7 @@
// getUser().then(response => {
// this.postOptions = response.posts;
// // this.roleOptions = response.roles;
-
+
// console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
// console.log("0-009888")
// this.open = true;
@@ -533,22 +542,25 @@
/** 淇敼鎸夐挳鎿嶄綔 */
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])
- this.roleOptions.push(response.roles[3])
+ // this.roleOptions= []
+ // this.roleOptions.push(response.roles[1])
+ // this.roleOptions.push(response.roles[3])
// this.roleOptions = response.roles;
console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
// this.$set(this.form, "postIds", response.postIds);
@@ -585,7 +597,7 @@
);
this.open = true;
- this.title = "淇敼鐢ㄦ埛";
+ this.title = "娣诲姞鐢ㄦ埛";
this.form.password = "";
});
},
@@ -614,7 +626,7 @@
submitForm: function() {
this.$refs["form"].validate(valid => {
-
+
let _this = this
let fm = {}
@@ -667,8 +679,8 @@
});
}
}
-
-
+
+
});
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1