Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

Lou

2024-01-12 6c2aa8e5a465c712d7855b77bc0b83bb4aa53231

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/article/components/deitDiscussion.vue

@@ -12,8 +12,9 @@
  <div>


    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="50%" :before-close="userHandleClose">
      <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
      <avue-crud :data="userData" @search-change="searchChange" @row-del="rowDel" @search-reset="searchReset"
        :page="userPage" :option="userOption"></avue-crud>
    </el-dialog>
  </div>
</template>
@@ -28,7 +29,8 @@
  } from "@/api/discuss/publicDiscuss"

  import {
    getPage
    getPage,
    remove
  } from "@/api/discuss/userTopics"


@@ -41,7 +43,6 @@
    getDetail,
    add,
    update,
    remove
  } from "@/api/discuss/topics"

  export default {
@@ -56,28 +57,49 @@
        articleId: '',
        userData: [],
        userOption: {
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: false,
          //stripe:true,
          index: true,
          editBtn: false,
          addBtn: false,
          menu: false,
          viewBtn: false,
          selection: true,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
            label: '姓名',
            prop: 'name'
            prop: 'name',
            searchSpan: 4,
            search: true,
          }, {
            label: '头像',
            prop: 'avatar'
          }, {
            label: '签名',
            type: 'upload',
            listType: "picture-img",
            prop: 'signaturePath'
          }, {
            label: '手机',
            prop: 'phone'
            prop: 'phone',
            searchSpan: 4,
            search: true,
          }, {
            label: '小区',
            prop: 'aoiName'
          }, {
            label: '地址',
            prop: 'addressName'
          }, {
            label: '签名',
            type: 'upload',
            listType: "picture-img",
            prop: 'signaturePath'
          }, {
            label: '时间',
            prop: 'createTime'
@@ -96,12 +118,31 @@
    watch: {},

    methods: {


      userHandleClose() {

        this.popupTableUserShow = false
      },

      searchReset() {
        this.query = {}
        this.getUserPage(this.userPage)
      },

      searchChange(params, done) {
        this.query = params
        this.userPage.currentPage = 1
        this.getUserPage(this.userPage, params)
        done()
      },
      initData(newData) {
        this.editFlag = false
        this.popupTableShow = true
        this.articleId = newData.id

        this.onLoad()
        this.query.level = 1
        this.query.articleId = this.articleId
        this.onLoad(this.userPage, this.query)
      },

      handleClose() {
@@ -176,8 +217,7 @@
            return remove(row.id)
          })
          .then(() => {
            this.onLoad()

            this.getUserPage(this.userPage)
            this.$message({
              type: "success",
              message: "操作成功!"
@@ -194,28 +234,10 @@
        this.editFlag = true
      },

      deletes(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(row.id)
          })
          .then(() => {
            this.onLoad()

            this.$message({
              type: "success",
              message: "操作成功!"
            })
          })
      },

      openUser(row, type = 0) {
        this.popupTableUserShow = true

        this.query = {}
        if (type == 0) {
          this.userParams = {
            articleId: row.id
@@ -245,15 +267,9 @@
        })
      },

      onLoad() {
      onLoad(page, params = {}) {
        this.loading = true

        let params = {
          level: 1,
          articleId: this.articleId
        }

        getLists(1, 100, Object.assign(params, this.query)).then(res => {
        getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.data = data
          this.loading = false

 src/views/article/publicSignUp.vue

@@ -17,12 +17,12 @@
        <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row)">
          参与用户
        </el-button>
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
        <!-- <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
          撤销
        </el-button>
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
        </el-button> -->
        <!-- <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
          发布
        </el-button>
        </el-button> -->
      </template>

      <template slot-scope="{ row, size }" slot="publish">
@@ -185,7 +185,7 @@
              searchSpan: 4,
              value: 3,
              slot: true,
              search: true,
              // search: true,
              type: "select",
              rules: [{
                required: true,
@@ -229,9 +229,10 @@
              label: "发布状态",
              prop: "publish",
              searchSpan: 4,
              value: "0",
              value: "1",
              slot: true,
              search: true,
              hide: true,
              // search: true,
              type: "select",
              rules: [{
                required: true,

 src/views/cGovernance/gridWorkLog.vue

@@ -182,6 +182,23 @@
                        display: false,
                        prop: "gridName",
                    },
                    {
                        width: 144,
                        label: "走访时间",
                        prop: "workTime",
                        searchLabelWidth: 120,
                        type: "date",
                        row:true,
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [
                            {
                                required: true,
                                message: "请输入走访时间",
                                trigger: "blur",
                            },
                        ],
                    },

                    {
                        overHidden: true,
@@ -189,6 +206,13 @@
                        prop: "context",
                        type: "textarea",
                        span: 24,
                        rules: [
                            {
                                required: true,
                                message: "请输入走访内容",
                                trigger: "blur",
                            },
                        ],
                    },

                    {
@@ -215,25 +239,10 @@
                        prop: "createUserName",
                    },

                    {
                        width: 144,
                        label: "走访时间",
                        prop: "workTime",
                        searchLabelWidth: 120,
                        type: "date",
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [
                            {
                                required: true,
                                message: "请输入走访时间",
                                trigger: "blur",
                            },
                        ],
                    },
                    

                    {
                        dispaly: false,
                        display: false,
                        width: 144,
                        label: "上报时间",
                        prop: "createTime",

 src/views/propertySupervision/houseHoldSupervision.vue

New file
@@ -0,0 +1,815 @@
<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-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, 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">

          <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 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-button @click="labelFlag = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</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="householdManagerVisible" width="70%" height="60%">
          <!-- <householdManager ref="householdManager" /> -->
        </el-dialog>


      </basic-container>
    </el-col>
  </el-row>
</template>

<script>
  import {
    getList,
    remove,
    add,
    update,
    getDetatil,
    getDetatils
  } from "@/api/userHouse/list/house.js"
  import {
    removeHouseholdLabel,
    saveOrUpdateHouseholdLabel
  } from "@/api/userHouse/list/userHouseList.js"
  import {
    getLabelList,
  } from '@/api/label/label'
  import {
    exportBlob
  } from "@/api/common"
  import {
    mapGetters
  } from "vuex"
  import website from '@/config/website'
  import {
    getToken
  } from '@/util/auth'
  import {
    downloadXls
  } from "@/util/util"
  import {
    dateNow
  } from "@/util/date"
  import NProgress from 'nprogress'
  import 'nprogress/nprogress.css'
  import func from "@/util/func"
  // import householdManager from "./components/householdManager"
  import Qs from "qs"
  export default {
    components: {
      // householdManager
    },
    data() {

      //手机号格式校验
      let validatorPhone = function(rule, value, callback) {
        if (value) {
          if (!/^1[3456789]\d{9}$/.test(value)) {
            callback(new Error('手机号格式有误！'))
          } else {
            callback()
          }
        }
        callback()
      }

      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,
          menu: false,
          height: 'auto',
          calcHeight: 80,
          tip: false,
          border: true,
          index: true,
          selection: true,
          addBtn: false,
          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,
            },
            {
              // hide: true,
              width: 220,
              overHidden: true,
              label: '地址',
              parent: false,
              prop: "houseName",
              searchSpan: 4,
              display: false,
              search: true,
            },
            {
              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,
            },

            {
              width: 220,
              overHidden: true,
              label: '小区名称',
              parent: false,
              prop: "districtName",
              searchSpan: 4,
              display: false,
              search: true,
            },

            {
              width: 110,
              label: "所属街道",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "townStreetName",
              search: true,
              searchSpan: 4
            },

            {
              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: "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,
              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
            },
          ]
        },
        data: [],
        excelForm: {},
        excelOption: {
          submitBtn: false,
          emptyBtn: false,
          column: [{
              label: '模板上传',
              prop: 'excelFile',
              type: 'upload',
              drag: true,
              loadText: '模板上传中，请稍等',
              span: 24,
              propsHttp: {
                res: 'data'
              },
              tip: '请上传 .xls,.xlsx 标准格式文件',
              action: "/api/blade-system/user/import-user"
            },
            {
              label: "数据覆盖",
              prop: "isCovered",
              type: "switch",
              align: "center",
              width: 80,
              dicData: [{
                  label: "否",
                  value: 0
                },
                {
                  label: "是",
                  value: 1
                }
              ],
              value: 0,
              slot: true,
              rules: [{
                required: true,
                message: "请选择是否覆盖",
                trigger: "blur"
              }]
            },
            {
              label: '模板下载',
              prop: 'excelTemplate',
              formslot: true,
              span: 24,
            }
          ]
        }
      }
    },
    watch: {},
    computed: {
      ...mapGetters(["userInfo", "permission"]),
      permissionList() {
        return {
          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")
            }
          }
        }
      },

      labelDispose() {
        return (list) => {
          return list.map(item => item.labelName).join(',')
        }
      }
    },
    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
                    }
                  })
                }
              })
            }
            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)
                })
                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
        this.query.parentId = 1001
        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 {
    height: 800px;
  }

  .el-scrollbar {
    height: 100%;
  }

  .box .el-scrollbar__wrap {
    overflow: scroll;
  }
