From 536220a94cd58851eac815d59115df8ef9b8be96 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 14:16:29 +0800
Subject: [PATCH] 住户,房屋,租赁管理页面完善
---
src/views/userHouse/houseHoldList.vue | 548 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 387 insertions(+), 161 deletions(-)
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index da17cae..4e31179 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -1,178 +1,404 @@
<template>
+ <el-row>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ <el-button type="success" size="small" plain v-if="this.permission.household_import"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="this.permission.household_export"
+ icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+ <template slot-scope="{row}" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="roleName">
+ <el-tag>{{ row.roleName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="deptName">
+ <el-tag>{{ row.deptName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
- <div id="">
- <el-card>
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-row>
- <el-col :span="4">
- <el-form-item label="区域">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+ :default-checked-keys="roleTreeObj" :props="props">
+ </el-tree>
- <el-col :span="4">
- <el-form-item label="姓名">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="身份证">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="手机">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="懂">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col span="5">
- <el-form-item label="党员">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
-
- <el-col span="5">
- <el-form-item label="标签">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
-
- <el-col span="2">
- <el-button type="primary">导出数据<i class="el-icon-download el-icon--right"></i></el-button>
- </el-col>
- </el-row>
-
- </el-form>
-
- </el-card>
-
- <el-card>
- <div id="">
- <el-table max-height="590" :data="tableData.data" border style="width: 100%"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55">
- </el-table-column>
- <el-table-column fixed prop="id" label="ID" width="150">
- </el-table-column>
- <el-table-column prop="name" label="姓名" width="120">
- </el-table-column>
- <el-table-column prop="idCard" label="身份证号" width="220">
- </el-table-column>
- <el-table-column prop="phoneNumber" label="电话" width="120">
- </el-table-column>
- <el-table-column prop="gender" label="性别" width="120">
- </el-table-column>
- <el-table-column prop="relationship" label="关系" width="120">
- </el-table-column>
- <el-table-column prop="zip" label="小区" width="120">
- </el-table-column>
- <el-table-column prop="currentAddress" label="地址" width="120">
- </el-table-column>
- <el-table-column fixed="right" label="操作" width="300">
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="primary" size="small">同屋住户</el-button>
- <el-button type="primary" size="small">编辑</el-button>
- <el-button type="primary" size="small">标签</el-button>
- <el-button type="danger" size="small">删除</el-button>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
</template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
-
- <div id="" style="margin-bottom: 50px;">
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :current-page="tableFrom.current" :page-sizes="[10, 20, 30, 40]" :page-size="tableFrom.size"
- layout="total, sizes, prev, pager, next, jumper" :total="tableData.total">
- </el-pagination>
- </div>
-
- </div>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
</template>
<script>
- import {
- getList,
- getPageList,
- remove,
- add,
- update,
- getDetatil,
- saveOrUpdateHouseLabel
- } from "@/api/userHouse/list/houseHold.js";
- export default {
- data() {
- return {
- tableFrom: {
- current: 1,
- size: 10
+import {
+ getList,
+ getPageList,
+ remove,
+ add,
+ update,
+ getDetatil,
+ saveOrUpdateHouseLabel
+} from "@/api/userHouse/list/houseHold.js";
+import {
+ exportBlob
+} from "@/api/common";
+import {
+ mapGetters
+} from "vuex";
+import {
+ getToken
+} from '@/util/auth';
+import {
+ downloadXls
+} from "@/util/util";
+import {
+ dateNow
+} from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import func from "@/util/func";
+
+export default {
+ data() {
+ return {
+ form: {},
+ search: {},
+ excelBox: false,
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ option: {
+ height: 'auto',
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ addBtn:true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [{
+ label: "姓名",
+ prop: "name",
+ search: true,
+ searchSpan: 4,
},
- tableData: {
- data: [],
- total: '',
+ {
+ label: "电话",
+ prop: "phoneNumber",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "身份证号",
+ prop: "idCard",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "性别",
+ prop: "gender",
+ type: "select",
+ dicData: [
+ {
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 0
+ },
+ {
+ label: "未知",
+ value: 1
+ }
+ ],
+ },
+ {
+ label: "关系",
+ prop: "relationship",
+ type:"select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "小区",
+ prop: "aoiName",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "地址",
+ prop: "address",
+ display: false
+ },
+ ]
+ },
+ data: [],
+
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中,请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-system/user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
}
+ ]
}
- },
- created() {
- this.getUserHouseList()
- },
-
- methods: {
- handleSelectionChange(val) {
- this.multipleSelection = val;
- },
- handleSizeChange(val) {
- this.tableFrom.size = val
- this.getUserHouseList()
- console.log(`每页 ${val} 条`);
- },
- handleCurrentChange(val) {
- this.tableFrom.current = val
- this.getUserHouseList()
- console.log(`当前页: ${val}`);
- },
-
- getUserHouseList() {
- // console.log("*************************");
- getList(this.tableFrom.current, this.tableFrom.size, this.tableFrom).then((res) => {
- const data = res.data.data;
- this.tableData.total = data.total;
- this.tableData.data = data.records;
+ };
+ },
+ watch: {
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.household_add, true),
+ viewBtn: this.vaildData(this.permission.household_view, true),
+ delBtn: this.vaildData(this.permission.household_delete, true),
+ editBtn: this.vaildData(this.permission.household_edit, true)
+ };
+ }
+ },
+ mounted() {
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
});
- },
-
- handleClick(row) {
- console.log(row);
- }
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
},
+ rowUpdate(row, index, done, loading) {
+ update(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = '';
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ // this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ const account = func.toStr(this.search.account);
+ const realName = func.toStr(this.search.realName);
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start();
+ exportBlob(
+ `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
+ ).then(res => {
+ downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+ NProgress.done();
+ })
+ });
+ },
+ handleTemplate() {
+ exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ downloadXls(res.data, "用户数据模板.xlsx");
+ })
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetatil(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
}
+};
</script>
<style>
+.box {
+ height: 800px;
+}
+
+.el-scrollbar {
+ height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
--
Gitblit v1.9.3