From bbff46e35d4314b95af6f0019773bc23f0e25c4b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 18:17:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/userHouse/houseList.vue | 1454 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 738 insertions(+), 716 deletions(-)

diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index c4b5769..8b2f087 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -1,788 +1,810 @@
 <template>
-  <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"
-          :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.user_delete"
-              @click="handleDelete">删 除
-            </el-button>
-            <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
-              icon="el-icon-upload2" @click="handleImport">导入
-            </el-button>
-            <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
-              icon="el-icon-download" @click="handleExport">导出
-            </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="handleHouseholdManager(scope.row)">住户管理
-            </el-button>
-            <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
-              @click="manageLabel(scope.row)">标签
-            </el-button>
-          </template>
+    <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" :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.user_delete"
+                            @click="handleDelete">删 除
+                        </el-button>
+                        <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
+                            icon="el-icon-upload2" @click="handleImport">导入
+                        </el-button>
+                        <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
+                            icon="el-icon-download" @click="handleExport">导出
+                        </el-button>
+                    </template>
 
-          <template slot-scope="{row}" slot="tenantName">
-            <el-tag>{{ row.tenantName }}</el-tag>
-          </template>
-          <template slot-scope="{row}" slot="roleName">
-            <el-tag>{{ row.roleName }}</el-tag>
-          </template>
-          <template slot-scope="{row}" slot="deptName">
-            <el-tag>{{ row.deptName }}</el-tag>
-          </template>
-          <template slot-scope="{row}" slot="userTypeName">
-            <el-tag>{{ row.userTypeName }}</el-tag>
-          </template>
+                    <template slot-scope="{row, size}" slot="menu">
+                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+                            v-if="permission.househould_manager" @click="handleHouseholdManager(row)">住户管理
+                        </el-button>
+                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+                            v-if="permission.househould_manager" @click="manageLabel(row)">标签
+                        </el-button>
+                    </template>
 
-          <template slot-scope="{row}" slot="phone">
-            <el-button type="text" @click="showStringDispose(row, 'phoneflag')">
-              {{ textDispose(row, 'phoneflag', 'phone') }}
-            </el-button>
-          </template>
+                    <template slot-scope="{row, size}" slot="phone">
+                        <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')">
+                            {{ textDispose(row, 'phoneflag', 'phone') }}
+                        </el-button>
+                    </template>
 
-          <template slot-scope="{row}" slot="userHouseLabelVOList">
-            {{ labelDispose(row.userHouseLabelVOList) }}
-          </template>
-        </avue-crud>
-        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
+                    <template slot-scope="{row}" slot="userHouseLabelVOList">
+                        {{ labelDispose(row.userHouseLabelVOList) }}
+                    </template>
+                </avue-crud>
+                <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
 
-          <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
-            :default-checked-keys="roleTreeObj" :props="props">
-          </el-tree>
+                    <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
+                        ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
+                    </el-tree>
 
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="roleBox = false">取 消</el-button>
-            <el-button type="primary" @click="submitRole">确 定</el-button>
-          </span>
-        </el-dialog>
+                    <span slot="footer" class="dialog-footer">
+                        <el-button size="small" @click="roleBox = false">取 消</el-button>
+                        <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
+                    </span>
+                </el-dialog>
 
-        <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
-          <div id="" class="grid-container2">
-            <div class="grid-item" :style="{ backgroundColor: item.color }" v-for="(item, index) in labelData"
-              :key="index" @click="changLabel(item)">
-              {{ item.name }}
-            </div>
-          </div>
-          <!--  <span slot="footer" class="dialog-footer">
+                <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
+                    <div id="" class="grid-container2">
+                        <div class="grid-item" :style="{ backgroundColor: item.color }" v-for="(item, index) in labelData"
+                            :key="index" @click="changLabel(item)">
+                            {{ item.name }}
+                        </div>
+                    </div>
+                    <!--  <span slot="footer" class="dialog-footer">
             <el-button @click="labelFlag = false">取 消</el-button>
             <el-button type="primary" @click="submitRole">确 定</el-button>
           </span> -->
