shuishen
2024-01-05 aca8d06f5a0b8eea2e4f30c7fe8366b2dc42bffc
字段宽度调整(小区)
14 files modified
490 ■■■■ changed files
src/views/article/components/deitDiscussion.vue 6 ●●●●● patch | view | raw | blame | history
src/views/article/components/discussionManageChild.vue 4 ●●● patch | view | raw | blame | history
src/views/article/components/publicSignUpChild.vue 124 ●●●● patch | view | raw | blame | history
src/views/community/index.vue 23 ●●●●● patch | view | raw | blame | history
src/views/district/index.vue 19 ●●●●● patch | view | raw | blame | history
src/views/gzll/components/ownersMemberManager.vue 3 ●●●● patch | view | raw | blame | history
src/views/gzll/owners.vue 4 ●●● patch | view | raw | blame | history
src/views/owners_committee/index.vue 4 ●●● patch | view | raw | blame | history
src/views/property/propertyCapitalApply.vue 9 ●●●●● patch | view | raw | blame | history
src/views/property/propertyCompanyDistrict.vue 9 ●●●●● patch | view | raw | blame | history
src/views/userHouse/components/householdManager.vue 5 ●●●●● patch | view | raw | blame | history
src/views/userHouse/hireInfoList.vue 265 ●●●● patch | view | raw | blame | history
src/views/userHouse/houseHoldList.vue 10 ●●●●● patch | view | raw | blame | history
src/views/userHouse/houseList.vue 5 ●●●●● patch | view | raw | blame | history
src/views/article/components/deitDiscussion.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-01-04 15:18:13
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-01-04 17:13:22
 * @LastEditTime: 2024-01-05 17:23:39
 * @FilePath: \jczz_web\src\views\article\components\deitDiscussion.vue
 * @Description: 
 * 
@@ -201,7 +201,9 @@
                    label: '手机',
                    prop: 'phone'
                }, {
                    label: '小区',
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
                    prop: 'aoiName'
                }, {
                    label: '地址',
src/views/article/components/discussionManageChild.vue
@@ -116,7 +116,9 @@
                    label: '手机',
                    prop: 'phone'
                }, {
                    label: '小区',
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
                    prop: 'aoiName'
                }, {
                    label: '地址',
src/views/article/components/publicSignUpChild.vue
@@ -2,8 +2,8 @@
  <basicContainer>
    <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
      @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
      v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel" @refresh-change="refreshChange"
      @on-load="onLoad">
            v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel"
            @refresh-change="refreshChange" @on-load="onLoad">
      <template slot="menuLeft">
        <!-- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
        </el-button> -->
@@ -46,14 +46,14 @@
    addPd,
    updatePd,
    removePd,
  } from "@/api/discuss/publicDiscuss";
} from "@/api/discuss/publicDiscuss"
  import {
    getPageUser,
  } from "@/api/discuss/userPublicEnroll";
  import option from "@/option/discuss/publicDiscuss";
} from "@/api/discuss/userPublicEnroll"
import option from "@/option/discuss/publicDiscuss"
  import {
    mapGetters
  } from "vuex";
} from "vuex"
  import {
    getDictionary
  } from '@/api/system/dict'
