From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/genealogy/index.vue | 323 ++++++++++++-----------------------------------------
1 files changed, 73 insertions(+), 250 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 16695a5..4680d8f 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -1,22 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滃紶姘忎竴瑙堣〃鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- v-model="queryParams.id"-->
- </el-form-item>
<el-form-item label="韬唤" prop="identity" >
<el-select
@@ -48,26 +32,28 @@
</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-input
+ <el-date-picker
v-model="queryParams.birth"
- placeholder="璇疯緭鍏ョ敓鏃�"
- clearable
- style="width: 240px"
+ 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"
@keyup.enter.native="handleQuery"
- >
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ ></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>
@@ -77,48 +63,7 @@
</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-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['system:role:add']"-->
-<!-- >鏂板</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"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button>
- </el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
@@ -127,41 +72,33 @@
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['family:note:export']"-->
-<!-- >瀵煎叆妯℃澘涓嬭浇</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.2">-->
-
-<!-- <el-upload-->
-<!-- action=""-->
-<!-- class="upload-demo"-->
-<!-- :show-file-list="false"-->
-<!-- :http-request="handleEnport"-->
-<!-- >-->
-<!-- <el-button size="mini" type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus" >瀵煎叆</el-button>-->
-<!-- </el-upload>-->
+<!-- >瀵煎嚭</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
- <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 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>绗瑊{scope.row.identity}}浠�</span>
+ <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="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===1">鐢�</span>
- <span v-if="scope.row.sex===0">濂�</span>
+ <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>
@@ -184,22 +121,23 @@
<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 fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
-<el-button
+ <el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)">
-鏌ョ湅璇︽儏</el-button>
+ 鏌ョ湅璇︽儏
+ </el-button>
</template>
</el-table-column>
</el-table>
<pagination
- v-show="total"
+ v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -207,49 +145,8 @@
@pagination="getList"
/>
-
<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="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>
- <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="birth">
- <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <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="phoneNumber">
- <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit">
- <el-input v-model="formDat.unit" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <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>
- <h4 class="form-header"> </h4>
-
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
- <el-button @click="cancelData">鍙� 娑�</el-button>
- </div>
</el-dialog>
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
@@ -268,6 +165,8 @@
//瀵煎叆鎺ュ彛鍑芥暟
import {enload, uploadPic} from "@/api/contacts/index";
import {getRoot,listUserAll} from "@/api/root/index";
+
+
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -286,7 +185,8 @@
multiple: true,
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
- // 鎬绘潯鏁�
+ pageSize: 10, // 姣忛〉鏄剧ず鏁版嵁鏉℃暟
+ pageNum: 1, // 褰撳墠椤电爜 // 鎬绘潯鏁�
total: 0,
// 瀹惰氨琛ㄦ牸鏁版嵁
listRoot: [],
@@ -303,16 +203,13 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fot:[".jpg",".jif",'.M4A'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//寮犳皬涓�瑙堣〃
userid:undefined,
@@ -344,6 +241,7 @@
secondFamilyId:undefined,
childList:undefined,
identity:undefined,
+ isMyFamily:undefined,
url: undefined,
},
@@ -359,6 +257,7 @@
nickName:undefined,
sex:undefined,
birth:undefined,
+ clanId: undefined
},
// searchVal:"",
@@ -398,6 +297,14 @@
}],
},
+ typeOption: [{
+ value: '0',
+ label: '鐢�',
+ },
+ {
+ value: '1',
+ label: '濂�',
+ }],
typeOptions: [{
value:'1',
label:'绗�1浠�'
@@ -415,10 +322,6 @@
},
created() {
this.getList();
- // this.getCateInfor()
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
},
methods: {
// 鍙栨秷鎸夐挳
@@ -459,41 +362,30 @@
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]
+ this.queryParams.clanId = this.$store.state.user.clanId
+ this.listRoot = []
// 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.data;
- // alert(this.listRoot)
- this.total = response.data.length;
- // alert(this.total)
+ this.total = response.data.total;
+ // this.pageNum=1;
+ // this.pageSize=10;
+ // this.pageNum = response.data.pageNum;
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]})
- })
- })
+ handlePageChange(currentPage) {
+ this.pageNum = currentPage; // 鏍规嵁 currentPage 璁＄畻鍑� pageNum 鍊�
+ this.getList();
},
//韬唤閫夋嫨
getSrc(identity) {
@@ -509,10 +401,11 @@
return '鍏跺畠'
}
},
-
- handleRemove(file) {
- alert(323)
+ getRowId(row)
+ {
+ return row.id
},
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -521,7 +414,6 @@
// 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
cancelDataScope() {
this.openDataScope = false;
- this.reset();
},
// 琛ㄥ崟閲嶇疆
reset() {
@@ -544,7 +436,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -581,65 +473,12 @@
this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
},
-
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
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();
- });
- }
- });
- },
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
-
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
- })
-
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delContact(Ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
// handleExport() {
// this.download('/self/user/export/genealogy', {
@@ -662,27 +501,11 @@
}
},
- /** 瀵煎叆鎿嶄綔*/
- // handleEnport(params){
- // var file = params.file;
- // var formData = new FormData();
- // formData.append('excelImport', file);
- // let _this = this
- // enload(formData).then(response => {
- // _this.getList();
- // Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- //
- // }).catch(err)
- // {
- // Message({ message: "瀵煎叆澶辫触", type: 'error' })
- // }
- //
- // }
}
};
</script>
-<style >
+<style scoped>
.app-container{
background-color: #FEF7FC;
}
--
Gitblit v1.9.1