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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 817da99..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -101,8 +101,8 @@
<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>
@@ -125,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">
@@ -302,11 +302,11 @@
},
typeOption: [{
- value: '1',
+ value: '0',
label: '鐢�',
},
{
- value: '0',
+ value: '1',
label: '濂�',
}],
typeOptions: [{
--
Gitblit v1.9.1