@@ -74,7 +74,9 @@
            label: '手机',
            prop: 'phone'
          }, {
            label: '小区',
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
            prop: 'aoiName'
          }, {
            label: '地址',
@@ -239,11 +241,11 @@
    computed: {
      ...mapGetters(["permission"]),
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      }
    },
    methods: {
@@ -253,12 +255,12 @@
      },
      getUser(page, params = {}) {
        getPageUser(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.pageUser.total = data.total;
          this.dataUser = data.records;
          this.loading = false;
          this.selectionClear();
        });
                const data = res.data.data
                this.pageUser.total = data.total
                this.dataUser = data.records
                this.loading = false
                this.selectionClear()
            })
      },
      userHandleClose() {
        this.dialogVisiblesUser = false
@@ -270,7 +272,7 @@
      openDilog(row, type) {
        this.dialogVisibles = true
        this.discussForm = row
        let times = new Date(row.endTime).getTime();
            let times = new Date(row.endTime).getTime()
        this.discussForm.endTime = times
        console.table(this.discussForm)
        if (type == 0) {
@@ -281,35 +283,35 @@
      },
      searchHide() {
        this.search = !this.search;
            this.search = !this.search
      },
      searchChange() {
        this.onLoad(this.page);
            this.onLoad(this.page)
      },
      searchReset() {
        this.query = {};
        this.page.currentPage = 1;
        this.onLoad(this.page);
            this.query = {}
            this.page.currentPage = 1
            this.onLoad(this.page)
      },
      handleSubmit(form, done) {
        done()
        if (!this.discussForm.id) {
          addPd(this.discussForm).then(() => {
            this.dialogVisibles = false
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
        } else {
          updatePd(this.discussForm).then(() => {
            this.dialogVisibles = false
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
                    })
          })
        }
      },
@@ -322,21 +324,21 @@
        this.title = '编辑'
        this.box = true
        getDetailPd(row.id).then(res => {
          this.form = res.data.data;
        });
                this.form = res.data.data
            })
      },
      handleView(row) {
        this.title = '查看'
        this.view = true;
        this.box = true;
            this.view = true
            this.box = true
        getDetailPd(row.id).then(res => {
          this.form = res.data.data;
        });
                this.form = res.data.data
            })
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
@@ -344,16 +346,16 @@
            type: "warning"
          })
          .then(() => {
            return removePd(this.ids);
                    return removePd(this.ids)
          })
          .then(() => {
            this.selectionClear();
            this.onLoad(this.page);
                    this.selectionClear()
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -362,50 +364,50 @@
            type: "warning"
          })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      beforeClose(done) {
        done()
        this.form = {};
        this.view = false;
            this.form = {}
            this.view = false
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
            this.selectionList = []
        // this.$refs.table.clearSelection();
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
        this.onLoad(this.page);
            this.page.currentPage = currentPage
            this.onLoad(this.page)
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
        this.onLoad(this.page);
            this.page.pageSize = pageSize
            this.onLoad(this.page)
      },
      onLoad(page, params = {
        eventType: 0
      }) {
        this.loading = true;
            this.loading = true
        getListPd(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();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>
<style lang="scss" scoped>
src/views/community/index.vue
@@ -32,6 +32,7 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -47,14 +48,13 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 220,
                        overHidden: true,
                        label: "社区名称",
                        prop: "name",
                        searchSpan: 5,
                        search: true,
                        span: 12,
                        labelWidth: 120,
                        width: 220,
                        overHidden: true,
                        rules: [
                            {
                                required: true,
@@ -64,14 +64,13 @@
                        ],
                    },
                    {
                        width: 110,
                        overHidden: true,
                        label: "社区编号",
                        prop: "code",
                        searchSpan: 5,
                        search: true,
                        span: 12,
                        labelWidth: 120,
                        width: 220,
                        overHidden: true,
                        rules: [
                            {
                                required: true,
@@ -82,11 +81,11 @@
                    },
                    {
                        width: 110,
                        parent: false,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 96,
                        label: "所属街道",
                        prop: "townName",
                        search: true,
@@ -94,11 +93,11 @@
                    },
                    {
                        width: 110,
                        hide: true,
                        parent: false,
                        label: "所属街道",
                        prop: "streetCode",
                        width: 150,
                        type: "tree",
                        dicUrl: "/api/blade-system/region/getTownTree",
                        props: {
@@ -115,9 +114,9 @@
                    },
                    {
                        width: 110,
                        label: "社区民警",
                        prop: "resPoliceUserId",
                        labelWidth: 120,
                        type: "tree",
                        dicUrl: "/api/blade-system/user/getUserListByParam?roleName=民警",
                        props: {
@@ -133,10 +132,9 @@
                        ],
                    },
                    {
                        width: 110,
                        label: "社区图片",
                        prop: "picUrl",
                        width: 80,
                        labelWidth: 120,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file",
@@ -148,10 +146,10 @@
                    },
                    {
                        overHidden: true,
                        label: "地址",
                        prop: "address",
                        span: 24,
                        labelWidth: 120,
                        rules: [
                            {
                                required: false,
@@ -163,7 +161,6 @@
                    {
                        label: "社区简介",
                        prop: "remark",
                        labelWidth: 120,
                        component: "AvueUeditor",
                        options: {
                            action: "/api/blade-resource/oss/endpoint/put-file",
src/views/district/index.vue
@@ -32,6 +32,7 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -47,13 +48,13 @@
                dialogClickModal: false,
                column: [
                    {
                        label: "小区名称",
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        prop: "name",
                        searchSpan: 4,
                        search: true,
                        span: 12,
                        labelWidth: 120,
                        width: 220,
                        rules: [
                            {
                                required: true,
@@ -65,11 +66,12 @@
                    {
                        width: 110,
                        overHidden: true,
                        parent: false,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 96,
                        label: "所属街道",
                        prop: "townStreetName",
                        search: true,
@@ -77,13 +79,14 @@
                    },
                    {
                        width: 156,
                        overHidden: true,
                        parent: false,
                        label: "所属社区",
                        prop: "communityCode",
                        search: true,
                        searchSpan: 4,
                        searchType: 'input',
                        width: 150,
                        type: "tree",
                        dicUrl: "/api/blade-system/region/tree",
                        props: {
@@ -100,18 +103,19 @@
                    },
                    {
                        width: 110,
                        overHidden: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 96,
                        label: "所属网格",
                        prop: "gridName",
                    },
                    {
                        width: 110,
                        label: "小区图片",
                        prop: "picUrl",
                        width: 80,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file",
@@ -142,6 +146,7 @@
                        label: "地址",
                        prop: "address",
                        span: 24,
                        overHidden: true,
                        rules: [
                            {
                                required: true,
src/views/gzll/components/ownersMemberManager.vue
@@ -135,7 +135,8 @@
                        message: "请输入手机号",
                        trigger: "blur",
                    },],
                }, {
                },
                {
                    label: "小区",
                    prop: "areaId",
                    searchSpan: 5,
src/views/gzll/owners.vue
@@ -106,10 +106,12 @@
                    },
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        label: "小区",
                        prop: "areaName"
                    },
src/views/owners_committee/index.vue
@@ -51,7 +51,9 @@
                        search: true
                    },
                    {
                        label: "小区名称",
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        prop: "areaName",
                        search: true
                    },
src/views/property/propertyCapitalApply.vue
@@ -73,11 +73,12 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 160,
                        label: "小区名称",
                        prop: "districtName",
                        search: true,
                        searchSpan: 4,
@@ -91,7 +92,7 @@
                    {
                        hide: true,
                        parent: false,
                        label: "小区名称",
                        label: "小区",
                        prop: "districtId",
                        search: false,
                        type: 'tree',
@@ -106,7 +107,7 @@
                        width: 260,
                        rules: [{
                            required: true,
                            message: "请选择小区名称",
                            message: "请选择小区",
                            trigger: "blur",
                        },],
                    },
src/views/property/propertyCompanyDistrict.vue
@@ -57,11 +57,12 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 160,
                        label: "小区名称",
                        prop: "districtName",
                        search: true,
                        searchSpan: 4,
@@ -75,7 +76,7 @@
                    {
                        hide: true,
                        parent: false,
                        label: "小区名称",
                        label: "小区",
                        prop: "districtId",
                        search: false,
                        type: 'tree',
@@ -90,7 +91,7 @@
                        width: 260,
                        rules: [{
                            required: true,
                            message: "请选择小区名称",
                            message: "请选择小区",
                            trigger: "blur",
                        },],
                    },
src/views/userHouse/components/householdManager.vue
@@ -305,8 +305,9 @@
                    },
                    {
                        width: 142,
                        label: "小区",
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        prop: "aoiName",
                        display: false
                    },
src/views/userHouse/hireInfoList.vue
@@ -3,19 +3,19 @@
    <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">
                    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.houseRental_delete"
              @click="handleDelete">删 除
                        <el-button type="danger" size="small" plain icon="el-icon-delete"
                            v-if="permission.houseRental_delete" @click="handleDelete">删 除
            </el-button>
          </template>
          <template slot-scope="scope" slot="menu">
            <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
              @click="ManageTenants(scope.row)">管理租户
                        <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
                            v-if="permission.househould_manager" @click="ManageTenants(scope.row)">管理租户
            </el-button>
          <!--  <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">导入
            </el-button>
@@ -42,7 +42,8 @@
            ref="crud" v-model="houseHoldForm" :permission="permissionList" @row-del="houseHoldRowDel"
            @row-update="houseHoldRowUpdate" @row-save="houseHoldRowSave" :page.sync="holdPage"
            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"></avue-crud>
                        @current-change="currentChange" @size-change="sizeChange"
                        @refresh-change="refreshChange"></avue-crud>
          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
@@ -72,7 +73,7 @@
    add as householdAdd,
    update as householdUpdate,
    getDetatil as getHouseholdDetatil
  } from "@/api/userHouse/list/houseHold.js";
} from "@/api/userHouse/list/houseHold.js"
  import {
    getList,
    getPageList,
@@ -80,31 +81,31 @@
    add,
    update,
    getDetatil
  } from "@/api/userHouse/list/houseRental.js";
} from "@/api/userHouse/list/houseRental.js"
  import {
    getList as getHouseList,
    getDetatil as getHouseDetail
  } from "@/api/userHouse/list/house.js";
} from "@/api/userHouse/list/house.js"
  import {
    exportBlob
  } from "@/api/common";
} from "@/api/common"
  import {
    mapGetters
  } from "vuex";
} from "vuex"
  import {
    getToken
  } from '@/util/auth';
} from '@/util/auth'
  import {
    downloadXls
  } from "@/util/util";
} 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";
  import website from '@/config/website';
} from "@/util/date"
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import func from "@/util/func"
import Qs from "qs"
import website from '@/config/website'
  export default {
    data() {
      return {
@@ -193,7 +194,9 @@
              display: false
            },
            {
              label: "小区",
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
              prop: "aoiName",
              // search: true,
              searchSpan: 4,
@@ -236,17 +239,21 @@
                searchShow: true,
                searchMenuSpan: 6,
                submitText: "确定",
                column: [{
                    label: "小区",
                        column: [
                            {
                                width: 220,
                                overHidden: true,
                                label: '小区名称',
                    prop: "districtName",
                    search: true,
                    searchSpan: 4,
                    rules: [{
                      required: true,
                      message: "请选择小区",
                                    message: "请输入小区名称",
                      trigger: "blur",
                    }, ],
                  }, {
                            },
                            {
                    label: "地址",
                    prop: "address",
                    width: 180,
@@ -283,26 +290,26 @@
                  getHouseDetail({
                    houseCode: value
                  }).then(res => {
                    var resData = res.data.data;
                                var resData = res.data.data
                    // 查询对应行数据
                    callback(resData)
                    return
                  });
                            })
                }
                if (page) {
                  this.loading = true;
                            this.loading = true
                  getHouseList(page.currentPage, page.pageSize, Object.assign(data)).then(res => {
                    const resData = res.data.data;
                    var total = resData.total;
                    var data = resData.records;
                    this.loading = false;
                    this.selectionClear();
                                const resData = res.data.data
                                var total = resData.total
                                var data = resData.records
                                this.loading = false
                                this.selectionClear()
                    //分页查询信息
                    callback({
                      total: total,
                      data: data
                    })
                  });
                            })
                }
              },
              props: {
@@ -513,7 +520,7 @@
            }
          ]
        }
      };
        }
    },
    watch: {},
    computed: {
@@ -524,7 +531,7 @@
          viewBtn: this.vaildData(this.permission.houseRental_view, true),
          delBtn: this.vaildData(this.permission.houseRental_delete, true),
          editBtn: this.vaildData(this.permission.houseRental_edit, true)
        };
            }
      }
    },
    mounted() {},
