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 | 98 +++++++++++++++++++++---------------------------
1 files changed, 43 insertions(+), 55 deletions(-)
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 52aa510..31d67dd 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -8,48 +8,14 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.name"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="鐢ㄦ埛鐘舵��"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </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>
@@ -79,7 +45,7 @@
>淇敼</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="info"
plain
@@ -88,7 +54,7 @@
@click="handleImport"
v-hasPermi="['system:user:import']"
>瀵煎叆</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@@ -110,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"
@@ -157,7 +123,7 @@
<el-row>
<el-col :span="12" >
- <el-form-item label="瀹舵棌鍚嶇О" prop="clanId">
+ <el-form-item label="閫夊鏃忓彿" prop="clanId">
<el-select v-model="form.clanId" placeholder="璇疯緭鍏ュ鏃忓悕绉�">
<el-option
@@ -195,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"
@@ -215,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"
@@ -459,6 +425,7 @@
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getList() {
this.loading = true;
+ // alert(this.queryParams.name)
//alert(this.queryParams.pageNum)
listAncestor(this.queryParams).then(response => {
this.userList = response.data.data;
@@ -517,19 +484,29 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
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();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.userId);
+ this.ids = selection.map(item => item.id);
+ console.log(this.ids+"----------")
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@@ -565,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])
@@ -617,7 +597,7 @@
);
this.open = true;
- this.title = "淇敼鐢ㄦ埛";
+ this.title = "娣诲姞鐢ㄦ埛";
this.form.password = "";
});
},
@@ -715,9 +695,17 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/user/export', {
- ...this.queryParams
- }, `user_${new Date().getTime()}.xlsx`)
+ const Ids = this.ids;
+//alert(Ids)
+ if(Ids.length==0)
+ {
+ this.download('/ZfAncestor/export', {
+ ...this.queryParams
+ }, `zIdea_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/ZfAncestor/export1/'+Ids, {
+ }, `zIdea_${new Date().getTime()}.xlsx`)
+ }
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
--
Gitblit v1.9.1