From 2697e109da871cb81936965c16c47c97635ecfb6 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 16 十一月 2024 20:36:11 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/genealogy/index.vue | 520 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 516 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 3b92278..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -1,15 +1,527 @@
<template>
- <div>
- <h1>浣犲ソ</h1>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+
+ <el-form-item label="韬唤" prop="identity" >
+ <el-select
+ v-model="queryParams.identity"
+ placeholder="璇烽�夋嫨韬唤"
+ clearable
+ style="width: 240px"
+ @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>
+
+ <el-form-item label="濮撳悕" prop="nickName">
+ <el-input
+ v-model="queryParams.nickName"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鎬у埆" prop="sex">
+ <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 deadDay">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 240px;
+ 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="缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
+ ></el-date-picker>
+
+ </el-form-item>
+
+ <el-form-item>
+ <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>
+ <el-row :gutter="10" class="mb8">
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- @click="handleExport"-->
+<!-- v-hasPermi="['family:note:export']"-->
+<!-- >瀵煎嚭</el-button>-->
+<!-- </el-col>-->
+
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </div>
+
+ <el-table v-loading="loading" border :data="listRoot" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table-column type="selection" width="55" align="center" />
+ <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 v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center">
+ <template slot-scope="scope" >
+
+ <el-button @click="handleCheck(scope.row)">{{scope.row.nickName}}</el-button>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
+ <template slot-scope="scope">
+ <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>
+ <el-table-column label="鍑虹敓鏃堕棿" prop="birth" sortable width="130" align="center" >
+ <template slot-scope="scope">{{scope.row.birth? scope.row.birth: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay" sortable width="130" align="center" >
+ <template slot-scope="scope">{{scope.row.deadDay? scope.row.deadDay: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鎵嬫満鍙风爜" prop="phoneNumber" sortable width="130" align="center" >
+ <template slot-scope="scope">{{scope.row.phoneNumber? scope.row.phoneNumber: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <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>-->
+ <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 fixed="right" 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-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ 鏌ョ湅璇︽儏
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ style="background: #FEF7FC;"
+ @pagination="getList"
+ />
+
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+
+ </el-dialog>
+
+ <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+ </el-dialog>
+
</div>
</template>
<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+
+//瀵煎叆鎺ュ彛鍑芥暟
+import {enload, uploadPic} from "@/api/contacts/index";
+import {getRoot,listUserAll} from "@/api/root/index";
+
+
export default {
- name: "index"
-}
+ name: "index",
+ dicts: ['sys_normal_disable'],
+ data() {
+ return {
+ // 閬僵灞�
+ disabled: false,
+
+ loading: true,
+ formData:[],
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ pageSize: 10, // 姣忛〉鏄剧ず鏁版嵁鏉℃暟
+ pageNum: 1, // 褰撳墠椤电爜 // 鎬绘潯鏁�
+ total: 0,
+ // 瀹惰氨琛ㄦ牸鏁版嵁
+ listRoot: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+ openDataScope: false,
+ menuExpand: false,
+ menuNodeAll: false,
+ deptExpand: true,
+ deptNodeAll: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:[".jpg",".jif"],
+ fileList:[],
+ fileListOther:[],
+ dsb:true,
+ btn:false,
+ fit:['fill'],
+ uploading: false,
+ formDat: {
+ //寮犳皬涓�瑙堣〃
+ userid:undefined,
+ nickName:undefined,
+ oldName:undefined,
+ sex:undefined,
+ nationality:undefined,
+ nation:undefined,
+ maritalStatus:undefined,
+ phoneNumber:undefined,
+ idNum:undefined,
+ locationAddress:undefined,
+ alwaysAddress:undefined,
+ locationPolice:undefined,
+ alwaysPolice:undefined,
+ outStatus:undefined,
+ idNo:undefined,
+ unit:undefined,
+ position:undefined,
+ politicalOutlook:undefined,
+ deadDay:undefined,
+ spouseId:undefined,
+ spouseName:undefined,
+ img:undefined,
+ fatherId:undefined,
+ momId:undefined,
+ birth:undefined,
+ familyId:undefined,
+ secondFamilyId:undefined,
+ childList:undefined,
+ identity:undefined,
+ isMyFamily:undefined,
+ url: undefined,
+
+ },
+ // 鑿滃崟鍒楄〃
+ menuOptions: [],
+ // 閮ㄩ棬鍒楄〃
+ deptOptions: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ identity:undefined,
+ nickName:undefined,
+ sex:undefined,
+ birth:undefined,
+ clanId: undefined
+ },
+ // searchVal:"",
+
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ // id: [{
+ // required: true,
+ // message: '璇疯緭鍏d',
+ // trigger: 'blur'
+ // }],
+
+ nickName: [{
+ required: true,
+ message: '璇疯緭鍏ュ鍚�',
+ trigger: 'blur'
+ }],
+ sex: [{
+ required: true,
+ message: '璇疯緭鍏ユ�у埆',
+ trigger: 'blur'
+ }],
+ birth: [{
+ // required: true,
+ message: '璇疯緭鍏ュ嚭鐢熸椂闂�',
+ trigger: 'blur'
+ }],
+ deadDay: [{
+ // required: true,
+ message: '璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡',
+ trigger: 'blur'
+ }],
+
+ },
+ typeOption: [{
+ value: '0',
+ label: '鐢�',
+ },
+ {
+ value: '1',
+ label: '濂�',
+ }],
+ typeOptions: [{
+ value:'1',
+ label:'绗�1浠�'
+ },{
+ value:'2',
+ label:'绗�2浠�'
+ },{
+ value:'3',
+ label:'绗�3浠�'
+ },{
+ value:'4',
+ label:'绗�4浠�'
+ }],
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ // 鍙栨秷鎸夐挳
+ cancelData() {
+ 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) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ /** 鏌ヨ瀹惰氨鍒楄〃 */
+ 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]
+ this.queryParams.clanId = this.$store.state.user.clanId
+ this.listRoot = []
+ // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ listUserAll(this.queryParams).then(response => {
+ // console.log(response.data)
+ this.listRoot = response.data.data;
+ this.total = response.data.total;
+ // this.pageNum=1;
+ // this.pageSize=10;
+ // this.pageNum = response.data.pageNum;
+ this.loading = false;
+ }
+ );
+ },
+ handlePageChange(currentPage) {
+ this.pageNum = currentPage; // 鏍规嵁 currentPage 璁＄畻鍑� pageNum 鍊�
+ this.getList();
+ },
+ //韬唤閫夋嫨
+ 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 '鍏跺畠'
+ }
+ },
+ getRowId(row)
+ {
+ return row.id
+ },
+
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+ cancelDataScope() {
+ this.openDataScope = false;
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("elForm");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ console.log(this.ids)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
+ // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+ // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+ // let newlist = this.formDat.filter(
+ // (item) => item.content.indexOf(this.searchVal) > -1
+ // );
+ // this.contactList = newlist;
+ // },
+
+
+
+ /** 鏌ョ湅璇︾粏淇℃伅 */
+ handleCheck(row){
+ const id = row.userId;
+ // alert(id)
+ this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
+ },
+
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ // handleExport() {
+ // this.download('/self/user/export/genealogy', {
+ // ...this.queryParams
+ // }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ // },
+
+ handleExport() {
+ 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`)
+ }
+ },
+
+ }
+};
</script>
<style scoped>
+.app-container{
+ background-color: #FEF7FC;
+}
+
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+
</style>
--
Gitblit v1.9.1