</style>

 src/views/propertySupervision/propertyEvaluation.vue

New file
@@ -0,0 +1,8 @@
<template>
</template>

<script>
</script>

<style>
</style>

 src/views/propertySupervision/residentSupervision.vue

@@ -1,8 +1,1121 @@
<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-scope="{row, size}" slot="menu">
            <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, size}" slot="phoneNumber">
            <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
              {{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
            </el-button>
          </template>
          <template slot-scope="{row, size}" slot="idCard">
            <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
              v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
          </template>
          <template slot-scope="{row, size}" slot="householdLabelList">
            {{ labelDispose(row.householdLabelList) }}
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>

          <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 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>
            <div class="grid-container2">
              <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in labelData"
                @click="changLabel(item2)" :key="index2">
                {{ item2.name }}
              </div>
            </div>
          </div>

        </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 size="small" type="primary" @click="handleTemplate">
                点击下载<i class="el-icon-download el-icon--right"></i>
              </el-button>
            </template>
          </avue-form>
        </el-dialog>
      </basic-container>
    </el-col>
  </el-row>
</template>

<script>
  import {
    getKeynotePersonnelPage,
    remove,
    add,
    update,
    getDetatil,
    getDetatils
  } from "@/api/userHouse/list/houseHold.js"
  import {
    removeHouseholdLabel,
    saveOrUpdateHouseholdLabel
  } from "@/api/userHouse/list/userHouseList.js"
  import {
    getLabelList,
  } from '@/api/label/label'
  import {
    exportBlob
  } from "@/api/common"
  import {
    mapGetters
  } from "vuex"
  import {
    getToken
  } from '@/util/auth'
  import {
    downloadXls,
    findParentOrCur,
  } from "@/util/util"
  import {
    dateNow
  } from "@/util/date"
  import NProgress from 'nprogress'
  import 'nprogress/nprogress.css'
  import Qs from "qs"


  export default {
    data() {
      let isCardId = function(rule, value, callback) {
        // 15位和18位身份证号码的正则表达式
        var regIdCard =
          /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

        // 如果通过该验证，说明身份证格式正确，但准确性还需计算
        if (regIdCard.test(value)) {
          if (value.length == 18) {
            var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
              5, 8, 4, 2) // 将前17位加权因子保存在数组里
            var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后，可能产生的11位余数、验证码，也保存成数组
            var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
            for (var i = 0; i < 17; i++) {
              idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
            }

            var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
            var idCardLast = value.substring(17) // 得到最后一位身份证号码

            // 如果等于2，则说明校验码是10，身份证号码最后一位应该是X
            if (idCardMod == 2) {
              if (idCardLast == "X" || idCardLast == "x") {
                callback()
              } else {
                callback(new Error("身份证号格式有误！"))
              }
            } else {
              // 用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
              if (idCardLast == idCardY[idCardMod]) {
                callback()
              } else {
                callback(new Error("身份证号格式有误！"))
              }
            }
          } else {
            callback()
          }
        } else {
          //alert("身份证格式不正确!");
          callback(new Error("身份证号格式有误！"))
        }

        callback()
      }

      //手机号格式校验
      let validatorPhone = function(rule, value, callback) {
        if (value) {
          if (!/^1[3456789]\d{9}$/.test(value)) {
            callback(new Error('手机号格式有误！'))
          } else {
            callback()
          }
        }
        callback()
      }

      return {
        labelData: [],
        form: {},
        search: {},
        excelBox: false,
        selectionList: [],
        labelFlag: false,
        editLabelFlge: false,
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        option: {
          labelWidth: 144,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          menu: false,
          height: 'auto',
          calcHeight: 80,
          tip: false,
          border: true,
          index: true,
          selection: true,
          viewBtn: false,
          addBtn: false,
          delBtn: false,
          editBtn: false,
          dialogType: 'drawer',
          dialogClickModal: false,
          menuFixed: 'right',
          column: [{
              label: "与业主关系",
              prop: "relationship",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
              dataType: "number",
              hide: true,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
              rules: [{
                required: true,
                message: "请选择与业主关系",
                trigger: "blur",
              }],
            },

            {
              width: 110,
              label: "姓名",
              prop: "name",
              searchSpan: 3,
              searchLabelWidth: 66,
              search: true,
              rules: [{
                required: true,
                message: "请输入姓名",
                trigger: "blur",
              }],
            },

            {
              hide: true,
              label: "证件类型",
              prop: "cardType",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=cardType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              width: 160,
              display: true,
              label: "身份证号",
              prop: "idCard",
              search: true,
              searchSpan: 4,
              slot: true,
              rules: [{
                validator: isCardId,
                trigger: 'blur'
              }],
            },

            {
              hide: true,
              display: false,
              width: 160,
              label: "证件号码",
              prop: "cardNo",
            },

            {
              label: "出生日期",
              prop: "birthday",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              hide: true,
            },


            {
              width: 60,
              label: "性别",
              prop: "gender",
              type: "select",
              dicData: [{
                  label: "男",
                  value: 1
                },
                {
                  label: "女",
                  value: 0
                },
                {
                  label: "未知",
                  value: "3"
                }
              ],
            },

            {
              width: 120,
              label: "手机号码",
              prop: "phoneNumber",
              search: true,
              searchSpan: 4,
              slot: true,
              rules: [{
                  required: true,
                  message: "请输入手机号码",
                  trigger: "blur",
                },
                {
                  validator: validatorPhone,
                  trigger: 'blur'
                }
              ],
            },

            {
              label: "居住情况",
              prop: "residentialStatus",
              type: "select",
              hide: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              label: "其他联系方式",
              prop: "otherContact",
              hide: true,
              rules: [{
                validator: validatorPhone,
                trigger: 'blur'
              }],
            },

            {
              label: "是否主要联系人",
              prop: "isPrimaryContact",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=primaryContactType",
              dataType: "number",
              hide: true,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            // {
            // label: "关系",
            // prop: "roleType",
            // type: "select",
            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
            // dataType: "number",
            //     props: {
            //         label: "dictValue",
            //         value: "dictKey",
            //     },
            // },

            {
              width: 220,
              overHidden: true,
              label: '小区名称',
              prop: "aoiName",
              search: true,
              searchSpan: 4,
              display: false
            },

            {
              width: 110,
              label: "所属街道",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "townStreetName",
              search: true,
              searchSpan: 4
            },

            {
              width: 156,
              overHidden: true,
              label: "所属社区",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "neiName",
              search: true,
              searchSpan: 4
            },

            {
              width: 110,
              overHidden: true,
              label: "所属网格",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "gridName",
            },

            {
              width: 156,
              overHidden: true,
              label: "地址",
              prop: "address",
              display: false
            },


            {
              hide: true,
              parent: false,
              width: 160,
              label: "籍贯地区",
              prop: "nativePlaceAdcode",
              type: "tree",
              typeformat(item, label, value) {
                return item.addressDetail
              },
              change: ({
                value,
                column,
                item,
                dic
              }) => {
                item.addressDetail = findParentOrCur(dic, item.id)
              },
              props: {
                label: 'name',
                value: 'id'
              },
              dicUrl: `/api/blade-system/region/getBaseTree`,
            },

            {
              hide: true,
              label: "户籍类型",
              prop: "residentType",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              hide: true,
              parent: false,
              width: 160,
              label: "户籍地区",
              prop: "residentAdcode",
              type: "tree",
              typeformat(item, label, value) {
                return item.addressDetail
              },
              change: ({
                value,
                column,
                item,
                dic
              }) => {
                item.addressDetail = findParentOrCur(dic, item.id)
              },
              props: {
                label: 'name',
                value: 'id'
              },
              dicUrl: `/api/blade-system/region/getBaseTree`,
            },

            {
              label: "户籍地址",
              prop: "hukouRegistration",
              hide: true,
            },

            {
              disabled: false,
              label: "居住地区",
              prop: "homeAdcode",
              hide: true,
              type: 'select',
              props: {
                label: 'name',
                value: 'code'
              },
              dicUrl: `/api/blade-system/region/select?code=361102`,
            },

            {
              disabled: false,
              label: "现居住地",
              prop: "currentAddress",
              hide: true,
            },

            {
              width: 210,
              overHidden: true,
              label: "标签",
              prop: "householdLabelList",
              display: false
            },

            {
              label: "民族",
              prop: "ethnicity",
              type: "select",
              hide: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              label: "学历",
              prop: "education",
              type: "select",
              hide: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              hide: true,
              width: 160,
              label: "职业类别",
              prop: "occupation"
            },

            {
              label: "工作单位",
              prop: "employer",
              hide: true,
            },

            {
              hide: true,
              width: 160,
              label: "工作单位地址",
              prop: "cmpyRegAddr"
            },

            {
              label: "工作状态",
              prop: "workStatus",
              type: "select",
              hide: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              label: "婚姻状态",
              prop: "maritalStatus",
              type: "select",
              hide: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              hide: true,
              width: 160,
              label: "宗教信仰",
              prop: "religiousBelief",
            },

            {
              hide: true,
              label: "健康状态",
              prop: "healthStatus",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
              dataType: "number",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              disabled: true,
              hide: true,
              width: 160,
              label: "疾病名称",
              prop: "diseaseName"
            },

            {
              hide: true,
              width: 160,
              label: "外出去向",
              prop: "goOutWhere"
            },

            {
              hide: true,
              width: 160,
              label: "外出原因",
              prop: "goOutReason"
            },

            {
              hide: true,
              label: "外出时间",
              prop: "goOutTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              width: 160,
            },

            {
              hide: true,
              width: 160,
              label: "外出详址",
              prop: "goOutAddr"
            },

            {
              label: "车牌号",
              prop: "cardNumber",
              hide: true,
            },
          ]
        },
        data: [],

        excelForm: {},
        labelForm: {},
        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'
          }]
        },
        excelOption: {
          submitBtn: false,
          emptyBtn: false,
          column: [{
              label: '模板上传',
              prop: 'excelFile',
              type: 'upload',
              drag: true,
              loadText: '模板上传中，请稍等',
              span: 24,
              propsHttp: {
                res: 'data'
              },
              tip: '请上传 .xls,.xlsx 标准格式文件',
              action: "/api/blade-system/user/import-user"
            },
            {
              label: "数据覆盖",
              prop: "isCovered",
              type: "switch",
              align: "center",
              width: 80,
              dicData: [{
                  label: "否",
                  value: 0
                },
                {
                  label: "是",
                  value: 1
                }
              ],
              value: 0,
              slot: true,
              rules: [{
                required: true,
                message: "请选择是否覆盖",
                trigger: "blur"
              }]
            },
            {
              label: '模板下载',
              prop: 'excelTemplate',
              formslot: true,
              span: 24,
            }
          ]
        },
        currentLabel: {},
        currentRow: {},
        householdLabelList: [],
      }
    },
    watch: {
      'form.source': {
        handler(newData) {
          let currentAddressColumn = this.findObject(
            this.option.column,
            'currentAddress'
          )

          let homeAdcodeColumn = this.findObject(
            this.option.column,
            'homeAdcode'
          )

          if (newData == 1) {
            currentAddressColumn.disabled = true
            homeAdcodeColumn.disabled = true
          } else {
            currentAddressColumn.disabled = false
            homeAdcodeColumn.disabled = false
          }
        },
      },

      'form.cardType': {
        handler(newData) {
          let idCardColumn = this.findObject(
            this.option.column,
            'idCard'
          )

          let cardNoColumn = this.findObject(
            this.option.column,
            'cardNo'
          )

          if (newData == 111) {
            idCardColumn.display = true
            cardNoColumn.display = false
          } else {
            idCardColumn.display = false
            cardNoColumn.display = true
          }
        },
      },

      'form.healthStatus': {
        handler(newData) {
          let diseaseNameColumn = this.findObject(
            this.option.column,
            'diseaseName'
          )

          if (newData == 3) {
            diseaseNameColumn.disabled = false
          } else {
            diseaseNameColumn.disabled = true
          }
        },
      },
    },
    computed: {
      ...mapGetters(["userInfo", "permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.household_add, false),
          viewBtn: this.vaildData(this.permission.household_view, true),
          delBtn: this.vaildData(this.permission.household_delete, true),
          editBtn: this.vaildData(this.permission.household_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")
            }
          }
        }
      },

      labelDispose() {
        return (list) => {
          return list.map(item => item.labelName).join(',')
        }
      }
    },
    mounted() {},
    methods: {
      init(row) {
        console.log(JSON.stringify(row))
        this.query.regionCode = row.communityCode
        // this.onLoad(this.page, this.query)
      },
      onsubmit() {
        if (this.labelForm.color === '#EBEDF0') {
          let params = {
            householdId: this.currentRow.id,
            labelId: this.currentLabel.id
          }
          removeHouseholdLabel(params).then(res => {
            this.onLoad(this.page)

            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 = 1

          saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
            this.onLoad(this.page)

            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: 103
        }
        // 查询标签
        getLabelList(Object.assign(params)).then(res => {
          const data = res.data.data
          // this.labelData = data;
          // 查询详情
          getDetatils(item.id).then(res => {
            this.householdLabelList = res.data.data.householdLabelList
            // 将细类放到一起
            data.forEach(e => {
              e.children.forEach(f => {
                if (this.householdLabelList.length > 0) {
                  this.householdLabelList.forEach(h => {
                    if (Number(f.id) == h.labelId) {
                      f['color'] = h.color
                      f['remark'] = h.remark
                    }
                  })
                }
              })
            })
            this.labelData = data
            this.loading = false
          })
        })
      },
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.initFlag = false
          this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          })
          done()
        }, error => {
          window.console.log(error)
          loading()
        })
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.initFlag = false
          this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          })
          done()
        }, error => {
          window.console.log(error)
          loading()
        })
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            })
          })
      },
      searchReset() {
        this.query = {}
        this.treeDeptId = ''
        this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params
        this.page.currentPage = 1
        this.onLoad(this.page, params)
        done()
      },
      selectionChange(list) {
        this.selectionList = list
      },
      selectionClear() {
        this.selectionList = []
        // this.$refs.crud.toggleSelection();
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据")
          return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            })
            this.$refs.crud.toggleSelection()
          })
      },
      handleImport() {
        this.excelBox = true
      },
      uploadAfter(res, done, loading, column) {
        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-household/household/export-household?${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)) {
          getDetatils(this.form.id).then(res => {
            this.form = res.data.data
            done()
          })
        }
        this.initFlag = true
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query)
      },

      onLoad(page, params = {}) {
        this.query.parentId = 100
        this.loading = true
        getKeynotePersonnelPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = {
            ...res.data.data,
            records: res.data.data.records.map(item => {
              return {
                ...item,
                'phoneNumberflag': false,
                'idCardflag': 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 {
    height: 800px;
  }

  .grid-container2 {
    /* display: grid;
    grid-template-columns: auto auto auto auto;
    grid-gap: 10px; */
    display: flex;
    flex-wrap: wrap;
    padding-bottom: 20px;
  }

  .grid-item {
    padding: 8px 14px;
    border: 1px solid #dcdfe6;
    margin-right: 10px;
    margin-bottom: 10px;
    border-radius: 20px;
  }

  .grid-item:hover {
    background-color: #e8f4ff;
    color: #017BFC;
    cursor: pointer;
  }

  .el-scrollbar {
    height: 100%;
  }

  .box .el-scrollbar__wrap {
    overflow: scroll;
  }
</style>

 src/views/publicSecurity/bailReporting.vue

@@ -104,6 +104,7 @@
              label: "社区",
              prop: "communityName",
              searchSpan: 4,
          searchLabelWidth: 66,
              search: true,
              hide: true,
            },
@@ -112,15 +113,16 @@
              label: "小区",
              prop: "districtName",
              searchSpan: 4,
          searchLabelWidth: 66,
              search: true,
              hide: true,
            },
            {
              width: 100,
              span: 12,
              label: "名称",
              prop: "name",
              searchSpan: 4,
          label: "姓名",
          prop: "realName",
          searchSpan: 3,
              searchLabelWidth: 66,
              search: true,
            }, {
@@ -142,37 +144,11 @@
              search: true,
            },
            {
              width: 144,
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,
            },
            {
              width: 100,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              label: '审核状态',
              prop: 'status',
              type: 'radio',
              slot: true,
              dicData: [{
                label: '待审核',
                value: 1
              }, {
                label: '已审核',
                value: 2
              }, {
                label: '未通过',
                value: 3
              }]
            },
            {
              width: 110,
              label: "所属街道",
              // hide: true,
              searchSpan: 4,
              search: true,
          // search: true,
              parent: false,
              prop: "streetCode",
              type: "tree",
@@ -193,7 +169,7 @@
              searchSpan: 4,
              label: "所属社区",
              prop: "neiCode",
              search: true,
          // search: true,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree",
              props: {
@@ -214,7 +190,7 @@
              searchSpan: 4,
              type: 'tree',
              searchLabelWidth: 66,
              search: true,
          // search: true,
              parent: false,
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
@@ -232,6 +208,33 @@
              display: true,
              // hide: true,
            },
        // {
        //   width: 144,
        //   label: "创建时间",
        //   prop: "createTime",
        //   searchSpan: 4,
        // },
        {
          width: 100,
          addDisplay: false,
          editDisplay: false,
          viewDisplay: false,
          label: '审核状态',
          prop: 'status',
          type: 'radio',
          slot: true,
          dicData: [{
            label: '待审核',
            value: 1
          }, {
            label: '已审核',
            value: 2
          }, {
            label: '未通过',
            value: 3
          }]
        },


          ],
        },
@@ -257,7 +260,7 @@
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.place_add, true),
        addBtn: this.vaildData(this.permission.place_add, false),
          viewBtn: this.vaildData(this.permission.place_view, true),
          delBtn: this.vaildData(this.permission.place_delete, true),
          editBtn: this.vaildData(this.permission.place_edit, true),

 src/views/publicSecurity/components/communityKeyNotePersonnel.vue

@@ -5,8 +5,36 @@
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange">

      <template slot-scope="scope" slot="menu">
      <!-- <template slot-scope="scope" slot="menu">
        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
        </el-button>
      </template> -->

      <template slot-scope="{row, size}" slot="number1">
        <el-button :size="size" type="text" @click="lookDetail(row, '19')">
          {{ row.number1 }}
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="number2">
        <el-button :size="size" type="text" @click="lookDetail(row, '20')">
          {{ row.number2}}
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="number3">
        <el-button :size="size" type="text" @click="lookDetail(row, '22')">
          {{ row.number3}}
        </el-button>
      </template>
      <template slot-scope="{row, size}" slot="number4">
        <el-button :size="size" type="text" @click="lookDetail(row, '23')">
          {{ row.number4}}
        </el-button>
      </template>
      <template slot-scope="{row, size}" slot="number5">
        <el-button :size="size" type="text" @click="lookDetail(row, '1025')">
          {{ row.number5 }}
        </el-button>
      </template>
    </avue-crud>
@@ -56,7 +84,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          // menu: false,
          menu: false,
          border: true,
          //stripe:true,
          index: true,
@@ -162,7 +190,8 @@
        this.onLoad(this.page)
      },

      lookDetail(row) {
      lookDetail(row, type) {
        row.labelId = type
        this.auditBasePopup = true
        var that = this
        this.$nextTick(() => {

 src/views/publicSecurity/components/userHouseList.vue

@@ -839,8 +839,14 @@
    mounted() {},
    methods: {
      init(row) {
        console.log(JSON.stringify(row))
        if (row.regionCode) {
          this.query.regionCode = row.regionCode
        }
        if (row.communityCode) {
        this.query.regionCode = row.communityCode
        }
        this.query.labelId = row.labelId
        this.query.parentId = 103
        this.onLoad(this.page, this.query)
      },
      onsubmit() {
@@ -864,6 +870,7 @@
          this.labelForm.houseCode = this.currentRow.houseCode
          this.labelForm.householdId = this.currentRow.id
          this.labelForm.labelId = this.currentLabel.id
          this.labelForm.userId = this.currentRow.associatedUserId
          this.labelForm.lableType = 1

          saveOrUpdateHouseholdLabel(this.labelForm).then(res => {

 src/views/publicSecurity/keynotePersonnelManage.vue

@@ -9,11 +9,50 @@
        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="regionName">
        <el-button :size="size" type="text" @click="lookDetail(row)">
          {{ row.regionName }}
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="number1">
        <el-button :size="size" type="text" @click="showStringDispose(row, '19')">
          {{ row.number1 }}
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="number2">
        <el-button :size="size" type="text" @click="showStringDispose(row, '20')">
          {{ row.number2}}
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="number3">
        <el-button :size="size" type="text" @click="showStringDispose(row, '22')">
          {{ row.number3}}
        </el-button>
      </template>
      <template slot-scope="{row, size}" slot="number4">
        <el-button :size="size" type="text" @click="showStringDispose(row, '23')">
          {{ row.number4}}
        </el-button>
      </template>
      <template slot-scope="{row, size}" slot="number5">
        <el-button :size="size" type="text" @click="showStringDispose(row, '1025')">
          {{ row.number5 }}
        </el-button>
      </template>
    </avue-crud>

    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="80%">
      <communityKeyNotePersonnel ref="communityKeyNotePersonnel"></communityKeyNotePersonnel>
    </el-dialog>

    <el-dialog title="" append-to-body :visible.sync="userPopup" width="80%">
      <userHouseList ref="userHouseList"></userHouseList>
    </el-dialog>

  </basic-container>
</template>

@@ -26,6 +65,8 @@
  import {
    mapGetters
  } from "vuex"

  import userHouseList from './components/userHouseList.vue'

  import communityKeyNotePersonnel from './components/communityKeyNotePersonnel.vue'

@@ -56,8 +97,8 @@
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          // menu: false,
          // menuWidth: 280,
          menu: false,
          border: true,
          //stripe:true,
          index: true,
@@ -125,6 +166,7 @@
        data: [],

        auditBasePopup: false,
        userPopup: false,
      }
    },

@@ -136,7 +178,7 @@

    components: {
      communityKeyNotePersonnel,
      // hotelReporting,
      userHouseList,
      // labelReporting,
    },

@@ -168,6 +210,15 @@
        this.onLoad(this.page)
      },

      showStringDispose(row, type) {
        row.labelId = type
        this.userPopup = true
        var that = this
        this.$nextTick(() => {
          that.$refs.userHouseList.init(row)
        })
      },

      lookDetail(row) {
        this.auditBasePopup = true
        var that = this

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -105,25 +105,17 @@
              label: "社区",
              prop: "communityName",
              searchSpan: 4,
          searchLabelWidth: 66,
              search: true,
              hide: true,
            },
            {
              span: 12,
              label: "小区",
              prop: "districtName",
              searchSpan: 4,
              search: true,
              hide: true,
            },

            {
              width: 110,
              span: 12,
              label: "名称",
          label: "场所负责人",
              prop: "realName",
              searchSpan: 4,
              searchLabelWidth: 66,
          searchLabelWidth: 100,
              search: true,
            }, {
              width: 120,
@@ -149,12 +141,51 @@
                trigger: "blur",
              }, ],
            }, {
              width: 144,
              label: "创建时间",
              prop: "createTime",
          width: 110,
          label: "所属街道",
          // hide: true,
          // search: true,
          parent: false,
              searchSpan: 4,

          prop: "streetCode",
          type: "tree",
          dicUrl: "/api/blade-system/region/getTownTree",
          props: {
            label: "name",
            value: "id"
            },
          rules: [{
            required: true,
            message: "请选择所属街道",
            trigger: "blur",
          },],
        }, {
          width: 156,
          // hide: true,
          parent: false,
          searchSpan: 4,
          label: "所属社区",
          prop: "neiCode",
          // search: false,
          type: "tree",
          dicUrl: "/api/blade-system/region/tree",
          props: {
            label: "name",
            value: "id",
          },
          rules: [{
            required: true,
            message: "请选择所属社区",
            trigger: "blur",
          },],
        },
        //  {
        //   width: 144,
        //   label: "创建时间",
        //   prop: "createTime",
        //   searchSpan: 4,

        // },

            {
              width: 100,
@@ -175,67 +206,6 @@
                label: '未通过',
                value: 3
              }]
            }, {
              width: 110,
              label: "所属街道",
              // hide: true,
              search: true,
              parent: false,
              searchSpan: 4,
              prop: "streetCode",
              type: "tree",
              dicUrl: "/api/blade-system/region/getTownTree",
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: "请选择所属街道",
                trigger: "blur",
              }, ],
            }, {
              width: 156,
              // hide: true,
              search: true,
              parent: false,
              searchSpan: 4,
              label: "所属社区",
              prop: "neiCode",
              // search: false,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree",
              props: {
                label: "name",
                value: "id",
              },
              rules: [{
                required: true,
                message: "请选择所属社区",
                trigger: "blur",
              }, ],
            }, {
              width: 220,
              overHidee: true,
              // hide: true,
              searchLabelWidth: 66,
              search: true,
              parent: false,
              searchSpan: 4,
              label: "小区",
              prop: "aoiCode",
              // search: false,
              type: "tree",
              dicUrl: "/api/blade-district/district/getDistrictTree",
              props: {
                label: "name",
                value: "aoiCode"
              },
              rules: [{
                required: true,
                message: "请选择小区",
                trigger: "blur",
              }, ],
            }, {
              width: 100,
              addDisplay: false,
@@ -291,7 +261,7 @@
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.place_add, true),
        addBtn: this.vaildData(this.permission.place_add, false),
          viewBtn: this.vaildData(this.permission.place_view, true),
          delBtn: this.vaildData(this.permission.place_delete, true),
          editBtn: this.vaildData(this.permission.place_edit, true),

 src/views/userHouse/houseHoldList.vue

