From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/genealogy/index.vue | 355 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 177 insertions(+), 178 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 4fd0266..3a41912 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>
@@ -51,35 +57,41 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
+
<el-form-item label="鐢熸棩" prop="birth">
- <el-input
- v-model="queryParams.birth"
- placeholder="璇疯緭鍏ョ敓鏃�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- >
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ 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="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+
</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 +105,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"
@@ -144,15 +156,14 @@
<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 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" >
@@ -174,9 +185,13 @@
<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="spouseId" sortable width="110" align="center" >
- <template slot-scope="scope"><span>{{getPerson(scope.row.spouseId)}}</span></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">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -201,105 +216,40 @@
/>
- <!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="鎴愬憳濮撳悕" prop="myName">
- <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
+ <el-form-item label="韬唤" prop="identity">
+ <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
-
- <el-form-item label="绉板懠" prop="nickName">
- <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ョО鍛�" clearable :style="{width: '100%'}" ></el-input>
+ <el-form-item label="濮撳悕" prop="nickName">
+ <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="work">
- <el-input v-model="formDat.work" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍑虹敓鏃堕棿" prop="birth">
+ <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ嚭鐢熸椂闂�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎵嬫満" prop="phone">
- <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay">
+ <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="寰俊" prop="wx">
- <el-input v-model="formDat.wx" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
+ <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="QQ" prop="qq">
- <el-input v-model="formDat.qq" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit">
+ <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="twitter" prop="twitter">
- <el-input v-model="formDat.twitter" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
+ <el-form-item label="閰嶅伓" prop="spouseName">
+ <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways">
- <el-input v-model="formDat.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
-
- <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark">
- <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
-
- <h4 class="form-header">鐢靛瓙鍚嶇墖 </h4>
- <el-upload
- action="#"
- list-type="picture-card"
- multiple
- :http-request="requestUpload"
- :file-list="fileList"
- >
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
- <span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
-
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
- </div>
- </el-upload>
- <h4 class="form-header">鍏朵粬闄勪欢 </h4>
- <el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
- multiple
-
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
- >
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-upload>
</el-form>
<h4 class="form-header"> </h4>
@@ -308,7 +258,7 @@
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
- </el-dialog> -->
+ </el-dialog>
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
@@ -362,11 +312,8 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -393,6 +340,7 @@
politicalOutlook:undefined,
deadDay:undefined,
spouseId:undefined,
+ spouseName:undefined,
img:undefined,
fatherId:undefined,
momId:undefined,
@@ -400,6 +348,8 @@
familyId:undefined,
secondFamilyId:undefined,
childList:undefined,
+ identity:undefined,
+ isMyFamily:undefined,
url: undefined,
},
@@ -411,6 +361,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ identity:undefined,
nickName:undefined,
sex:undefined,
birth:undefined,
@@ -441,7 +392,7 @@
message: '璇疯緭鍏ユ�у埆',
trigger: 'blur'
}],
- bitrh: [{
+ birth: [{
// required: true,
message: '璇疯緭鍏ュ嚭鐢熸椂闂�',
trigger: 'blur'
@@ -453,7 +404,19 @@
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value:'1',
+ label:'绗�1浠�'
+ },{
+ value:'2',
+ label:'绗�2浠�'
+ },{
+ value:'3',
+ label:'绗�3浠�'
+ },{
+ value:'4',
+ label:'绗�4浠�'
+ }],
};
},
created() {
@@ -502,19 +465,25 @@
return "statistics-warning-row";
}
},
-
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞璇佷欢/鑽ｈ獕/璧勮川淇℃伅";
+ },
/** 鏌ヨ閫氳褰曞垪琛� */
getList() {
this.loading = true;
// console.log(this.queryParams)
//alert(23)
-
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listUserAll(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
// alert(76)
- this.listRoot = response.data;
+ this.listRoot = response.data.data;
// alert(this.listRoot)
this.total = response.data.length;
// alert(this.total)
@@ -523,16 +492,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)
@@ -601,8 +584,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);
},
@@ -611,26 +594,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;
@@ -665,11 +648,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/genealogy1/'+Ids, {
+
+ }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ }
},
+
/** 瀵煎叆鎿嶄綔*/
// handleEnport(params){
// var file = params.file;
--
Gitblit v1.9.1