From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/genealogy/index.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 94f1a3d..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -83,7 +83,7 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="listRoot" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="listRoot" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="韬唤" prop="identity" sortable width="100" >
@@ -92,11 +92,17 @@
<span v-else>鈥斺��</span>
</template>
</el-table-column>
- <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center">
+ <template slot-scope="scope" >
+
+ <el-button @click="handleCheck(scope.row)">{{scope.row.nickName}}</el-button>
+ </template>
+ </el-table-column>
+
<el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
<template slot-scope="scope">
- <span v-if="scope.row.sex===1">鐢�</span>
- <span v-if="scope.row.sex===0">濂�</span>
+ <span v-if="scope.row.sex===0">鐢�</span>
+ <span v-if="scope.row.sex===1">濂�</span>
<span v-if="scope.row.sex== null">鈥斺��</span>
</template>
</el-table-column>
@@ -119,7 +125,7 @@
<template slot-scope="scope">{{scope.row.spouseName? scope.row.spouseName: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -255,6 +261,7 @@
nickName:undefined,
sex:undefined,
birth:undefined,
+ clanId: undefined
},
// searchVal:"",
@@ -295,11 +302,11 @@
},
typeOption: [{
- value: '1',
+ value: '0',
label: '鐢�',
},
{
- value: '0',
+ value: '1',
label: '濂�',
}],
typeOptions: [{
@@ -366,10 +373,8 @@
//alert(23)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
- // this.queryParams.pageSize = this.pageSize; // 娣诲姞 pageSize 鍙傛暟
- // this.queryParams.pageNum = this.pageNum; // 娣诲姞 pageNum 鍙傛暟
-
+ this.queryParams.clanId = this.$store.state.user.clanId
+ this.listRoot = []
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listUserAll(this.queryParams).then(response => {
// console.log(response.data)
@@ -435,7 +440,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
--
Gitblit v1.9.1