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 | 300 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 175 insertions(+), 125 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 46d08b4..5b654da 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -18,15 +18,21 @@
<!-- v-model="queryParams.id"-->
</el-form-item>
- <el-form-item label="韬唤" prop="nickName" style="padding-left:180px">
- <el-input
- v-model="queryParams.nickName"
- placeholder="璇疯緭鍏ヨ韩浠�"
+ <el-form-item label="韬唤" prop="identity" >
+ <el-select
+ v-model="queryParams.identity"
+ 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>
@@ -63,23 +69,22 @@
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
- style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1; " >閲嶇疆</el-button>
+ <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
</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">-->
@@ -93,17 +98,17 @@
<!-- >鏂板</el-button>-->
<!-- </el-col>-->
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="handleDelete"-->
+<!-- v-hasPermi="['system:role:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -142,17 +147,15 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="listRoot" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <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="myName" sortable width="100" >
-<!-- <template slot-scope="scope">-->
-<!-- <div>-->
-<!-- <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>-->
-<!-- </div>-->
-<!-- </template>-->
-
+ <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" >
@@ -174,40 +177,29 @@
<el-table-column label="鎵�鍦ㄥ崟浣�" prop="unit" sortable width="150" align="center" >
<template slot-scope="scope">{{scope.row.unit? scope.row.unit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="閰嶅伓" prop="userId" sortable width="110" align="center" >
- <template slot-scope="scope">{{scope.row.phoneNumber? scope.row.phoneNumber: '鈥斺�斺�斺��'}}</template>
+<!-- <el-table-column label="閰嶅伓" prop="spouseId" sortable width="110" align="center" >-->
+<!-- <template slot-scope="scope"><span>{{getPerson(scope.row.spouseId)}}</span></template>-->
+<!-- </el-table-column>-->
+ <el-table-column label="閰嶅伓" prop="spouseName" sortable width="110" align="center" >
+ <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 label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
- 鏌ョ湅璇︽儏</el-button>
+<el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
<pagination
- v-show="total>0"
+ v-show="total"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -340,7 +332,7 @@
//瀵煎叆鎺ュ彛鍑芥暟
import {enload, uploadPic} from "@/api/contacts/index";
-import {getRoot} from "@/api/root/index";
+import {getRoot,listUserAll} from "@/api/root/index";
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -408,6 +400,7 @@
politicalOutlook:undefined,
deadDay:undefined,
spouseId:undefined,
+ spouseName:undefined,
img:undefined,
fatherId:undefined,
momId:undefined,
@@ -415,6 +408,7 @@
familyId:undefined,
secondFamilyId:undefined,
childList:undefined,
+ identity:undefined,
url: undefined,
},
@@ -426,6 +420,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ identity:undefined,
nickName:undefined,
sex:undefined,
birth:undefined,
@@ -456,7 +451,7 @@
message: '璇疯緭鍏ユ�у埆',
trigger: 'blur'
}],
- bitrh: [{
+ birth: [{
// required: true,
message: '璇疯緭鍏ュ嚭鐢熸椂闂�',
trigger: 'blur'
@@ -468,7 +463,19 @@
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value:'1',
+ label:'绗�1浠�'
+ },{
+ value:'2',
+ label:'绗�2浠�'
+ },{
+ value:'3',
+ label:'绗�3浠�'
+ },{
+ value:'4',
+ label:'绗�4浠�'
+ }],
};
},
created() {
@@ -484,7 +491,31 @@
this.open = false;
this.reset();
},
-
+ //鎷垮埌閰嶅伓鐨勫鍚�
+ // getPerson(id)
+ // {
+ // // alert(id)
+ // // alert(typeof(id))
+ // // this.listRoot.forEach(function(item, index) {
+ // // //item 灏辨槸褰撴棩鎸夊惊鐜埌鐨勫璞�
+ // // //index鏄惊鐜殑绱㈠紩锛屼粠0寮�濮�
+ // // //alert(typeof(item.userId))
+ // // if(item.userId==id){
+ // // // alert(89)
+ // // alert(item.nickName)
+ // // return item.nickName
+ // // }
+ //
+ // // })
+ // let username = ""
+ // for(let i = 0; i < this.listRoot.length;i++)
+ // {
+ // if(this.listRoot[i].userId==id)
+ // username = this.listRoot[i].nickName
+ // }
+ // return username;
+ // // return "12ddd"
+ // },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -497,28 +528,47 @@
/** 鏌ヨ閫氳褰曞垪琛� */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ // console.log(this.queryParams)
+ //alert(23)
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- getRoot(this.queryParams).then(response => {
+ listUserAll(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
+ // alert(76)
this.listRoot = response.data.data;
- this.total = response.data.total;
+ // alert(this.listRoot)
+ this.total = response.data.length;
+ // alert(this.total)
this.loading = false;
}
);
},
/** 鏌ヨ绫诲埆淇℃伅 */
- // 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)
@@ -583,28 +633,12 @@
// },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞閫氳褰曡缁嗕俊鎭�";
- },
+
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
- const id = row.id;
- this.$router.push("/familymodel/Contact/contactsInfo/" + id);
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- const id = row.id;
- let jd = true
-
- this.$router.push({
- path:"/familymodel/Contact/contactsInfo/" + id,
- query:{
- detail:jd
- }
- });
+ const id = row.userId;
+ // alert(id)
+ this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
},
@@ -613,26 +647,26 @@
this.dialogVisible = true;
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
- // submitDataScope: function() {
- //
- // let ul = this.fileList.map(function (elem){
- // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- // }).join(",")
- // let uls = this.fileListOther.map(function (elem){
- // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- // }).join(",")
- // this.formDat.url = ul+","+uls
- // this.$refs["elForm"].validate(valid => {
- // if (valid) {
- //
- // addContact(this.formDat).then(response => {
- // this.$modal.msgSuccess("鏂板鎴愬姛");
- // this.open = false;
- // this.getList();
- // });
- // }
- // });
- // },
+ submitDataScope: function() {
+
+ let ul = this.fileList.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ let uls = this.fileListOther.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ this.formDat.url = ul+","+uls
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
+
+ addContact(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ },
requestUpload(params)
{
var file = params.file;
@@ -667,11 +701,27 @@
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ // handleExport() {
+ // this.download('/self/user/export/genealogy', {
+ // ...this.queryParams
+ // }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ // },
+
handleExport() {
- this.download('zfContact/export', {
- ...this.queryParams
- }, `zfContact_${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