From 0213c6b37748e96570125bc7a12bf2e7cc5a500f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 14 Dec 2023 17:58:23 +0800
Subject: [PATCH] 数据管理优化
---
src/views/userHouse/houseList.vue | 869 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 504 insertions(+), 365 deletions(-)
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index a8b706f..b22e1c6 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -2,8 +2,8 @@
<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"
+ <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">
@@ -22,7 +22,11 @@
<el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
@click="handleHouseholdManager(scope.row)">住户管理
</el-button>
+ <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
+ @click="manageLabel(scope.row)">标签
+ </el-button>
</template>
+
<template slot-scope="{row}" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -47,6 +51,29 @@
<el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
+
+ <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
+ <div id="" class="grid-container2">
+ <div class="grid-item" :style="{ backgroundColor: item.color}" v-for="(item,index) in labelData "
+ @click="changLabel(item)">
+ {{item.name}}
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="labelFlag = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+
+ <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
+ <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+ </avue-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editLabelFlge = false">取 消</el-button>
+ <el-button type="primary" @click="onsubmit">确 定</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">
@@ -57,7 +84,7 @@
</avue-form>
</el-dialog>
<el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
- <householdManager ref="householdManager"/>
+ <householdManager ref="householdManager" />
</el-dialog>
</basic-container>
</el-col>
@@ -65,383 +92,495 @@
</template>
<script>
-import {
- getList,
- remove,
- add,
- update,
- getDetatil
-} from "@/api/userHouse/list/house.js";
-import {
- exportBlob
-} from "@/api/common";
-import {
- mapGetters
-} from "vuex";
-import website from '@/config/website';
-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";
-import householdManager from "./components/householdManager";
-import Qs from "qs";
-export default {
- components: {
- householdManager
- },
- data() {
- return {
- householdManagerVisible:false,
- 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,
- dialogType: 'drawer',
- dialogClickModal: false,
- menuWidth:280,
- column: [{
- label: "房屋编号",
- prop: "houseCode",
- width: 180,
- hide: true,
- display: false
- },
- {
- label: "地址",
- prop: "address",
- width: 180,
- display: false
- },
- {
- label: "小区",
- prop: "districtName",
- search: true,
- rules: [
- {
+ import {
+ getList,
+ remove,
+ add,
+ update,
+ getDetatil,
+ getDetatils
+ } from "@/api/userHouse/list/house.js";
+ import {
+ removeHouseholdLabel,
+ saveOrUpdateHouseholdLabel
+ } from "@/api/userHouse/list/userHouseList.js";
+ import {
+ getLabelList,
+ } from '@/api/label/label'
+ import {
+ exportBlob
+ } from "@/api/common";
+ import {
+ mapGetters
+ } from "vuex";
+ import website from '@/config/website';
+ 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";
+ import householdManager from "./components/householdManager";
+ import Qs from "qs";
+ export default {
+ components: {
+ householdManager
+ },
+ data() {
+ return {
+ labelData: [],
+ labelForm: {},
+ userHouseLabelVOList: [],
+ currentLabel: {},
+ labelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '级别',
+ prop: 'color',
+ type: 'radio',
+ button: true,
+ row: true,
+ dicData: [{
+ label: '撤销',
+ value: '#EBEDF0'
+ }, {
+ label: '绿',
+ value: '#30D17C'
+ }, {
+ label: '黄',
+ value: '#FFB42B'
+ }, {
+ label: '红',
+ value: '#EA1F1F'
+ }],
+ rules: [{
required: true,
- message: "请选择小区",
- trigger: "blur",
- },
- ],
- },
- {
- label: "手机",
- prop: "phone",
- rules: [
- {
- required: true,
- message: "请输入绑定手机",
- trigger: "blur",
- },
- ],
- },
- {
- label: "幢",
- prop: "building",
- hide: true
- },
- {
- label: "单元",
- prop: "unit",
- hide: true
- },
- {
- label: "室",
- prop: "room",
- hide: true
- },
- {
- label: "楼层",
- prop: "floor",
- type: "number",
- rules: [
- {
- required: true,
- message: "请输入楼层",
- trigger: "blur",
- },
- ],
- },
- {
- label: "面积",
- prop: "area",
- type: "number",
- },
- {
- label: "物业费",
- prop: "propertyPrice",
- type: "number",
- },
- {
- label: "服务到期",
- prop: "serviceDue",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- ]
- },
- 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"
+ message: "请选择",
+ trigger: "blur"
+ }]
+ }, {
+ row: true,
+ label: '备注',
+ prop: 'remark',
+ type: 'input'
}]
},
- {
- label: '模板下载',
- prop: 'excelTemplate',
- formslot: true,
- span: 24,
+ editLabelFlge: false,
+ labelFlag: false,
+ householdManagerVisible: false,
+ 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,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ menuWidth: 280,
+ column: [{
+ label: "房屋编号",
+ prop: "houseCode",
+ width: 180,
+ hide: true,
+ display: false
+ },
+ {
+ label: "地址",
+ prop: "address",
+ width: 180,
+ display: false
+ },
+ {
+ label: "小区",
+ prop: "districtName",
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "手机",
+ prop: "phone",
+ rules: [{
+ required: true,
+ message: "请输入绑定手机",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "幢",
+ prop: "building",
+ hide: true
+ },
+ {
+ label: "单元",
+ prop: "unit",
+ hide: true
+ },
+ {
+ label: "室",
+ prop: "room",
+ hide: true
+ },
+ {
+ label: "楼层",
+ prop: "floor",
+ type: "number",
+ rules: [{
+ required: true,
+ message: "请输入楼层",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "面积",
+ prop: "area",
+ type: "number",
+ },
+ {
+ label: "物业费",
+ prop: "propertyPrice",
+ type: "number",
+ },
+ {
+ label: "服务到期",
+ prop: "serviceDue",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ ]
+ },
+ 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,
+ }
+ ]
}
- ]
- }
- };
- },
- watch: {
- },
- computed: {
- ...mapGetters(["userInfo", "permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.house_add, true),
- viewBtn: this.vaildData(this.permission.house_view, true),
- delBtn: this.vaildData(this.permission.house_delete, true),
- editBtn: this.vaildData(this.permission.house_edit, true)
};
- }
- },
- mounted() {
- },
- methods: {
- handleHouseholdManager(row){
- var that = this
- this.householdManagerVisible = true
- this.$nextTick(() => {
- that.$refs.householdManager.init(row)
- })
},
- rowSave(row, done, loading) {
- add(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- 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;
+ watch: {},
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.house_add, true),
+ viewBtn: this.vaildData(this.permission.house_view, true),
+ delBtn: this.vaildData(this.permission.house_delete, true),
+ editBtn: this.vaildData(this.permission.house_edit, true)
+ };
}
- 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() {
- this.$confirm("是否导出房屋数据?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- NProgress.start();
- var data = {
- ...this.query
+ mounted() {},
+ methods: {
+
+ onsubmit() {
+ if (this.labelForm.color === '#EBEDF0') {
+ let params = {
+ householdId: this.currentRow.id,
+ labelId: this.currentLabel.id
+ }
+ removeHouseholdLabel(params).then(res => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false;
+ })
+ } else {
+ this.labelForm.houseCode = this.currentRow.houseCode
+ this.labelForm.householdId = this.currentRow.id
+ this.labelForm.labelId = this.currentLabel.id
+ this.labelForm.lableType = 2
+ saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false;
+ })
}
- data = Qs.stringify(data);
- exportBlob(
- `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
- ).then(res => {
- downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`);
- NProgress.done();
+ },
+
+ changLabel(item) {
+ this.editLabelFlge = true
+ this.currentLabel = item;
+ this.labelForm.color = item.color
+ this.labelForm.remark = item.remark
+ },
+ manageLabel(item) {
+ this.currentRow = item
+ this.labelFlag = true
+ let params = {
+ parentId: 1001
+ }
+ // 查询标签
+ getLabelList(Object.assign(params)).then(res => {
+ const data = res.data.data;
+ this.loading = false;
+ // 查询详情
+ getDetatils({
+ houseCode: item.houseCode
+ }).then(res => {
+ if (res.data.data) {
+ this.userHouseLabelVOList = res.data.data.userHouseLabelVOList;
+ this.loading = false;
+ // 将细类放到一起
+ data.forEach(f => {
+ if (this.userHouseLabelVOList.length > 0) {
+ this.userHouseLabelVOList.forEach(h => {
+ if (Number(f.id) == h.labelId) {
+ f['color'] = h.color
+ f['remark'] = h.remark
+ }
+ })
+ }
+ })
+ }
+ this.labelData = data;
+ });
+ });
+ },
+ handleHouseholdManager(row) {
+ var that = this
+ this.householdManagerVisible = true
+ this.$nextTick(() => {
+ that.$refs.householdManager.init(row)
})
- });
- },
- 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({
- id: this.form.id
- }).then(res => {
- this.form = res.data.data;
+ },
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ 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() {
+ this.$confirm("是否导出房屋数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start();
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data);
+ exportBlob(
+ `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
+ ).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({
+ id: 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)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
});
}
- 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)).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;
-}
+ .box {
+ height: 800px;
+ }
-.el-scrollbar {
- height: 100%;
-}
+ .el-scrollbar {
+ height: 100%;
+ }
-.box .el-scrollbar__wrap {
- overflow: scroll;
-}
-</style>
+ .box .el-scrollbar__wrap {
+ overflow: scroll;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3