-        </el-dialog>
+                </el-dialog>
 
-        <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
-          <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
-          </avue-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="editLabelFlge = false">取 消</el-button>
-            <el-button type="primary" @click="onsubmit">确 定</el-button>
-          </span>
-        </el-dialog>
+                <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
+                    width="655px">
+                    <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+                    </avue-form>
+                    <span slot="footer" class="dialog-footer">
+                        <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+                        <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
+                    </span>
+                </el-dialog>
 
-        <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
-          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
-            <template slot="excelTemplate">
-              <el-button type="primary" @click="handleTemplate">
-                点击下载<i class="el-icon-download el-icon--right"></i>
-              </el-button>
-            </template>
-          </avue-form>
-        </el-dialog>
+                <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+                    <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+                        <template slot="excelTemplate">
+                            <el-button type="primary" @click="handleTemplate">
+                                点击下载<i class="el-icon-download el-icon--right"></i>
+                            </el-button>
+                        </template>
+                    </avue-form>
+                </el-dialog>
 
-        <el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
-          <householdManager ref="householdManager" />
-        </el-dialog>
-      </basic-container>
-    </el-col>
-  </el-row>
+                <el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
+                    <householdManager ref="householdManager" />
+                </el-dialog>
+            </basic-container>
+        </el-col>
+    </el-row>
 </template>
 
 <script>