@@ -3,25 +3,25 @@
        <el-col :span="24">
            <basic-container>
                <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
                    v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate"
                    @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
                    @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
          :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
          @refresh-change="refreshChange" @on-load="onLoad">
                    <template slot="menuLeft">
                        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
                            @click="handleDelete">删 除
                        </el-button>
                        <el-button type="success" size="small" plain v-if="this.permission.household_import"
                            icon="el-icon-upload2" @click="handleImport">导入
            <el-button type="success" size="small" plain v-if="this.permission.household_import" icon="el-icon-upload2"
              @click="handleImport">导入
                        </el-button>
                        <el-button type="warning" size="small" plain v-if="this.permission.household_export"
                            icon="el-icon-download" @click="handleExport">导出
            <el-button type="warning" size="small" plain v-if="this.permission.household_export" icon="el-icon-download"
              @click="handleExport">导出
                        </el-button>
                    </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="manageLabel(row)">标签
            <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, size}" slot="phoneNumber">
@@ -39,8 +39,8 @@
                </avue-crud>
                <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>

                    <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
                        ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
          <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">
@@ -59,8 +59,8 @@
                            </el-col>
                        </el-row>
                        <div class="grid-container2" v-if="item.children">
                            <div class="grid-item" :style="{ backgroundColor: item2.color }"
                                v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
              <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in item.children"
                @click="changLabel(item2)" :key="index2">
                                {{ item2.name }}
                            </div>
                        </div>
