|
@@ -1,6 +1,12 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryForm"
|
|
|
+ :inline="true"
|
|
|
+ v-show="showSearch"
|
|
|
+ label-width="68px"
|
|
|
+ >
|
|
|
<el-form-item label="家族ID" prop="code">
|
|
|
<el-input
|
|
|
v-model="queryParams.code"
|
|
@@ -38,8 +44,16 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ type="cyan"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
@@ -51,7 +65,8 @@
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['system:family:add']"
|
|
|
- >新增</el-button>
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -61,7 +76,8 @@
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['system:family:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -71,25 +87,57 @@
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['system:family:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="familyList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="主键" align="center" prop="id" v-if="false"/>
|
|
|
- <el-table-column label="家族ID" align="center" prop="code" width="120px"/>
|
|
|
- <el-table-column label="姓氏" align="center" prop="name" width="80px"/>
|
|
|
- <el-table-column label="家族全称" align="center" prop="fullName" width="150px"/>
|
|
|
- <el-table-column label="创建者" align="center" prop="createName" width="100px">
|
|
|
+ <el-table-column label="主键" align="center" prop="id" v-if="false" />
|
|
|
+ <el-table-column
|
|
|
+ label="家族ID"
|
|
|
+ align="center"
|
|
|
+ prop="code"
|
|
|
+ width="120px"
|
|
|
+ />
|
|
|
+ <el-table-column label="姓氏" align="center" prop="name" width="80px" />
|
|
|
+ <el-table-column
|
|
|
+ label="家族全称"
|
|
|
+ align="center"
|
|
|
+ prop="fullName"
|
|
|
+ width="150px"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="创建者"
|
|
|
+ align="center"
|
|
|
+ prop="createName"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.createName">{{scope.row.createName}}</span>
|
|
|
+ <span v-if="scope.row.createName">{{ scope.row.createName }}</span>
|
|
|
<span v-if="scope.row.createName == null">管理员</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="家族地址" align="center" prop="address" width="350px"/>
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column
|
|
|
+ label="家族地址"
|
|
|
+ align="center"
|
|
|
+ prop="address"
|
|
|
+ width="350px"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
@@ -97,20 +145,30 @@
|
|
|
icon="el-icon-edit"
|
|
|
@click="familyMember(scope.row)"
|
|
|
v-hasPermi="['system:family:edit']"
|
|
|
- >成员</el-button>
|
|
|
+ >成员</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-menu"
|
|
|
+ @click="familyAlbum(scope.row)"
|
|
|
+ v-hasPermi="['system:album:list']"
|
|
|
+ >相册</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['system:family:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
@@ -118,9 +176,14 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改家族对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body :close-on-click-modal=false>
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ :visible.sync="open"
|
|
|
+ width="750px"
|
|
|
+ append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ >
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
-
|
|
|
<el-row :gutter="0" type="flex" justify="start">
|
|
|
<el-col :span="16">
|
|
|
<el-form-item label="家族名称" prop="fullName">
|
|
@@ -130,8 +193,15 @@
|
|
|
<el-input v-model="form.name" placeholder="请输入姓氏" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="家族地址" prop="address">
|
|
|
- <area-cascader v-if="pshow" :level="1" type='all' :data="pcaa" v-model="addressCode"
|
|
|
- placeholder="请选择地址" @change="getChangeVal"></area-cascader>
|
|
|
+ <area-cascader
|
|
|
+ v-if="pshow"
|
|
|
+ :level="1"
|
|
|
+ type="all"
|
|
|
+ :data="pcaa"
|
|
|
+ v-model="addressCode"
|
|
|
+ placeholder="请选择地址"
|
|
|
+ @change="getChangeVal"
|
|
|
+ ></area-cascader>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
@@ -139,7 +209,7 @@
|
|
|
<el-form-item label-width="0px" prop="avatar">
|
|
|
<div class="text-center">
|
|
|
<familyAvatar :family="form" :key="reFresh" />
|
|
|
- ID: {{form.code}}
|
|
|
+ ID: {{ form.code }}
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -147,7 +217,12 @@
|
|
|
|
|
|
<el-form-item label="家族描述" prop="contents">
|
|
|
<!-- <editor v-model="form.contents" :min-height="292" /> -->
|
|
|
- <el-input :rows="10" v-model="form.contents" type="textarea" placeholder="请输入描述" />
|
|
|
+ <el-input
|
|
|
+ :rows="10"
|
|
|
+ v-model="form.contents"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入描述"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -159,9 +234,16 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listFamily, getFamily, delFamily, addFamily, updateFamily, exportFamily } from "@/api/system/family";
|
|
|
-import { pca, pcaa } from 'area-data';
|
|
|
-import Editor from '@/components/Editor';
|
|
|
+import {
|
|
|
+ listFamily,
|
|
|
+ getFamily,
|
|
|
+ delFamily,
|
|
|
+ addFamily,
|
|
|
+ updateFamily,
|
|
|
+ exportFamily
|
|
|
+} from "@/api/system/family";
|
|
|
+import { pca, pcaa } from "area-data";
|
|
|
+import Editor from "@/components/Editor";
|
|
|
import familyAvatar from "./detail/familyAvatar";
|
|
|
|
|
|
export default {
|
|
@@ -200,7 +282,7 @@ export default {
|
|
|
hometown: null,
|
|
|
address: null,
|
|
|
contents: null,
|
|
|
- avatar: null,
|
|
|
+ avatar: null
|
|
|
},
|
|
|
reFresh: 1,
|
|
|
// 表单参数
|
|
@@ -208,14 +290,10 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
fullName: [
|
|
|
- { required: true, message: "家族名称不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
- name: [
|
|
|
- { required: true, message: "姓氏不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
- contents: [
|
|
|
- { required: true, message: "描述不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "家族名称不能为空", trigger: "blur" }
|
|
|
],
|
|
|
+ name: [{ required: true, message: "姓氏不能为空", trigger: "blur" }],
|
|
|
+ contents: [{ required: true, message: "描述不能为空", trigger: "blur" }]
|
|
|
},
|
|
|
|
|
|
addressCode: [],
|
|
@@ -223,11 +301,11 @@ export default {
|
|
|
pshow: true
|
|
|
};
|
|
|
},
|
|
|
- watch:{
|
|
|
+ watch: {
|
|
|
// 监听form值,只要有改变,则key值reFresh变更。
|
|
|
// 然后自定义上传图片组件familyAvatar重新渲染
|
|
|
- form(){
|
|
|
- ++this.reFresh
|
|
|
+ form() {
|
|
|
+ ++this.reFresh;
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
@@ -236,22 +314,24 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
/** 清空地址选择器 */
|
|
|
- addressShow(){
|
|
|
+ addressShow() {
|
|
|
this.pshow = false;
|
|
|
this.addressCode = [];
|
|
|
- var t = setTimeout(() => {this.pshow = true},0);
|
|
|
+ var t = setTimeout(() => {
|
|
|
+ this.pshow = true;
|
|
|
+ }, 0);
|
|
|
},
|
|
|
/** 选择家族地址赋值 */
|
|
|
- getChangeVal(data){
|
|
|
- var val="";
|
|
|
+ getChangeVal(data) {
|
|
|
+ var val = "";
|
|
|
var kk = [];
|
|
|
- for(var key in data) {
|
|
|
- for(var k in data[key]) {
|
|
|
- val += data[key][k]
|
|
|
- kk.push(k)
|
|
|
+ for (var key in data) {
|
|
|
+ for (var k in data[key]) {
|
|
|
+ val += data[key][k];
|
|
|
+ kk.push(k);
|
|
|
}
|
|
|
}
|
|
|
- console.log(kk.join(",")+" | "+val)
|
|
|
+ console.log(kk.join(",") + " | " + val);
|
|
|
|
|
|
this.form.addressCode = kk.join(",");
|
|
|
this.form.address = val;
|
|
@@ -302,9 +382,9 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.id)
|
|
|
- this.single = selection.length!==1
|
|
|
- this.multiple = !selection.length
|
|
|
+ this.ids = selection.map(item => item.id);
|
|
|
+ this.single = selection.length !== 1;
|
|
|
+ this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
@@ -317,13 +397,17 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const id = row.id || this.ids
|
|
|
+ const id = row.id || this.ids;
|
|
|
getFamily(id).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.title = "修改家族";
|
|
|
var code = this.form.addressCode.split(",");
|
|
|
- this.addressCode = [pcaa[86][code[0]], pcaa[code[0]][code[1]], pcaa[code[1]][code[2]]];
|
|
|
+ this.addressCode = [
|
|
|
+ pcaa[86][code[0]],
|
|
|
+ pcaa[code[0]][code[1]],
|
|
|
+ pcaa[code[1]][code[2]]
|
|
|
+ ];
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
@@ -354,36 +438,51 @@ export default {
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids;
|
|
|
this.$confirm('是否确认删除家族编号为"' + ids + '"的数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ .then(function() {
|
|
|
return delFamily(ids);
|
|
|
- }).then(() => {
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
this.getList();
|
|
|
this.msgSuccess("删除成功");
|
|
|
- }).catch(function() {});
|
|
|
+ })
|
|
|
+ .catch(function() {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|
|
|
- this.$confirm('是否确认导出所有家族数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
+ this.$confirm("是否确认导出所有家族数据项?", "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ .then(function() {
|
|
|
return exportFamily(queryParams);
|
|
|
- }).then(response => {
|
|
|
+ })
|
|
|
+ .then(response => {
|
|
|
this.download(response.msg);
|
|
|
- }).catch(function() {});
|
|
|
+ })
|
|
|
+ .catch(function() {});
|
|
|
},
|
|
|
familyMember(row) {
|
|
|
- this.$router.push({
|
|
|
- path:'/family/member',
|
|
|
+ this.$router.push({
|
|
|
+ path: "/family/member",
|
|
|
query: {
|
|
|
- fid: row.id
|
|
|
+ fid: row.id
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
+ },
|
|
|
+ familyAlbum(_row) {
|
|
|
+ this.$router.push({
|
|
|
+ path: "/family/album",
|
|
|
+ query: {
|
|
|
+ fid: _row.id,
|
|
|
+ fname: _row.fullName
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
};
|
|
@@ -408,10 +507,10 @@ export default {
|
|
|
.area-select .area-selected-trigger {
|
|
|
padding: 0px 13px;
|
|
|
}
|
|
|
-.area-select.large{
|
|
|
+.area-select.large {
|
|
|
width: 100%;
|
|
|
}
|
|
|
/* .el-form-item {
|
|
|
margin-bottom: 8px;
|
|
|
} */
|
|
|
-</style>
|
|
|
+</style>
|