-  import {
+import {
     getList,
     remove,
     add,
     update,
     getDetatil,
     getDetatils
-  } from "@/api/userHouse/list/house.js"
-  import {
+} from "@/api/userHouse/list/house.js"
+import {
     removeHouseholdLabel,
     saveOrUpdateHouseholdLabel
-  } from "@/api/userHouse/list/userHouseList.js"
-  import {
+} from "@/api/userHouse/list/userHouseList.js"
+import {
     getLabelList,
-  } from '@/api/label/label'
-  import {
+} from '@/api/label/label'
+import {
     exportBlob
-  } from "@/api/common"
-  import {
+} from "@/api/common"
+import {
     mapGetters
-  } from "vuex"
-  import website from '@/config/website'
-  import {
+} from "vuex"
+import website from '@/config/website'
+import {
     getToken
-  } from '@/util/auth'
-  import {
+} from '@/util/auth'
+import {
     downloadXls
-  } from "@/util/util"
-  import {
+} from "@/util/util"
+import {
     dateNow
-  } from "@/util/date"
-  import NProgress from 'nprogress'
-  import 'nprogress/nprogress.css'
-  import func from "@/util/func"
-  import householdManager from "./components/householdManager"
-  import Qs from "qs"
-  export default {
+} from "@/util/date"
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import func from "@/util/func"
+import householdManager from "./components/householdManager"
+import Qs from "qs"
+export default {
     components: {
-      householdManager
+        householdManager
     },
-    data() {
-      return {
-        labelData: [],
-        labelForm: {},
-        userHouseLabelVOList: [],
-        currentLabel: {},
-        labelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [{
-            label: '级别',
-            prop: 'color',
-            type: 'radio',
-            button: true,
-            row: true,
-            dicData: [{
-              label: '撤销',
-              value: '#EBEDF0'
-            }, {
-              label: '绿',
-              value: '#30D17C'
-            }, {
-              label: '黄',
-              value: '#FFB42B'
-            }, {
-              label: '红',
-              value: '#EA1F1F'
-            }],
-            rules: [{
-              required: true,
-              message: "请选择",
-              trigger: "blur"
-            }]
-          }, {
-            row: true,
-            label: '备注',
-            prop: 'remark',
-            type: 'input'
-          }]
-        },
-        editLabelFlge: false,
-        labelFlag: false,
-        householdManagerVisible: false,
-        form: {},
-        search: {},
-        excelBox: false,
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 3,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          menuWidth: 340,
-          column: [{
-              label: "房屋编号",
-              prop: "houseCode",
-              width: 180,
-              hide: true,
-              display: false
-            },
-            {
-              label: "地址",
-              prop: "address",
-              width: 180,
-              display: false
-            },
+    data () {
 
-            {
-              hide: true,
-              parent: false,
-              label: "小区名称",
-              prop: "districtCode",
-              type: 'tree',
-              dicUrl: `/api/blade-district/district/getDistrictTree`,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              defaultExpandedKeys: ["361102003"],
-              span: 12,
-              width: 220,
-              overHidden: true,
-            },
+        //手机号格式校验
+        let validatorPhone = function (rule, value, callback) {
+            if (value) {
+                if (!/^1[3456789]\d{9}$/.test(value)) {
+                    callback(new Error('手机号格式有误!'))
+                } else {
+                    callback()
+                }
+            }
+            callback()
+        }
 
-            {
-              width: 220,
-              overHidden: true,
-              label: '小区名称',
-              parent: false,
-              prop: "districtName",
-              searchSpan: 4,
-              display: false,
-              search: true,
+        return {
+            labelData: [],
+            labelForm: {},
+            userHouseLabelVOList: [],
+            currentLabel: {},
+            labelOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [{
+                    label: '级别',
+                    prop: 'color',
+                    type: 'radio',
+                    button: true,
+                    row: true,
+                    dicData: [{
+                        label: '撤销',
+                        value: '#EBEDF0'
+                    }, {
+                        label: '绿',
+                        value: '#30D17C'
+                    }, {
+                        label: '黄',
+                        value: '#FFB42B'
+                    }, {
+                        label: '红',
+                        value: '#EA1F1F'
+                    }],
+                    rules: [{
+                        required: true,
+                        message: "请选择",
+                        trigger: "blur"
+                    }]
+                }, {
+                    row: true,
+                    label: '备注',
+                    prop: 'remark',
+                    type: 'input'
+                }]
             },
+            editLabelFlge: false,
+            labelFlag: false,
+            householdManagerVisible: false,
+            form: {},
+            search: {},
+            excelBox: false,
+            selectionList: [],
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            option: {
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 350,
 
-            {
-              width: 110,
-              label: "所属街道",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "townStreetName",
-              search: true,
-              searchSpan: 4
-            },
+                height: 'auto',
+                calcHeight: 80,
+                tip: false,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: true,
+                dialogType: 'drawer',
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "房屋编号",
+                        prop: "houseCode",
+                        width: 180,
+                        hide: true,
+                        display: false
+                    },
+                    {
+                        width: 156,
+                        overHidden: true,
+                        label: "地址",
+                        prop: "address",
+                        display: false
+                    },
 
-            {
-              width: 156,
-              overHidden: true,
-              label: "所属社区",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "neiName",
-              search: true,
-              searchSpan: 4,
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }],
-            },
+                    {
+                        hide: true,
+                        parent: false,
+                        label: "小区名称",
+                        prop: "districtCode",
+                        type: 'tree',
+                        dicUrl: `/api/blade-district/district/getDistrictTree`,
+                        props: {
+                            label: "name",
+                            value: "id"
+                        },
+                        defaultExpandedKeys: ["361102003"],
+                        span: 12,
+                        width: 220,
+                        overHidden: true,
+                    },
 
-            {
-              hide: true,
-              parent: false,
-              label: "所属社区",
-              prop: "neiCode",
-              search: false,
-              type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
-              props: {
-                label: "name",
-                value: "id",
-              },
-              cascader: ["gridId"],
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }, ],
-            },
+                    {
+                        width: 220,
+                        overHidden: true,
+                        label: '小区名称',
+                        parent: false,
+                        prop: "districtName",
+                        searchSpan: 4,
+                        display: false,
+                        search: true,
+                    },
 
-            {
-              width: 110,
-              overHidden: true,
-              label: "所属网格",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "gridName",
-              rules: [{
-                required: true,
-                message: "请选择所属网格",
-                trigger: "blur",
-              }],
-            },
+                    {
+                        width: 110,
+                        label: "所属街道",
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        prop: "townStreetName",
+                        search: true,
+                        searchSpan: 4
+                    },
 
-            {
-              hide: true,
-              label: "所属网格",
-              prop: "gridId",
-              type: "tree",
-              cell: true,
-              props: {
-                label: "gridName",
-                value: "id",
-              },
-              dicUrl: "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
-              rules: [{
-                required: true,
-                message: "请选择所属网格",
-                trigger: "blur",
-              }, ],
-            },
+                    {
+                        width: 156,
+                        overHidden: true,
+                        label: "所属社区",
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        prop: "neiName",
+                        search: true,
+                        searchSpan: 4,
+                        rules: [{
+                            required: true,
+                            message: "请选择所属社区",
+                            trigger: "blur",
+                        }],
+                    },
 
-            {
-              label: "房屋照片",
-              prop: "imageUrls",
-              width: 80,
-              type: "upload",
-              listType: "picture-card",
-              dataType: "string",
-              multiple: true,
-              action: "/api/blade-resource/oss/endpoint/put-file",
-              propsHttp: {
-                res: "data",
-                name: 'name',
-                url: "link",
-              },
-              span: 24,
-            },
+                    {
+                        hide: true,
+                        parent: false,
+                        label: "所属社区",
+                        prop: "neiCode",
+                        search: false,
+                        type: "tree",
+                        dicUrl: "/api/blade-system/region/tree",
+                        props: {
+                            label: "name",
+                            value: "id",
+                        },
+                        cascader: ["gridId"],
+                        rules: [
+                            {
+                                required: true,
+                                message: "请选择所属社区",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
 
-            {
-              width: 110,
-              label: "电话",
-              prop: "phone",
-              slot: true,
+                    {
+                        width: 110,
+                        overHidden: true,
+                        label: "所属网格",
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        prop: "gridName",
+                        rules: [{
+                            required: true,
+                            message: "请选择所属网格",
+                            trigger: "blur",
+                        }],
+                    },
+
+                    {
+                        hide: true,
+                        label: "所属网格",
+                        prop: "gridId",
+                        type: "tree",
+                        cell: true,
+                        props: {
+                            label: "gridName",
+                            value: "id",
+                        },
+                        dicUrl:
+                            "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请选择所属网格",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+
+                    {
+                        label: "房屋照片",
+                        prop: "imageUrls",
+                        width: 110,
+                        type: "upload",
+                        listType: "picture-card",
+                        dataType: "string",
+                        multiple: true,
+                        action: "/api/blade-resource/oss/endpoint/put-file",
+                        propsHttp: {
+                            res: "data",
+                            name: 'name',
+                            url: "link",
+                        },
+                        span: 24,
+                    },
+
+
+                    {
+                        width: 120,
+                        label: "电话",
+                        prop: "phone",
+                        slot: true,
+                        rules: [
+                            {
+                                validator: validatorPhone,
+                                trigger: 'blur'
+                            }
+                        ],
+                    },
+
+                    {
+                        label: "幢",
+                        prop: "building",
+                    },
+                    {
+                        label: "单元",
+                        prop: "unit",
+                    },
+                    {
+                        label: "室",
+                        prop: "room",
+                    },
+                    {
+                        label: "楼层",
+                        prop: "floor",
+                        type: "number",
+                        rules: [{
+                            required: true,
+                            message: "请输入楼层",
+                            trigger: "blur",
+                        },],
+                    },
+                    {
+                        label: "面积",
+                        prop: "area",
+                        type: "number",
+                    },
+                    {
+                        label: "物业费",
+                        prop: "propertyPrice",
+                        type: "number",
+                    },
+                    {
+                        label: "服务到期",
+                        prop: "serviceDue",
+                        type: "datetime",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    },
+                    {
+                        width: 210,
+                        overHidden: true,
+                        label: "标签",
+                        prop: "userHouseLabelVOList",
+                        display: false
+                    },
+                ]
             },
-            {
-              label: "幢",
-              prop: "building",
-            },
-            {
-              label: "单元",
-              prop: "unit",
-            },
-            {
-              label: "室",
-              prop: "room",
-            },
-            {
-              label: "楼层",
-              prop: "floor",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入楼层",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "面积",
-              prop: "area",
-              type: "number",
-            },
-            {
-              label: "物业费",
-              prop: "propertyPrice",
-              type: "number",
-            },
-            {
-              label: "服务到期",
-              prop: "serviceDue",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd",
-            },
-            {
-              width: 210,
-              label: "标签",
-              prop: "userHouseLabelVOList",
-              display: false
-            },
-          ]
-        },
-        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
+            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: "是",
-                  value: 1
+                    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,
                 }
-              ],
-              value: 0,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请选择是否覆盖",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: '模板下载',
-              prop: 'excelTemplate',
-              formslot: true,
-              span: 24,
+                ]
             }
