From b91ae843757fcfb74af04ff85decf8c26b6f4591 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 17 七月 2023 23:23:54 +0800
Subject: [PATCH] 主要在成长经历阅历主要经历的修改做改动（未能成功修改数据）
---
ruoyi-ui/src/views/genealogy/index.vue | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 19393de..5b654da 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -19,14 +19,20 @@
</el-form-item>
<el-form-item label="韬唤" prop="identity" >
- <el-input
+ <el-select
v-model="queryParams.identity"
- placeholder="璇疯緭鍏ヨ韩浠�"
+ placeholder="璇烽�夋嫨韬唤"
clearable
style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ @keyup.enter.native="handleQuery"
+ >
+ <el-option
+ v-for="item in typeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
@@ -71,14 +77,14 @@
</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>
+<!-- <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">-->
@@ -143,12 +149,13 @@
<el-table v-loading="loading" :data="listRoot" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="25" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <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" >
<template slot-scope="scope">
<span>绗瑊{scope.row.identity}}浠�</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" >
@@ -456,7 +463,19 @@
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value:'1',
+ label:'绗�1浠�'
+ },{
+ value:'2',
+ label:'绗�2浠�'
+ },{
+ value:'3',
+ label:'绗�3浠�'
+ },{
+ value:'4',
+ label:'绗�4浠�'
+ }],
};
},
created() {
@@ -526,16 +545,30 @@
);
},
/** 鏌ヨ绫诲埆淇℃伅 */
- // getCateInfor()
- // {
- // let _this = this
- // getCategory().then(response=>{
- //
- // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- // })
- // })
- // },
+ getCateInfor()
+ {
+ let _this = this
+ getCategory().then(response=>{
+
+ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ })
+ })
+ },
+ //韬唤閫夋嫨
+ getSrc(identity) {
+ if (identity === '1'){
+ return '绗�1浠�'
+ }else if(identity === '2'){
+ return '绗�2浠�'
+ }else if(identity === '3'){
+ return '绗�3浠�'
+ }else if(identity === '4'){
+ return '绗�4浠�'
+ }else {
+ return '鍏跺畠'
+ }
+ },
handleRemove(file) {
alert(323)
@@ -604,8 +637,8 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.userId;
- alert(id)
- this.$router.push("/familymodel/jiagenwang/getPInfo/" + id);
+ // alert(id)
+ this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
},
@@ -668,11 +701,27 @@
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ // handleExport() {
+ // this.download('/self/user/export/genealogy', {
+ // ...this.queryParams
+ // }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ // },
+
handleExport() {
- this.download('/self/user/export/genealogy', {
- ...this.queryParams
- }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('/self/user/export/genealogy', {
+ ...this.queryParams
+ }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/self/user/export/genealogy/'+Ids, {
+
+ }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ }
},
+
/** 瀵煎叆鎿嶄綔*/
// handleEnport(params){
// var file = params.file;
--
Gitblit v1.9.1