@@ -541,11 +548,11 @@
          housingRentalId: this.rowHouseHold.id,
        }
        getHouseholdList(this.holdPage.currentPage, this.holdPage.pageSize, Object.assign(params)).then(res => {
          const data = res.data.data;
          this.houseHold = data.records;
          this.loading = false;
          this.selectionClear();
        });
                const data = res.data.data
                this.houseHold = data.records
                this.loading = false
                this.selectionClear()
            })
      },
      houseHoldRowSave(row, done, loading) {
@@ -554,77 +561,77 @@
        row.housingRentalId = this.rowHouseHold.id
        row.houseCode = this.rowHouseHold.houseCode
        householdAdd(row).then(() => {
          this.initFlag = false;
          this.onLoadHouseHold();
                this.initFlag = false
                this.onLoadHouseHold()
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowSave(row, done, loading) {
        if (row.fileUrls.length > 0) {
          var urls = []
          var split = row.fileUrls.split(",");
                var split = row.fileUrls.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.fileUrls = urls.join(",")
        }
        add(row).then(() => {
          this.initFlag = false;
          this.onLoad(this.page);
                this.initFlag = false
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowUpdate(row, index, done, loading) {
        if (row.fileUrls.length > 0) {
          var urls = []
          var split = row.fileUrls.split(",");
                var split = row.fileUrls.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.fileUrls = urls.join(",")
        }
        update(row).then(() => {
          this.initFlag = false;
          this.onLoad(this.page);
                this.initFlag = false
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      houseHoldRowUpdate(row, index, done, loading) {
        householdUpdate(row).then(() => {
          this.initFlag = false;
          this.onLoadHouseHold();
                this.initFlag = false
                this.onLoadHouseHold()
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      houseHoldRowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -633,15 +640,15 @@
            type: "warning"
          })
          .then(() => {
            return householdDel(row.id);
                    return householdDel(row.id)
          })
          .then(() => {
            this.onLoadHouseHold();
                    this.onLoadHouseHold()
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -650,38 +657,38 @@
            type: "warning"
          })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      searchReset() {
        this.query = {};
        this.treeDeptId = '';
        this.onLoad(this.page);
            this.query = {}
            this.treeDeptId = ''
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
            this.selectionList = []
        // this.$refs.crud.toggleSelection();
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
@@ -689,101 +696,101 @@
            type: "warning"
          })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      handleImport() {
        this.excelBox = true;
            this.excelBox = true
      },
      uploadAfter(res, done, loading, column) {
        window.console.log(column);
        this.excelBox = false;
        this.refreshChange();
        done();
            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);
            const account = func.toStr(this.search.account)
            const realName = func.toStr(this.search.realName)
        this.$confirm("是否导出出租信息数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          NProgress.start();
                NProgress.start()
          var data = {
            ...this.query
          }
          data = Qs.stringify(data);
                data = Qs.stringify(data)
          exportBlob(
            `/api/blade-houseRental/houseRental/export-houseRental?${this.website.tokenHeader}=${getToken()}&` +
            data
          ).then(res => {
            downloadXls(res.data, `出租信息数据表${dateNow()}.xlsx`);
            NProgress.done();
                    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) {
        if (["edit", "view"].includes(type)) {
          getDetatil(this.form.id).then(res => {
            this.form = res.data.data;
                    this.form = res.data.data
            if (this.form.fileUrls.length > 0) {
              var urls = []
              var names = this.form.fileUrls.split(",");
                        var names = this.form.fileUrls.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              this.form.fileUrls = urls.join(",")
            }
          });
                })
        }
        this.initFlag = true;
        done();
            this.initFlag = true
            done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true;
            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;
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
          this.data.forEach(item => {
            if (item.fileUrls.length > 0) {
              var urls = []
              var names = item.fileUrls.split(",");
                        var names = item.fileUrls.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              item.fileUrls = urls.join(",")
            }
          })
          this.loading = false;
          this.selectionClear();
        });
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>
<style>
src/views/userHouse/houseHoldList.vue
@@ -260,7 +260,7 @@
                    },
                    {
                        width: 96,
                        width: 110,
                        label: "姓名",
                        prop: "name",
                        search: true,
@@ -288,8 +288,8 @@
                    },
                    {
                        display: true,
                        width: 160,
                        display: true,
                        label: "身份证号",
                        prop: "idCard",
                        search: true,
@@ -322,6 +322,7 @@
                    {
                        width: 60,
                        label: "性别",
                        prop: "gender",
                        type: "select",
@@ -411,8 +412,9 @@
                    // },
                    {
                        width: 142,
                        label: "小区",
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        prop: "aoiName",
                        search: true,
                        searchSpan: 4,
src/views/userHouse/houseList.vue
@@ -244,13 +244,14 @@
                    },
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        parent: false,
                        label: "小区名称",
                        prop: "districtName",
                        searchSpan: 4,
                        display: false,
                        search: true,
                        overHidden: true,
                    },
                    {