From f2122883efc2287cd2258bf6a848061e11e4e39e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 10 Aug 2022 14:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B9=9F=E4=B8=8D=E7=9F=A5?=
 =?UTF-8?q?=E9=81=93=E6=9C=89=E7=94=A8=E7=BE=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     |  13 +-
 .../modules/base/community/communityTable.vue |  12 +-
 .../modules/base/community/roomTable.vue      | 947 +++++++++---------
 src/views/modules/cpts/baobiao/index.vue      |   2 +-
 4 files changed, 492 insertions(+), 482 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 9ccf0f897..53dbad392 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -256,7 +256,18 @@ export default {
   methods: {
     reportForm(){
       let paramMap = {
-        neighborHoodId: this.agencyObj.id
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyObj.level,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       };
       this.$refs.baobiao.init({
         elseParams: {
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b1d6f8eca..1c326ec10 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -287,8 +287,18 @@ export default {
   methods: {
     reportForm(){
       let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
         level: this.agencyObj.level,
-        id: this.agencyObj.id
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       };
       this.$refs.baobiao.init({
         elseParams: {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 511bd5619..15c62a15e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1,193 +1,215 @@
 <template>
   <div>
     <div class="div_btn">
-
-      <el-button v-if="agencyObj.level==='building'||source!=='search'"
-                 style="float:left"
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增房屋</el-button>
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button style="float:left"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule">下载房屋模板</el-button>
-        <el-upload ref="upload"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="beforeUpload"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :limit="1"
-                   :on-exceed="handleExceed"
-                   :http-request="uploadFile">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
+      <el-button
+        v-if="agencyObj.level === 'building' || source !== 'search'"
+        style="float: left"
+        class="diy-button--add"
+        size="small"
+        @click="handleAdd"
+        >新增房屋</el-button
+      >
+      <div class="btn_upload" v-if="showImportBtn">
+        <el-button
+          style="float: left"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule"
+          >下载房屋模板</el-button
+        >
+        <el-upload
+          ref="upload"
+          :multiple="false"
+          :show-file-list="false"
+          :before-upload="beforeUpload"
+          action=""
+          accept=".xls,.xlsx"
+          :limit="1"
+          :on-exceed="handleExceed"
+          :http-request="uploadFile"
+        >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--delete"
+            >导入房屋数据</el-button
+          >
         </el-upload>
       </div>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-      <el-button style=";margin-left:10px"
-                 class="diy-button--export"
-                 size="small"
-                 :disabled="yihuyidangDisabled"
-                 @click="handleExportYihuyidang()">导出一户一档</el-button>
-      <el-button size="small"
-                   class="diy-button--add"
-                   @click="reportForm">智能填报</el-button>
+      <el-button
+        style="float: left; margin-left: 10px"
+        class="diy-button--reset"
+        size="small"
+        @click="handleExport"
+        >导出</el-button
+      >
+      <el-button
+        style="float: left; margin-left: 10px"
+        class="diy-button--more"
+        size="small"
+        @click="deleteBatch"
+        >批量删除</el-button
+      >
+      <el-button
+        style="margin-left: 10px"
+        class="diy-button--export"
+        size="small"
+        :disabled="yihuyidangDisabled"
+        @click="handleExportYihuyidang()"
+        >导出一户一档</el-button
+      >
+      <el-button size="small" class="diy-button--add" @click="reportForm"
+        >智能填报</el-button
+      >
     </div>
 
-    <div class="div_table_item ">
-      <el-table ref="ref_table"
-                :data="tableData"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                v-loading="tableLoading"
-                @sort-change="handleSortOrderChange"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
+    <div class="div_table_item">
+      <el-table
+        ref="ref_table"
+        :data="tableData"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        v-loading="tableLoading"
+        @sort-change="handleSortOrderChange"
+        border
+        :height="tableHeight"
+        style="width: 100%"
+        @select-all="selectAll"
+        @selection-change="selectionChange"
+      >
+        <el-table-column type="selection" :selectable="checkSelect" width="55">
         </el-table-column>
-        <el-table-column fixed="left"
-                         width="55"
-                         type="index"
-                         label="序号"
-                         :index="indexMethod">
+        <el-table-column
+          fixed="left"
+          width="55"
+          type="index"
+          label="序号"
+          :index="indexMethod"
+        >
         </el-table-column>
 
-        <el-table-column prop="houseNameShow"
-                         label="房屋名称"
-                         fixed="left"
-                         min-width="160">
+        <el-table-column
+          prop="houseNameShow"
+          label="房屋名称"
+          fixed="left"
+          min-width="160"
+        >
         </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         min-width="150">
+        <el-table-column
+          prop="neighborHoodName"
+          label="所属小区"
+          min-width="150"
+        >
         </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         width="80">
+        <el-table-column prop="buildingName" label="所属楼栋" width="80">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号"
-                         width="70">
+        <el-table-column prop="unitNum" label="单元号" width="70">
         </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         width="70">
+        <el-table-column prop="doorName" label="门牌号" width="70">
         </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         width="50">
+        <el-table-column prop="houseType" label="类型" width="50">
         </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         width="50">
+        <el-table-column prop="purpose" label="用途" width="50">
         </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         width="80">
+        <el-table-column prop="rentFlag" label="房屋状态" width="80">
         </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         width="90">
+        <el-table-column prop="ownerName" label="房主姓名" width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="联系方式"
-                         width="110">
+        <el-table-column prop="ownerPhone" label="联系方式" width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="身份证"
-                         width="170">
+        <el-table-column prop="ownerIdCard" label="身份证" width="170">
         </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注"
-                         width="170">
+        <el-table-column prop="remark" label="备注" width="170">
         </el-table-column>
 
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="排序">
+        <el-table-column
+          prop="sort"
+          sortable="custom"
+          min-width="140"
+          label="排序"
+        >
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
-              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
+              <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
+              <el-input-number
+                v-else
+                @change="handleChangeSort(scope.row)"
+                v-model="scope.row.sort"
+                class="item_width_4"
+                :precision="2"
+                size="small"
+                :min="0"
+                :max="9999"
+                label="描述文字"
+              ></el-input-number>
             </div>
-
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column
+          label="操作"
+          fixed="right"
+          width="140"
+          header-align="center"
+          align="center"
+          class="operate"
+        >
           <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleDetail(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              v-if="scope.row.showBtn"
+              type="text"
+              class="div-table-button--edit"
+              size="small"
+              @click="handleEdit(scope.row)"
+              >修改</el-button
+            >
+
+            <el-button
+              v-if="scope.row.showBtn"
+              type="text"
+              class="div-table-button--delete"
+              size="small"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
-
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      ></room-form>
     </el-dialog>
 
     <baobiao ref="baobiao" />
@@ -195,31 +217,30 @@
 </template>
 
 <script>
-import roomForm from './roomForm'
+import roomForm from "./roomForm";
 import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
 import baobiao from "@/views/modules/cpts/baobiao";
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
-      source: 'tree',//来源
+      source: "tree", //来源
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
       pageNo: 0,
-      sortType: 'asc',//asc：正，desc：倒
+      sortType: "asc", //asc：正，desc：倒
       tableLoading: true,
 
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
-      agencyObj: {},//树所选的小区对象
-      agencyLevel: '',//树对应的level， grid neighborHood building agency
+      agencyObj: {}, //树所选的小区对象
+      agencyLevel: "", //树对应的level， grid neighborHood building agency
 
-
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
+      validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
       selection: [],
       showDeletBtn: false,
 
@@ -227,151 +248,140 @@ export default {
 
       //form相关
       formShow: false,
-      formTitle: '新增房屋',
+      formTitle: "新增房屋",
 
       rentList: [
         {
-          value: '1',
-          label: '出租'
+          value: "1",
+          label: "出租",
         },
         {
-          value: '2',
-          label: '闲置'
+          value: "2",
+          label: "闲置",
         },
         {
-          value: '0',
-          label: '自住'
+          value: "0",
+          label: "自住",
         },
       ],
 
       yihuyidangDisabled: false,
-    }
+    };
   },
   components: {
     baobiao,
-    roomForm
-  },
-  async mounted () {
-
+    roomForm,
   },
+  async mounted() {},
   computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
-
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 425 + this.iframeHeight
+        : this.clientHeight - 425;
     },
 
-    ...mapGetters(['clientHeight', 'iframeHeight'])
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   methods: {
-    reportForm(){
+    reportForm() {
       let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyLevel,
+        id: this.agencyObj.id,
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
         purpose: this.purpose,
         remark: this.remark,
+        sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: this.agencyObj.id
       };
       this.$refs.baobiao.init({
         elseParams: {
-          categoryKeys:['house_info'], categoryKey: 'house_info', paramMap
-        }
-      })
+          categoryKeys: ["house_info"],
+          categoryKey: "house_info",
+          paramMap,
+        },
+      });
     },
 
-    indexMethod (index) {
+    indexMethod(index) {
       return index + 1;
     },
-    handleSortOrderChange (value) {
-
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
+    handleSortOrderChange(value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
     },
-    handleSortChange (value) {
-
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
+    handleSortChange(value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
     },
 
-    handleEditSort (row) {
+    handleEditSort(row) {
       if (!row.isChange) {
-        row.isChange = true
+        row.isChange = true;
       }
-
     },
 
-    async handleChangeSort (row, index) {
+    async handleChangeSort(row, index) {
       // row.isChange = false
 
       let params = {
         id: row.houseId,
         sort: row.sort,
-        type: 'house',
-      }
+        type: "house",
+      };
 
-      let url = '/gov/org/house/update-sort'
+      let url = "/gov/org/house/update-sort";
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         // this.$message({
         //   type: 'success',
         //   message: '修改成功'
         // })
-
-
       } else {
-
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
 
-    checkSelect (row, index) {
+    checkSelect(row, index) {
       let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
+      if (row.showBtn) {
+        // 判断里面是否存在某个参数
+        isChecked = true;
       } else {
-        isChecked = false
+        isChecked = false;
       }
-      return isChecked
-    },
-
-    loadTreeFromSearch () {
-
+      return isChecked;
     },
 
-    async loadTable (source, treeObj) {
+    loadTreeFromSearch() {},
 
-      this.source = source
-      this.tableLoading = true
-
-      if (source === 'tree') {//来源于tree，查询数据清空
-        this.sortType = 'asc'
-        this.agencyObj = treeObj
-
-      } else if (source === 'search') {//来源于查询
-        this.agencyObj = treeObj
+    async loadTable(source, treeObj) {
+      this.source = source;
+      this.tableLoading = true;
 
+      if (source === "tree") {
+        //来源于tree，查询数据清空
+        this.sortType = "asc";
+        this.agencyObj = treeObj;
+      } else if (source === "search") {
+        //来源于查询
+        this.agencyObj = treeObj;
       }
 
-      if (this.agencyObj.level === 'grid') {
-        this.agencyLevel = 'grid'
-
-      } else if (this.agencyObj.level === 'neighborHood') {
-        this.agencyLevel = 'neighborHood'
-
-      } else if (this.agencyObj.level === 'building') {
-        this.agencyLevel = 'building'
-
+      if (this.agencyObj.level === "grid") {
+        this.agencyLevel = "grid";
+      } else if (this.agencyObj.level === "neighborHood") {
+        this.agencyLevel = "neighborHood";
+      } else if (this.agencyObj.level === "building") {
+        this.agencyLevel = "building";
       } else {
-        this.agencyLevel = 'agency'
-
+        this.agencyLevel = "agency";
       }
 
       // if (fromTree) {
@@ -391,195 +401,186 @@ export default {
         sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-      }
+      };
 
-      const url = "/gov/org/house/houselist"
+      const url = "/gov/org/house/houselist";
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.total = data.total
-        this.validTableDataNum = 0
-        data.list.forEach(item => {
+        this.total = data.total;
+        this.validTableDataNum = 0;
+        data.list.forEach((item) => {
           item.sort = parseInt(item.sort) || 0;
-          item.sort = item.sort.toFixed(2)
-          item.isChange = false
-          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
+          item.sort = item.sort.toFixed(2);
+          item.isChange = false;
+          item.houseNameShow =
+            item.neighborHoodName +
+            item.buildingName +
+            item.unitNum +
+            item.doorName;
 
           if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
+            item.showBtn = true;
+            this.validTableDataNum++;
           } else {
-            item.showBtn = false
+            item.showBtn = false;
           }
-
         });
-        this.tableData = data.list
+        this.tableData = data.list;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-      this.tableLoading = false
+      this.tableLoading = false;
     },
 
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
+    diaClose() {
+      this.$refs.ref_form.resetData();
+      this.formShow = false;
     },
 
-    handleDetail (row) {
-      this.formTitle = '房屋详情'
-      this.formShow = true
+    handleDetail(row) {
+      this.formTitle = "房屋详情";
+      this.formShow = true;
       this.$nextTick(() => {
-
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("detail", row, this.agencyObj);
+      });
     },
 
-    handleAdd () {
-
-      this.formTitle = '新增房屋'
-      this.formShow = true
+    handleAdd() {
+      this.formTitle = "新增房屋";
+      this.formShow = true;
       this.$nextTick(() => {
-
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("add", null, this.agencyObj);
+      });
     },
 
-    handleEdit (row) {
-      this.formTitle = '修改房屋'
-      this.formShow = true
+    handleEdit(row) {
+      this.formTitle = "修改房屋";
+      this.formShow = true;
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
+        this.$refs.ref_form.initForm("edit", row, this.agencyObj);
+      });
     },
 
-    addFormCancle () {
-      this.formShow = false
+    addFormCancle() {
+      this.formShow = false;
     },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
+    addFormOk() {
+      this.formShow = false;
+      this.loadTable();
     },
 
-
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            this.deleteCommunityBatch()
+            this.deleteCommunityBatch();
           })
-          .catch(err => {
+          .catch((err) => {
             if (err == "cancel") {
               // this.$message({
               //   type: "info",
               //   message: "已取消删除"
               // });
             }
-
           });
       } else {
-        this.$message.warning('请先选择要删除的房屋')
+        this.$message.warning("请先选择要删除的房屋");
       }
     },
-    selectAll (selection) {
-      this.selection = selection
-
+    selectAll(selection) {
+      this.selection = selection;
     },
-    selectionChange (selection) {
-      this.selection = selection
-
+    selectionChange(selection) {
+      this.selection = selection;
     },
 
-    async handleDelete (row) {
-
+    async handleDelete(row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.deleteRoom(row)
+          this.deleteRoom(row);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err == "cancel") {
             // this.$message({
             //   type: "info",
             //   message: "已取消删除"
             // });
           }
-
         });
-
-
     },
 
-    async deleteCommunityBatch () {
-      let ids = []
-      this.selection.forEach(element => {
-
-        ids.push(element.houseId)
+    async deleteCommunityBatch() {
+      let ids = [];
+      this.selection.forEach((element) => {
+        ids.push(element.houseId);
       });
 
-      const url = "/gov/org/house/delete"
+      const url = "/gov/org/house/delete";
 
       let params = {
-        type: 'house',
-        ids: ids
-      }
+        type: "house",
+        ids: ids,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "删除成功",
         });
-        this.$emit('refreshTree')
-        this.loadTable()
+        this.$emit("refreshTree");
+        this.loadTable();
       } else if (code > 8000) {
         this.$message({
           showClose: true,
           message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
+          duration: 0,
+        });
+        this.$emit("refreshTree");
+        this.loadTable();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    async deleteRoom (row) {
-      const url = "/gov/org/house/housedel"
+    async deleteRoom(row) {
+      const url = "/gov/org/house/housedel";
 
       let params = {
-        houseId: row.houseId
-      }
+        houseId: row.houseId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "删除成功",
         });
-        this.$emit('refreshTree')
-        this.loadTable()
+        this.$emit("refreshTree");
+        this.loadTable();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
+    async handleExport() {
+      let title = this.agencyObj.label;
+      title = title + "—房屋列表";
 
-      const url = "/gov/org/house/exporthouseinfo"
+      const url = "/gov/org/house/exporthouseinfo";
       let params = {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
@@ -588,63 +589,59 @@ export default {
         remark: this.remark,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: this.agencyObj.id
-      }
-
+        buildingId: this.agencyObj.id,
+      };
 
-      if (this.agencyObj.level === 'grid') {
-        params.gridId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.neighborHoodId = ''
-      } else if (this.agencyObj.level === 'neighborHood') {
-        params.neighborHoodId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.gridId = ''
-      } else if (this.agencyObj.level === 'building') {
-        params.buildingId = this.agencyObj.id
-        params.agencyId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       } else {
-
-        params.agencyId = this.agencyObj.id
-        params.buildingId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       }
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+          this.download(data, title + ".xls");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
         }
       );
-
     },
 
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
-        return
+        return;
       }
 
-      var csvData = new Blob([data])
+      var csvData = new Blob([data]);
 
       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
         window.navigator.msSaveOrOpenBlob(csvData, fileName);
       }
       // for Non-IE (chrome, firefox etc.)
       else {
-        var a = document.createElement('a');
+        var a = document.createElement("a");
         document.body.appendChild(a);
-        a.style = 'display: none';
+        a.style = "display: none";
         var url = window.URL.createObjectURL(csvData);
         a.href = url;
         a.download = fileName;
@@ -652,22 +649,20 @@ export default {
         a.remove();
         window.URL.revokeObjectURL(url);
       }
-
     },
 
-    handleExportModule () {
-      let title = ''
-      title = '房屋模板'
+    handleExportModule() {
+      let title = "";
+      title = "房屋模板";
 
-      const url = "/gov/org/house/exporttemplate"
-      let params = {}
+      const url = "/gov/org/house/exporttemplate";
+      let params = {};
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+          this.download(data, title + ".xls");
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -676,17 +671,15 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang () {
-      this.yihuyidangDisabled = true
-      let title = this.agencyObj.label
-      title = title + '-一户一档'
-      let url = "/gov/org/house/exportHouseUser"
-
-
+    handleExportYihuyidang() {
+      this.yihuyidangDisabled = true;
+      let title = this.agencyObj.label;
+      title = title + "-一户一档";
+      let url = "/gov/org/house/exportHouseUser";
 
       let params = {
-        agencyId: '',
-        gridId: '',
+        agencyId: "",
+        gridId: "",
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
@@ -694,97 +687,95 @@ export default {
         remark: this.remark,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
-        buildingId: '',
-        neighborHoodId: ''
-      }
+        buildingId: "",
+        neighborHoodId: "",
+      };
 
-      if (this.agencyObj.level === 'grid') {
-        params.gridId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.neighborHoodId = ''
-      } else if (this.agencyObj.level === 'neighborHood') {
-        params.neighborHoodId = this.agencyObj.id
-        params.agencyId = ''
-        params.buildingId = ''
-        params.gridId = ''
-      } else if (this.agencyObj.level === 'building') {
-        params.buildingId = this.agencyObj.id
-        params.agencyId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       } else {
-
-        params.agencyId = this.agencyObj.id
-        params.buildingId = ''
-        params.neighborHoodId = ''
-        params.gridId = ''
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
       }
 
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-          this.yihuyidangDisabled = false
+          this.download(data, title + ".xls");
+          this.yihuyidangDisabled = false;
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
-          this.yihuyidangDisabled = false
+          this.yihuyidangDisabled = false;
         }
       );
     },
     // 上传文件之前的钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       this.files = file;
 
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const isText = file.type === "application/vnd.ms-excel";
+      const isTextComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 
       if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        return false
+        this.$message.error("请选择正确格式的文件");
+        return false;
       } else {
         this.fileName = file.name;
-        return true
+        return true;
       }
-
     },
     // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile () {
-
-
+    async uploadFile() {
       if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
+        this.$message.warning("请选择要上传的文件！");
+        return false;
       }
 
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
 
       //清空上传列表
-      this.$refs['upload'].clearFiles()
+      this.$refs["upload"].clearFiles();
 
-      var url = '/gov/org/house/houseimport'
+      var url = "/gov/org/house/houseimport";
 
       let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgId", this.agencyObj.id); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgType", this.agencyObj.level); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-      this.importRoomLoading = true
-      window.app.ajax.post2(url, fileFormData,
+      this.importRoomLoading = true;
+      window.app.ajax.post2(
+        url,
+        fileFormData,
         (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
+          if (data.code === 0 && data.msg == "success") {
             // this.$message.success('导入成功')
           } else {
             // this.$message({
@@ -795,68 +786,66 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+          this.$emit("refreshTree");
+          this.loadTable();
+          this.importRoomLoading = false;
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
+          this.importRoomLoading = false;
+        },
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
     },
 
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-
-        }
+    showMessage(msg) {
+      this.$alert(msg, "操作结果", {
+        confirmButtonText: "关闭",
+        callback: (action) => {
+          this.$emit("refreshTree");
+          this.loadTable();
+        },
       });
     },
 
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
     },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   watch: {
-    selection (val) {
-
+    selection(val) {
       if (val.length > 0) {
-        this.showDeletBtn = true
+        this.showDeletBtn = true;
       } else {
-        this.showDeletBtn = false
+        this.showDeletBtn = false;
       }
-    }
+    },
   },
   props: {
     staffAgencyId: {
       type: String,
-      default: '',
+      default: "",
     },
     showImportBtn: {
       type: Boolean,
@@ -864,36 +853,36 @@ export default {
     },
     ownerName: {
       type: String,
-      default: '',
+      default: "",
     },
     ownerPhone: {
       type: String,
-      default: '',
+      default: "",
     },
     rentFlag: {
       type: String,
-      default: '',
+      default: "",
     },
     purpose: {
       type: String,
-      default: '',
+      default: "",
     },
     remark: {
       type: String,
-      default: '',
+      default: "",
     },
     updateStartDate: {
       type: String,
-      default: '',
+      default: "",
     },
     updateEndDate: {
       type: String,
-      default: '',
+      default: "",
     },
-  }
-}
+  },
+};
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 
 .item_width_4 {
diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue
index 5efd538b7..4408cec24 100644
--- a/src/views/modules/cpts/baobiao/index.vue
+++ b/src/views/modules/cpts/baobiao/index.vue
@@ -23,7 +23,7 @@
         min-width="150"
       ></el-table-column>
       <el-table-column
-        label="客户配置"
+        label="操作"
         fixed="right"
         header-align="center"
         align="center"