-          ]
         }
-      }
     },
     watch: {},
     computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.house_add, true),
-          viewBtn: this.vaildData(this.permission.house_view, true),
-          delBtn: this.vaildData(this.permission.house_delete, true),
-          editBtn: this.vaildData(this.permission.house_edit, true)
-        }
-      },
-
-      textDispose() {
-        return (row, flag, type) => {
-          if (row[flag] || row[type] == null) {
-            return row[type]
-          } else {
-            if (type == 'idCard') {
-              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-            } else {
-              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+        ...mapGetters(["userInfo", "permission"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.house_add, true),
+                viewBtn: this.vaildData(this.permission.house_view, true),
+                delBtn: this.vaildData(this.permission.house_delete, true),
+                editBtn: this.vaildData(this.permission.house_edit, true)
             }
-          }
-        }
-      },
+        },
 
-      labelDispose() {
-        return (list) => {
-          return list.map(item => item.labelName).join(',')
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'idCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
+        },
+
+        labelDispose () {
+            return (list) => {
+                return list.map(item => item.labelName).join(',')
+            }
         }
-      }
     },
-    mounted() {},
+    mounted () { },
     methods: {
 
-      onsubmit() {
-        if (this.labelForm.color === '#EBEDF0') {
-          let params = {
-            householdId: this.currentRow.id,
-            labelId: this.currentLabel.id
-          }
-          removeHouseholdLabel(params).then(res => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.editLabelFlge = false
-            this.manageLabel(this.currentRow)
-            this.loading = false
-          })
-        } else {
-          this.labelForm.houseCode = this.currentRow.houseCode
-          this.labelForm.householdId = this.currentRow.id
-          this.labelForm.labelId = this.currentLabel.id
-          this.labelForm.lableType = 2
-          saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.editLabelFlge = false
-            this.manageLabel(this.currentRow)
-            this.loading = false
-          })
-        }
-      },
-
-      changLabel(item) {
-        this.editLabelFlge = true
-        this.currentLabel = item
-        this.labelForm.color = item.color
-        this.labelForm.remark = item.remark
-      },
-      manageLabel(item) {
-        this.loading = true
-        this.currentRow = item
-        this.labelFlag = true
-        let params = {
-          parentId: 1001
-        }
-        // 查询标签
-        getLabelList(Object.assign(params)).then(res => {
-          const data = res.data.data
-          // 查询详情
-          getDetatils({
-            houseCode: item.houseCode
-          }).then(res => {
-            if (res.data.data) {
-              this.userHouseLabelVOList = res.data.data.userHouseLabelVOList
-              this.loading = false
-              // 将细类放到一起
-              data.forEach(f => {
-                if (this.userHouseLabelVOList.length > 0) {
-                  this.userHouseLabelVOList.forEach(h => {
-                    if (Number(f.id) == h.labelId) {
-                      f['color'] = h.color
-                      f['remark'] = h.remark
-                    }
-                  })
+        onsubmit () {
+            if (this.labelForm.color === '#EBEDF0') {
+                let params = {
+                    householdId: this.currentRow.id,
+                    labelId: this.currentLabel.id
                 }
-              })
-            }
-            this.labelData = data
-            this.loading = false
-          })
-        })
-      },
-      handleHouseholdManager(row) {
-        var that = this
-        this.householdManagerVisible = true
-        this.$nextTick(() => {
-          that.$refs.householdManager.init(row)
-        })
-      },
-      rowSave(row, done, loading) {
-        if (row.imageUrls.length > 0) {
-          var urls = []
-          var split = row.imageUrls.split(",")
-          split.forEach(url => {
-            var names = url.split("jczz/")
-            urls.push(names[1])
-          })
-          row.imageUrls = urls.join(",")
-        }
-
-        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) {
-        if (row.imageUrls.length > 0) {
-          var urls = []
-          var split = row.imageUrls.split(",")
-          split.forEach(url => {
-            var names = url.split("jczz/")
-            urls.push(names[1])
-          })
-          row.imageUrls = urls.join(",")
-        }
-
-        update(row).then(() => {
-          this.initFlag = false
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          })
-          done()
-        }, error => {
-          window.console.log(error)
-          loading()
-        })
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id)
-          })
-          .then(() => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-          })
-      },
-      searchReset() {
-        this.query = {}
-        this.treeDeptId = ''
-        this.onLoad(this.page)
-      },
-      searchChange(params, done) {
-        this.query = params
-        this.page.currentPage = 1
-        this.onLoad(this.page, params)
-        done()
-      },
-      selectionChange(list) {
-        this.selectionList = list
-      },
-      selectionClear() {
-        this.selectionList = []
-        this.$refs.crud.toggleSelection()
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据")
-          return
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(this.ids)
-          })
-          .then(() => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            })
-            this.$refs.crud.toggleSelection()
-          })
-      },
-      handleImport() {
-        this.excelBox = true
-      },
-      uploadAfter(res, done, loading, column) {
-        window.console.log(column)
-        this.excelBox = false
-        this.refreshChange()
-        done()
-      },
-      handleExport() {
-        this.$confirm("是否导出房屋数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start()
-          var data = {
-            ...this.query
-          }
-          data = Qs.stringify(data)
-          exportBlob(
-            `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
-          ).then(res => {
-            downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`)
-            NProgress.done()
-          })
-        })
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "房屋数据模板.xlsx")
-        })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetatil({
-            id: this.form.id
-          }).then(res => {
-            this.form = res.data.data
-
-            if (this.form.imageUrls) {
-              if (this.form.imageUrls.length > 0) {
-                var urls = []
-                var names = this.form.imageUrls.split(",")
-                names.forEach(name => {
-                  urls.push(website.minioUrl + name)
+                removeHouseholdLabel(params).then(res => {
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.editLabelFlge = false
+                    this.manageLabel(this.currentRow)
+                    this.loading = false
                 })
-                this.form.imageUrls = urls.join(",")
-              }
+            } else {
+                this.labelForm.houseCode = this.currentRow.houseCode
+                this.labelForm.householdId = this.currentRow.id
+                this.labelForm.labelId = this.currentLabel.id
+                this.labelForm.lableType = 2
+                saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.editLabelFlge = false
+                    this.manageLabel(this.currentRow)
+                    this.loading = false
+                })
             }
-          })
-        }
-        this.initFlag = true
-        done()
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query)
-      },
-      onLoad(page, params = {}) {
-        this.loading = true
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = {
-            ...res.data.data,
-            records: res.data.data.records.map(item => {
-              if (item.imageUrls) {
-                if (item.imageUrls.length > 0) {
-                  var urls = []
-                  var names = item.imageUrls.split(",")
-                  names.forEach(name => {
-                    urls.push(website.minioUrl + name)
-                  })
-                  item.imageUrls = urls.join(",")
-                }
-              }
+        },
 
-              return {
-                ...item,
-                'phoneflag': false,
-              }
+        changLabel (item) {
+            this.editLabelFlge = true
+            this.currentLabel = item
+            this.labelForm.color = item.color
+            this.labelForm.remark = item.remark
+        },
+        manageLabel (item) {
+            this.loading = true
+            this.currentRow = item
+            this.labelFlag = true
+            let params = {
+                parentId: 1001
+            }
+            // 查询标签
+            getLabelList(Object.assign(params)).then(res => {
+                const data = res.data.data
+                // 查询详情
+                getDetatils({
+                    houseCode: item.houseCode
+                }).then(res => {
+                    if (res.data.data) {
+                        this.userHouseLabelVOList = res.data.data.userHouseLabelVOList
+                        this.loading = false
+                        // 将细类放到一起
+                        data.forEach(f => {
+                            if (this.userHouseLabelVOList.length > 0) {
+                                this.userHouseLabelVOList.forEach(h => {
+                                    if (Number(f.id) == h.labelId) {
+                                        f['color'] = h.color
+                                        f['remark'] = h.remark
+                                    }
+                                })
+                            }
+                        })
+                    }
+                    this.labelData = data
+                    this.loading = false
+                })
             })
-          }
-          this.page.total = data.total
-          this.data = data.records
-          this.loading = false
-          this.selectionClear()
-        })
-      },
-      showStringDispose(row, type) {
-        row[type] = !row[type]
-      }
+        },
+        handleHouseholdManager (row) {
+            var that = this
+            this.householdManagerVisible = true
+            this.$nextTick(() => {
+                that.$refs.householdManager.init(row)
+            })
+        },
+        rowSave (row, done, loading) {
+            if (row.imageUrls.length > 0) {
+                var urls = []
+                var split = row.imageUrls.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.imageUrls = urls.join(",")
+            }
+
+            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) {
+            if (row.imageUrls.length > 0) {
+                var urls = []
+                var split = row.imageUrls.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.imageUrls = urls.join(",")
+            }
+
+            update(row).then(() => {
+                this.initFlag = false
+                this.onLoad(this.page)
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                done()
+            }, error => {
+                window.console.log(error)
+                loading()
+            })
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.treeDeptId = ''
+            this.onLoad(this.page)
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
+            done()
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            this.$refs.crud.toggleSelection()
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        handleImport () {
+            this.excelBox = true
+        },
+        uploadAfter (res, done, loading, column) {
+            window.console.log(column)
+            this.excelBox = false
+            this.refreshChange()
+            done()
+        },
+        handleExport () {
+            this.$confirm("是否导出房屋数据?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                NProgress.start()
+                var data = {
+                    ...this.query
+                }
+                data = Qs.stringify(data)
+                exportBlob(
+                    `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
+                ).then(res => {
+                    downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`)
+                    NProgress.done()
+                })
+            })
+        },
+        handleTemplate () {
+            exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+                downloadXls(res.data, "房屋数据模板.xlsx")
+            })
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getDetatil({
+                    id: this.form.id
+                }).then(res => {
+                    this.form = res.data.data
+
+                    if (this.form.imageUrls) {
+                        if (this.form.imageUrls.length > 0) {
+                            var urls = []
+                            var names = this.form.imageUrls.split(",")
+                            names.forEach(name => {
+                                urls.push(website.minioUrl + name)
+                            })
+                            this.form.imageUrls = urls.join(",")
+                        }
+                    }
+                })
+            }
+            this.initFlag = true
+            done()
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            this.loading = true
+
+            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                const data = {
+                    ...res.data.data,
+                    records: res.data.data.records.map(item => {
+                        if (item.imageUrls) {
+                            if (item.imageUrls.length > 0) {
+                                var urls = []
+                                var names = item.imageUrls.split(",")
+                                names.forEach(name => {
+                                    urls.push(website.minioUrl + name)
+                                })
+                                item.imageUrls = urls.join(",")
+                            }
+                        }
+
+                        return {
+                            ...item,
+                            'phoneflag': false,
+                        }
+                    })
+                }
+                this.page.total = data.total
+                this.data = data.records
+                this.loading = false
+                this.selectionClear()
+            })
+        },
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        }
     }
-  }
+}
 </script>
 
 <style>
-  .box {
+.box {
     height: 800px;
-  }
+}
 
-  .el-scrollbar {
+.el-scrollbar {
     height: 100%;
-  }
+}
 
-  .box .el-scrollbar__wrap {
+.box .el-scrollbar__wrap {
     overflow: scroll;
-  }
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3