Merge remote-tracking branch 'origin/master'

linwe

2023-11-21 02d6f2dd30aaa4b9c72542c5c238c7b91a18d8d3

Merge remote-tracking branch 'origin/master'

 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) {

 src/views/userHouse/houseHoldList.vue

@@ -84,6 +84,7 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import func from "@/util/func";
import Qs from "qs";

export default {
  data() {
@@ -336,25 +337,27 @@
      done();
    },
    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-household/household/export-household?${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) {

 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">
@@ -85,7 +85,7 @@
  import NProgress from 'nprogress';
  import 'nprogress/nprogress.css';
  import func from "@/util/func";

import Qs from "qs";
  export default {
    data() {
      return {
@@ -314,25 +314,27 @@
        done();
      },
      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-house/house/export-house?${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) {