From 46c8aab0b19acf79640a0eb3de75654e2b8d147a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 17:58:57 +0800
Subject: [PATCH] 出租屋，房屋导出修改
---
src/views/userHouse/hireInfoList.vue | 14
src/views/userHouse/houseList.vue | 642 +++++++++++++++++++++++++++++-----------------------------
src/views/userHouse/houseHoldList.vue | 1
3 files changed, 331 insertions(+), 326 deletions(-)
diff --git a/src/views/userHouse/hireInfoList.vue b/src/views/userHouse/hireInfoList.vue
index 5129d2c..da9183b 100644
--- a/src/views/userHouse/hireInfoList.vue
+++ b/src/views/userHouse/hireInfoList.vue
@@ -83,7 +83,7 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import func from "@/util/func";
-
+import Qs from "qs";
export default {
data() {
return {
@@ -397,23 +397,27 @@
handleExport() {
const account = func.toStr(this.search.account);
const realName = func.toStr(this.search.realName);
- this.$confirm("是否导出用户数据?", "提示", {
+ this.$confirm("是否导出出租信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data);
exportBlob(
- `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
+ `/api/blade-houseRental/houseRental/export-houseRental?${this.website.tokenHeader}=${getToken()}&` + data
).then(res => {
- downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+ 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");
+ downloadXls(res.data, "出租信息数据模板.xlsx");
})
},
beforeOpen(done, type) {
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index b11ae5c..80525d0 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -346,7 +346,6 @@
var data = {
...this.query
}
- console.log(data,88888)
data = Qs.stringify(data);
exportBlob(
`/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index ec55cab..8f4a2a3 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">
@@ -19,16 +19,16 @@
</el-button>
</template>
<template slot-scope="{row}" slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
+ <el-tag>{{ row.tenantName }}</el-tag>
</template>
<template slot-scope="{row}" slot="roleName">
- <el-tag>{{row.roleName}}</el-tag>
+ <el-tag>{{ row.roleName }}</el-tag>
</template>
<template slot-scope="{row}" slot="deptName">
- <el-tag>{{row.deptName}}</el-tag>
+ <el-tag>{{ row.deptName }}</el-tag>
</template>
<template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
+ <el-tag>{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
<el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
@@ -57,326 +57,328 @@
</template>
<script>
- import {
- getList,
- getPageList,
- remove,
- add,
- update,
- getDetatil,
- saveOrUpdateHouseLabel
- } 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";
-
- export default {
- data() {
+import {
+ getList,
+ getPageList,
+ remove,
+ add,
+ update,
+ getDetatil,
+ saveOrUpdateHouseLabel
+} 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 Qs from "qs";
+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,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [{
+ label: "房屋编号",
+ prop: "houseCode",
+ width: 180,
+ hide: true,
+ disabled: true,
+ },
+ {
+ label: "地址",
+ prop: "address",
+ width: 180,
+ display: false
+ },
+ {
+ label: "小区",
+ prop: "districtName",
+ search: true,
+ },
+ {
+ label: "楼层",
+ prop: "floor",
+ },
+ {
+ label: "手机",
+ prop: "phone",
+ },
+ {
+ label: "服务到期",
+ prop: "serviceDue",
+ },
+ {
+ label: "物业费",
+ prop: "propertyPrice",
+ },
+ {
+ label: "面积",
+ prop: "area",
+ },
+ ]
+ },
+ 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 {
- 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,
- column: [{
- label: "房屋编号",
- prop: "houseCode",
- width:180,
- hide:true,
- disabled:true,
- },
- {
- label: "地址",
- prop: "address",
- width:180,
- display: false
- },
- {
- label: "小区",
- prop: "districtName",
- search: true,
- },
- {
- label: "楼层",
- prop: "floor",
- },
- {
- label: "手机",
- prop: "phone",
- },
- {
- label: "服务到期",
- prop: "serviceDue",
- },
- {
- label: "物业费",
- prop: "propertyPrice",
- },
- {
- label: "面积",
- prop: "area",
- },
- ]
- },
- 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,
- }
- ]
- }
+ addBtn: this.vaildData(this.permission.user_add, false),
+ viewBtn: this.vaildData(this.permission.user_view, true),
+ delBtn: this.vaildData(this.permission.user_delete, true),
+ editBtn: this.vaildData(this.permission.user_edit, true)
};
- },
- watch: {
- },
- computed: {
- ...mapGetters(["userInfo", "permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(this.permission.user_view, true),
- delBtn: this.vaildData(this.permission.user_delete, true),
- editBtn: this.vaildData(this.permission.user_edit, true)
- };
- }
- },
- mounted() {
- },
- methods: {
- 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() {
- 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();
- });
- }
}
- };
+ },
+ mounted() {
+ },
+ methods: {
+ 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(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;
- }
+.box {
+ height: 800px;
+}
- .el-scrollbar {
- height: 100%;
- }
+.el-scrollbar {
+ height: 100%;
+}
- .box .el-scrollbar__wrap {
- overflow: scroll;
- }
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
--
Gitblit v1.9.3