From fa2bbe82b73ff975f520caf8f9d32b2c98c7bd56 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 17 九月 2023 23:49:20 +0800
Subject: [PATCH] 完善成长经历阅历,解决折叠面板文字重叠,自传的新增样式已修改,自传已可以成功修改内容
---
ruoyi-ui/src/views/genealogy/index.vue | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 394e113..152afad 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -48,17 +48,14 @@
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-input
- v-model="queryParams.sex"
- placeholder="璇疯緭鍏ユ�у埆"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ <el-select v-model="queryParams.sex" placeholder="璇烽�夋嫨鎬у埆" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOption"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
</el-form-item>
- <el-form-item label="鐢熸棩" prop="birth">
+ <el-form-item label="鐢熸棩" prop="birth deadDay">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -72,6 +69,7 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
@@ -84,15 +82,6 @@
</el-form-item>
</el-form>
<div>
-<!-- <div style="width: 149px;-->
-<!-- height: 24px;-->
-<!-- font-size: 18px;-->
-<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!-- font-weight: 400;-->
-<!-- color: #000000;-->
-<!-- line-height: 21px;-->
-<!-- ">寮犳皬涓�瑙堣〃</div>-->
-
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
@@ -163,7 +152,6 @@
<span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
<span v-else>鈥斺��</span>
</template>
-<!-- <template slot-scope="scope">{{ getSrc(scope.row.identity) }}</template>-->
</el-table-column>
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
<el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
@@ -404,6 +392,14 @@
}],
},
+ typeOption: [{
+ value: '1',
+ label: '鐢�',
+ },
+ {
+ value: '0',
+ label: '濂�',
+ }],
typeOptions: [{
value:'1',
label:'绗�1浠�'
--
Gitblit v1.9.1