From e15df9a20c29044b10772e3587a00d0be03b281d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 08 十二月 2024 20:57:41 +0800
Subject: [PATCH] 增加了内容
---
ruoyi-ui/src/views/genealogy/index.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index f8a97c1..08f94c2 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -39,9 +39,9 @@
</el-select>
</el-form-item>
- <el-form-item label="鐢熸棩" prop="birth deadDay">
+ <el-form-item label="鐢熸棩" prop="birth">
<el-date-picker
- v-model="dateRange"
+ v-model="queryParams.birth"
style="width: 240px;
height: 30px;
background: #FFFFFF;
@@ -49,10 +49,6 @@
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
@keyup.enter.native="handleQuery"
></el-date-picker>
@@ -92,11 +88,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 +121,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">
@@ -296,11 +298,11 @@
},
typeOption: [{
- value: '1',
+ value: '0',
label: '鐢�',
},
{
- value: '0',
+ value: '1',
label: '濂�',
}],
typeOptions: [{
@@ -368,7 +370,7 @@
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
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)
--
Gitblit v1.9.1