@@ -72,8 +72,7 @@
          </span> -->
                </el-dialog>

                <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
                    width="655px">
        <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">
@@ -131,13 +130,16 @@
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import Qs from "qs"
import { lintOnSave } from "../../../vue.config"
  import {
    lintOnSave
  } from "../../../vue.config"

export default {
    data () {
        let isCardId = function (rule, value, callback) {
            // 15位和18位身份证号码的正则表达式
            var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
        var regIdCard =
          /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

            // 如果通过该验证，说明身份证格式正确，但准确性还需计算
            if (regIdCard.test(value)) {
@@ -224,8 +226,7 @@
                dialogType: 'drawer',
                dialogClickModal: false,
                menuFixed: 'right',
                column: [
                    {
          column: [{
                        label: "与业主关系",
                        prop: "relationship",
                        type: "select",
@@ -236,13 +237,11 @@
                            label: "dictValue",
                            value: "dictKey",
                        },
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择与业主关系",
                                trigger: "blur",
                            }
                        ],
              }],
                    },

                    {
@@ -252,13 +251,11 @@
                        searchSpan: 3,
                        searchLabelWidth: 66,
                        search: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入姓名",
                                trigger: "blur",
                            }
                        ],
              }],
                    },

                    {
@@ -282,12 +279,10 @@
                        search: true,
                        searchSpan: 4,
                        slot: true,
                        rules: [
                            {
              rules: [{
                                validator: isCardId,
                                trigger: 'blur'
                            }
                        ],
              }],
                    },

                    {
@@ -335,8 +330,7 @@
                        search: true,
                        searchSpan: 4,
                        slot: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入手机号码",
                                trigger: "blur",
@@ -365,12 +359,10 @@
                        label: "其他联系方式",
                        prop: "otherContact",
                        hide: true,
                        rules: [
                            {
              rules: [{
                                validator: validatorPhone,
                                trigger: 'blur'
                            }
                        ],
              }],
                    },

                    {
@@ -460,7 +452,12 @@
                        typeformat (item, label, value) {
                            return item.addressDetail
                        },
                        change: ({ value, column, item, dic }) => {
              change: ({
                value,
                column,
                item,
                dic
              }) => {
                            item.addressDetail = findParentOrCur(dic, item.id)
                        },
                        props: {
@@ -493,7 +490,12 @@
                        typeformat (item, label, value) {
                            return item.addressDetail
                        },
                        change: ({ value, column, item, dic }) => {
              change: ({
                value,
                column,
                item,
                dic
              }) => {
                            item.addressDetail = findParentOrCur(dic, item.id)
                        },
                        props: {
@@ -862,7 +864,8 @@
            if (this.labelForm.color === '#EBEDF0') {
                let params = {
                    householdId: this.currentRow.id,
                    labelId: this.currentLabel.id
            labelId: this.currentLabel.id,
            // userId: this.currentLabel.id
                }
                removeHouseholdLabel(params).then(res => {
                    this.onLoad(this.page)
@@ -879,6 +882,7 @@
                this.labelForm.houseCode = this.currentRow.houseCode
                this.labelForm.householdId = this.currentRow.id
                this.labelForm.labelId = this.currentLabel.id
          this.labelForm.userId = this.currentRow.associatedUserId
                this.labelForm.lableType = 1

                saveOrUpdateHouseholdLabel(this.labelForm).then(res => {

 vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      "/api": {
        //本地服务接口地址
        target: "https://srgdjczzxtpt.com:2080/api",
        // target: "https://srgdjczzxtpt.com:2080/api",
        // target: "http://z4042833u6.wicp.vip",
        // target: "http://localhost:9528",
        target:"http://192.168.0.109:9528",
        target: "http://localhost:9528",
        // target:"http://192.168.0.109:9528",
        //远程演示服务地址,可用于直接启动项目
        //target: 'https://saber.bladex.cn/api',
        changeOrigin: true,