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

shuishen

2024-01-22 32a7e1f37b2637ff780d757f25fa097d215f6e11

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

 package-lock.json

@@ -5484,7 +5484,11 @@
    },
    "node_modules/echarts": {
      "version": "5.4.3",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
=======
      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
      "dependencies": {
        "tslib": "2.3.0",
@@ -14957,7 +14961,11 @@
    },
    "node_modules/tslib": {
      "version": "2.3.0",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
=======
      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
    },
    "node_modules/tty-browserify": {
@@ -16911,7 +16919,11 @@
    },
    "node_modules/zrender": {
      "version": "5.4.4",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
=======
      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
      "dependencies": {
        "tslib": "2.3.0"
@@ -21353,7 +21365,11 @@
    },
    "echarts": {
      "version": "5.4.3",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
=======
      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
      "requires": {
        "tslib": "2.3.0",
@@ -29241,7 +29257,11 @@
    },
    "tslib": {
      "version": "2.3.0",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
=======
      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
    },
    "tty-browserify": {
@@ -30861,7 +30881,11 @@
    },
    "zrender": {
      "version": "5.4.4",
<<<<<<< HEAD
      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
=======
      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
      "requires": {
        "tslib": "2.3.0"

 src/views/grid/gridman.vue

@@ -56,12 +56,13 @@
                        prop: "communityCode",
                        search: false,
                        type: "tree",
                        dataType: 'string',
                        dicUrl: "/api/blade-system/region/tree",
                        props: {
                            label: "name",
                            value: "id",
                        },
                        cascader: ["gridId"],
                        cascader: ["gridCode"],
                        rules: [
                            {
                                required: true,
@@ -73,13 +74,13 @@

                    {
                        label: "所属网格",
                        prop: "gridId",
                        prop: "gridCode",
                        hide: true,
                        type: "tree",
                        cell: true,
                        props: {
                            label: "gridName",
                            value: "id",
                            value: "gridCode",
                        },
                        dicUrl:
                            "/api/blade-grid/grid/getGridList?communityCode={{communityCode}}",

 src/views/property/propertyCompany.vue

@@ -117,7 +117,7 @@
              search: true,
              span: 18,
              row: true,
              width: 260,
              width: 200,
              rules: [{
                required: true,
                message: "请输入物业公司名称",
@@ -166,7 +166,7 @@
              prop: 'area',
              type: 'select',
              span: 6,
              labelWidth: 60,
              width: 260,
              props: {
                label: 'name',
                value: 'code'
@@ -185,10 +185,68 @@
              prop: "address",
              span: 18,
              row: true,
              width: 160,
            },
            {
              label: "社会信用代码",
              prop: "socialCreditCode",
              searchSpan: 5,
              // searchLabelWidth: 124,
              search: true,
              span: 18,
              row: true,
              width: 100,

            },
            {
              label: "基础信息分",
              prop: "baseInfoScore",
              display: false,
            },
            {
              label: "经营信息分",
              prop: "operateinfoScore",
              display: false,
            },
            {
              label: "纳税信息分",
              prop: "taxInfoScore",
              display: false,
            },
            {
              label: "党建信息分",
              prop: "partyBuildingInfoScore",
              display: false,
            },
            {
              label: "企业良好信息分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "项目良好信息分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "违法违规行为分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "评价平均分",
              prop: "evaluateScore",
              display: false,
            },
            {
              label: "街道社区分",
              prop: "streetScore",
              display: false,
            },
            {
              label: "总分",
              prop: "allScore",
              display: false,
            },

            {

 src/views/property/propertyCompanyDistrict.vue

@@ -2,10 +2,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @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-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @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 size="small" icon="el-icon-delete" plain v-if="permission.propertyCompanyDistrict_delete"
                    @click="handleDelete">删 除
@@ -70,8 +69,7 @@
                viewBtn: true,
                selection: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
@@ -132,7 +130,7 @@
                        type: 'tree',
                        span: 12,
                        dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
                        cascader: ['userId'],
              cascader: ['userId', 'principal'],
                        props: {
                            label: "name",
                            value: "id"
@@ -148,8 +146,15 @@
                        label: '项目经理',
                        prop: 'principal',
                        span: 12,
                        search: true,
                        searchSpan: 4,
              type: "tree",
              multiple: true,
              remote: true,
              props: {
                label: 'name',
                value: 'id'
              },
              hide: true,
              dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
                        rules: [{
                            required: true,
                            message: "请输入项目经理",
@@ -169,7 +174,8 @@
                        {
                            validator: validatorPhone,
                            trigger: 'blur'
                        }],
                }
              ],
                    },
                    {
                        label: "物业成员",

 src/views/propertySupervision/propertyCompanyDistrict.vue

New file
@@ -0,0 +1,398 @@
<!-- 物业公司管理 -->
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @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 size="small" icon="el-icon-delete" plain v-if="permission.propertyCompanyDistrict_delete"
          @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import {
    getList,
    remove,
    update,
    add,
    getPropertyCompanyDistrict
  } from "@/api/property/propertyCompanyDistrict"
  import {
    mapGetters
  } from "vuex"
  import website from '@/config/website'
  import func from "@/util/func"
  export default {
    data() {
      //手机号格式校验
      let validatorPhone = function(rule, value, callback) {
        if (value) {
          if (!/^1[3456789]\d{9}$/.test(value)) {
            callback(new Error('手机号格式有误！'))
          } else {
            callback()
          }
        }
        callback()
      }

      return {
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0,
        },
        datetime: "",
        selectionList: [],
        option: {
          labelWidth: 120,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 210,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 1150,
          tip: false,
          border: true,
          delBtn: false,
          editBtn: false,
          //stripe:true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          column: [{
              overHidden: true,
              label: '小区名称',
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "districtName",
              search: true,
              searchSpan: 4,
              rules: [{
                required: true,
                message: "请输入小区名称",
                trigger: "blur",
              }],
            },

            {
              hide: true,
              parent: false,
              label: "小区",
              prop: "districtId",
              search: false,
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "id"
              },
              defaultExpandedKeys: ["361102003"],
              span: 12,
              width: 260,
              rules: [{
                required: true,
                message: "请选择小区",
                trigger: "blur",
              }, ],
            },

            {
              overHidden: true,
              label: "物业公司",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "propertyCompanyName",
              search: true,
              searchSpan: 4,
              rules: [{
                required: true,
                message: "请输入物业公司",
                trigger: "blur",
              }],
            },

            {
              hide: true,
              label: '物业公司',
              prop: 'propertyCompanyId',
              type: 'tree',
              span: 12,
              dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
              cascader: ['userId'],
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: '请选择物业公司',
                trigger: 'blur'
              }]
            },
            {
              width: 110,
              label: '项目经理',
              prop: 'principal',
              span: 12,
              search: true,
              searchSpan: 4,
              rules: [{
                required: true,
                message: "请输入项目经理",
                trigger: "blur",
              }, ],
            },
            {
              width: 120,
              label: '联系方式',
              prop: 'principalPhone',
              span: 12,
              rules: [{
                  required: true,
                  message: "请输入联系方式",
                  trigger: "blur",
                },
                {
                  validator: validatorPhone,
                  trigger: 'blur'
                }
              ],
            },
            {
              label: "物业成员",
              prop: "userId",
              span: 12,
              type: "tree",
              multiple: true,
              remote: true,
              props: {
                label: 'name',
                value: 'id'
              },
              hide: true,
              dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
            },
            {
              width: 100,
              label: "物业阶段",
              span: 12,
              prop: "propertyStage",
              type: "select",
              search: true,
              searchSpan: 4,
              dataType: "number",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propertyStage",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },
            {
              width: 100,
              label: "合同开始时间",
              prop: "startTime",
              span: 12,
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              rules: [{
                required: true,
                message: "请选择合同开始时间",
                trigger: "blur",
              }, ],
            },
            {
              width: 100,
              label: "合同结束时间",
              prop: "endTime",
              span: 12,
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              rules: [{
                required: true,
                message: "请选择合同结束时间",
                trigger: "blur",
              }, ],
            },
          ],
        },
        data: [],
      }
    },
    watch: {},
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.propertyCompanyDistrict_add, true),
          viewBtn: this.vaildData(this.permission.propertyCompanyDistrict_view, true),
          delBtn: this.vaildData(this.permission.propertyCompanyDistrict_delete, true),
          editBtn: this.vaildData(this.permission.propertyCompanyDistrict_edit, true),
        }
      },
      ids() {
        let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id)
        })
        return ids.join(",")
      },
    },
    methods: {
      rowSave(row, done, loading) {
        row.userId = func.join(row.userId)
        add(row).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      rowUpdate(row, index, done, loading) {
        row.userId = func.join(row.userId)
        update(row).then(
          () => {
            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.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()
          })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getPropertyCompanyDistrict(this.form.id).then((res) => {
            this.form = res.data.data
          })
        }
        // con
        done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {
          dateTime
        } = this.query
        let values = {
          ...params,
        }
        if (dateTime) {
          values = {
            ...params,
            startTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          }
          values.dateTime = null
        }
        this.loading = true
        getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data
          this.page.total = data.total
          this.data = data.records
          this.loading = false
          this.selectionClear()
        })
      }
    }
  }
</script>

<style>
  .avue-upload__icon {
    line-height: 6;
  }
</style>

 src/views/propertySupervision/propertyEvaluation.vue

@@ -1,8 +1,606 @@
<!-- 物业公司管理 -->
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @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 size="small" icon="el-icon-delete" plain v-if="permission.propertyCompany_delete"
          @click="handleDelete">删 除
        </el-button>


      </template>

      <template slot-scope="{row, size, index}" slot="menu">
        <el-button :size="size" v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline"
          @click="openPayConfig(row)">商户配置
        </el-button>

        <el-button :size="size" v-if="permission.property_evaluation" icon="el-icon-circle-plus-outline" type="text"
          @click="addProperty(row)">物业评定
        </el-button>
      </template>
    </avue-crud>

    <el-dialog title="商户配置" append-to-body :visible.sync="payInfoVisible" top="10vh" width="70%">
      <el-tabs v-model="currentTab">
        <el-tab-pane label="微信商户配置" name="wxInfo">
          <avue-form ref="wxForm" :option="wxPayOption" v-model="wxPayForm" @submit="wxSubmit">
          </avue-form>
        </el-tab-pane>
        <el-tab-pane label="支付宝商户配置" name="second">
          <avue-form ref="aliForm" :option="aliPayOption" v-model="aliPayForm" @submit="aliSubmit">
          </avue-form>
        </el-tab-pane>

      </el-tabs>

      <!--      <div slot="footer" class="dialog-footer">-->
      <!--        <el-button @click="payInfoVisible = false">取 消</el-button>-->
      <!--        <el-button type="primary"@click="submit">提 交</el-button>-->
      <!--      </div>-->

    </el-dialog>

    <!-- <propertyEdit ref="propertyEdit"></propertyEdit> -->


  </basic-container>
</template>

<script>
  import {
    getList,
    remove,
    update,
    add,
    getPropertyCompany,
    getPayConfig,
    saveOrUpdateWx,
    saveOrUpdateAli
  } from "@/api/property/propertyCompany"
  import {
    mapGetters
  } from "vuex"
  import website from '@/config/website'
  import func from "@/util/func"

  // import propertyEdit from './components/propertyEdit.vue'

  const labelWidth = 120
  export default {
    components: {
      // propertyEdit
    },
    data() {
      return {
        currentTab: "wxInfo",
        payInfoVisible: false,
        currentRow: {},

        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0,
        },
        datetime: "",
        selectionList: [],
        option: {
          labelWidth: 120,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          menu: false,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 1150,
          tip: false,
          border: true,
          //stripe:true,
          index: true,
          // viewBtn: true,
          delBtn: false,
          selection: true,
          dialogClickModal: false,
          column: [{
              overHidden: true,
              label: "物业公司名称",
              prop: "name",
              searchSpan: 5,
              searchLabelWidth: 124,
              search: true,
              span: 18,
              row: true,
              width: 200,
              rules: [{
                required: true,
                message: "请输入物业公司名称",
                trigger: "blur",
              }, ],
            },
            {
              label: '省份',
              prop: 'province',
              type: 'select',
              props: {
                label: 'name',
                value: 'code'
              },
              hide: true,
              span: 6,
              cascader: ['city'],
              dicUrl: `/api/blade-system/region/select`,
              rules: [{
                required: true,
                message: '请选择省份',
                trigger: 'blur'
              }]
            },
            {
              label: '城市',
              prop: 'city',
              type: 'select',
              span: 6,
              labelWidth: 60,
              cascader: ['area'],
              props: {
                label: 'name',
                value: 'code'
              },
              hide: true,
              dicUrl: `/api/blade-system/region/select?code={{key}}`,
              rules: [{
                required: true,
                message: '请选择城市',
                trigger: 'blur'
              }]
            },
            {
              label: '地区',
              prop: 'area',
              type: 'select',
              span: 6,
              width: 260,
              props: {
                label: 'name',
                value: 'code'
              },
              hide: true,
              dicUrl: `/api/blade-system/region/select?code={{key}}`,
              rules: [{
                required: true,
                message: '请选择地区',
                trigger: 'blur'
              }]
            },
            {
              overHidden: true,
              label: "地址",
              prop: "address",
              span: 18,
              row: true,
              width: 160,
            },
            {
              label: "社会信用代码",
              prop: "socialCreditCode",
              searchSpan: 5,
              // searchLabelWidth: 124,
              search: true,
              span: 18,
              row: true,
              width: 100,

            },
            {
              label: "基础信息分",
              prop: "baseInfoScore",
              display: false,
            },
            {
              label: "经营信息分",
              prop: "operateinfoScore",
              display: false,
            },
            {
              label: "纳税信息分",
              prop: "taxInfoScore",
              display: false,
            },
            {
              label: "党建信息分",
              prop: "partyBuildingInfoScore",
              display: false,
            },
            {
              label: "企业良好信息分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "项目良好信息分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "违法违规行为分",
              prop: "goodCorporateScore",
              display: false,
            },
            {
              label: "评价平均分",
              prop: "evaluateScore",
              display: false,
            },
            {
              label: "街道社区分",
              prop: "streetScore",
              display: false,
            },
            {
              label: "总分",
              prop: "allScore",
              display: false,
            },

            {
              label: "简介",
              prop: "remark",
              component: "AvueUeditor",
              options: {
                action: "/api/blade-resource/oss/endpoint/put-file-attach",
                props: {
                  res: "data",
                  url: "link",
                },
              },
              hide: true,
              minRows: 6,
              span: 24,
            },
          ],
        },
        data: [],

        wxPayForm: {},
        wxPayOption: {
          emptyBtn: false,
          height: "auto",
          calcHeight: 180,
          //stripe:true,
          column: [{
              label: "appId",
              labelWidth: labelWidth,
              prop: "appId",
              span: 24,
              rules: [{
                required: true,
                message: "请输入appId",
                trigger: ["blur", "change"]
              }, ],
            },
            {
              label: "mch-id",
              labelWidth: labelWidth,
              prop: "mchId",
              span: 24,
              rules: [{
                required: true,
                message: "请输入mch-id",
                trigger: ["blur", "change"]
              }, ],
            },
            {
              label: "mchKey",
              labelWidth: labelWidth,
              prop: "mchKey",
              rules: [{
                required: true,
                message: "请输入mchKey",
                trigger: ["blur", "change"]
              }, ],
              span: 24,
            },
            {
              label: "appSecret",
              labelWidth: labelWidth,
              prop: "appSecret",
              rules: [{
                required: true,
                message: "请输入appSecret",
                trigger: ["blur", "change"]
              }, ],
              span: 24,
            },
            {
              label: '安全证书',
              labelWidth: labelWidth,
              prop: 'keyPath',
              type: 'upload',
              drag: true,
              limit: 1,
              loadText: '上传中，请稍等',
              span: 24,
              action: "/api/blade-resource/oss/endpoint/put-file",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              rules: [{
                required: true,
                message: "请上传安全证书",
                trigger: ["blur", "change"]
              }, ],
            },
          ],
        },

        aliPayForm: {},
        aliPayOption: {
          emptyBtn: false,
          height: "auto",
          calcHeight: 180,
          //stripe:true,
          column: [{
              label: "appId",
              labelWidth: labelWidth,
              prop: "appId",
              span: 24,
              rules: [{
                required: true,
                message: "请输入appId",
                trigger: ["blur", "change"]
              }, ],
            },
            {
              label: "privateKey",
              labelWidth: labelWidth,
              prop: "privateKey",
              span: 24,
              rules: [{
                required: true,
                message: "请输入privateKey",
                trigger: ["blur", "change"]
              }, ],
            },
            {
              label: "publicKey",
              labelWidth: labelWidth,
              prop: "publicKey",
              span: 24,
              rules: [{
                required: true,
                message: "请输入publicKey",
                trigger: ["blur", "change"]
              }, ],
            },
          ],
        }

      }
    },
    watch: {},
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.propertyCompany_add, true),
          viewBtn: this.vaildData(this.permission.propertyCompany_view, true),
          delBtn: this.vaildData(this.permission.propertyCompany_delete, true),
          editBtn: this.vaildData(this.permission.propertyCompany_edit, true),
        }
      },
      ids() {
        let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id)
        })
        return ids.join(",")
      },
    },
    created() {},
    methods: {


      addProperty(row) {
        this.$refs.propertyEdit.init(row);
      },

      aliSubmit(form, done) {

        console.log("支付宝商户配置", this.aliPayForm)

        this.aliPayForm.propertyCompanyId = this.currentRow.id
        saveOrUpdateAli(this.aliPayForm).then(res => {
          this.$message({
            type: "success",
            message: "操作成功!",
          })
          done()
        })

      },

      wxSubmit(form, done) {
        this.wxPayForm.propertyCompanyId = this.currentRow.id

        this.wxPayForm.keyPath = func.join(this.wxPayForm.keyPath)
        if (this.wxPayForm.keyPath.length > 0) {
          var urls = []
          var split = this.wxPayForm.keyPath.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          this.wxPayForm.keyPath = urls.join(",")
        }

        console.log("微信商户配置", this.wxPayForm)
        saveOrUpdateWx(this.wxPayForm).then(res => {
          this.$message({
            type: "success",
            message: "操作成功!",
          })
          done()
        })
      },

      openPayConfig(row) {
        this.currentRow = row
        //调接口获取商户数据
        getPayConfig(row.id).then(res => {
          let data = res.data.data
          this.wxPayForm = data.wxPayInfo ? data.wxPayInfo : {}
          this.aliPayForm = data.aliPayInfo ? data.aliPayInfo : {}
        })
        this.payInfoVisible = !this.payInfoVisible
      },

      rowSave(row, done, loading) {
        row.userid = this.userInfo.user_id
        add(row).then(
          () => {
            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.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.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()
          })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getPropertyCompany(this.form.id).then((res) => {
            this.form = res.data.data
          })
        }
        // con
        done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {
          dateTime
        } = this.query
        let values = {
          ...params,
        }
        if (dateTime) {
          values = {
            ...params,
            startTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          }
          values.dateTime = null
        }
        this.loading = true
        getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data
          this.page.total = data.total
          this.data = data.records
          this.loading = false
          this.selectionClear()
        })
      }
    }
  }
</script>

<style>
  .avue-upload__icon {
    line-height: 6;
  }
</style>

 src/views/publicSecurity/bailReporting.vue

@@ -5,12 +5,12 @@
      @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, index}" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
        <el-button :size="size" type="text" icon="el-icon-view"  v-if="permission.bail_view"  plain @click="lookDetail(row, 0)">查 看
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1" plain
        <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1 && permission.bail_check" plain
          @click="lookDetail(row, 1)">审 核
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-delete" plain @click="rowDel(row)">删 除
        <el-button :size="size" type="text" icon="el-icon-delete" v-if="permission.bail_del"   plain @click="rowDel(row)">删 除
        </el-button>
      </template>

@@ -259,11 +259,14 @@
  computed: {
    ...mapGetters(["permission", "userInfo"]),
    permissionList() {

         console.log("permission===>",this.permission);

      return {
        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),
        addBtn: this.vaildData(this.permission.bail_add, false),
        viewBtn: this.vaildData(this.permission.bail_view, true),
        delBtn: this.vaildData(this.permission.bail_del, true),
        // editBtn: this.vaildData(this.permission.place_edit, true),
      }
    },
    ids() {

 src/views/publicSecurity/components/userHouseList.vue

@@ -840,7 +840,7 @@
    methods: {
      init(row) {
        if (row.regionCode) {
          this.query.regionCode = row.regionCode
          this.query.regionCode = row.regionCode.slice(0, 10)
        }
        if (row.communityCode) {
          this.query.regionCode = row.communityCode

 src/views/publicSecurity/keynotePersonnelManage.vue

@@ -110,7 +110,7 @@
          dialogClickModal: false,
          column: [{
              span: 12,
              label: "所属街道",
              label: "行政区域",
              prop: "regionName",
              searchSpan: 4,
              align: 'center',

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -6,12 +6,12 @@
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="{row, size}" slot="menu">
        <el-button type="text" :size="size" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
        <el-button type="text" :size="size" icon="el-icon-view"  v-if="permission.place_view"  plain @click="lookDetail(row, 0)">查 看
        </el-button>
        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1" plain
          @click="lookDetail(row, 1)">审 核
        </el-button>
        <el-button type="text" :size="size" icon="el-icon-delete" plain @click="rowDel(row)">删 除
        <el-button type="text" :size="size" icon="el-icon-delete"  v-if="permission.place_del"   plain @click="rowDel(row)">删 除
        </el-button>
      </template>

@@ -263,8 +263,8 @@
      return {
        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),
        delBtn: this.vaildData(this.permission.place_del, true),
        // editBtn: this.vaildData(this.permission.place_edit, true),
      }
    },
    ids() {

 src/views/resource/distapch.vue

@@ -32,7 +32,7 @@

            <template slot-scope="{type,disabled}" slot="cronForm">
               <el-input  placeholder="请选择cron">
                    <el-button slot="append" icon="el-icon-s-tools"  @click="cronPopover = true"></el-button>
                    <el-button slot="append" icon="el-icon-s-tools"  @click="handlerClick()"></el-button>
              </el-input>
            </template>

@@ -44,7 +44,12 @@
        </el-dialog>


        <el-popover v-model="cronPopover">

        
        <el-dialog title="Cron" append-to-body :visible.sync="cronPopover" width="550px">
        <!-- <el-popover v-model="cronPopover"> -->

            <!-- <div> 测试 </div> -->
        <vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
        <!-- <el-input
          slot="reference"
@@ -52,7 +57,8 @@
          placeholder="定时策略"
          @click="cronPopover=true"
        /> -->
      </el-popover>
      <!-- </el-popover> -->
    </el-dialog>

    </basic-container>
</template>
@@ -524,6 +530,10 @@
                this.loading = false
                this.selectionClear()
            })
        },
        handlerClick(){
            console.log("111")
            this.cronPopover = true;
        }
    }
}

 src/views/system/user.vue

@@ -120,17 +120,35 @@
    updatePlatform,
    add,
    grant,
    resetPassword, unlock
    resetPassword,
    unlock
} from "@/api/system/user"
import { exportBlob } from "@/api/common"
import { getDeptTree, getDeptLazyTree } from "@/api/system/dept"
import { getRoleTree } from "@/api/system/role"
import { getPostList } from "@/api/system/post"
import { mapGetters } from "vuex"
import {
    exportBlob
} from "@/api/common"
import {
    getDeptTree,
    getDeptLazyTree
} from "@/api/system/dept"
import {
    getRoleTree
} from "@/api/system/role"
import {
    getPostList
} from "@/api/system/post"
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 {
    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"
@@ -222,8 +240,7 @@
                viewBtn: true,
                dialogType: 'drawer',
                dialogClickModal: false,
                column: [
                    {
                column: [{
                        label: "登录账号",
                        prop: "account",
                        search: true,
@@ -279,8 +296,7 @@
                    //   }]
                    // },
                ],
                group: [
                    {
                group: [{
                        label: '基础信息',
                        prop: 'baseInfo',
                        icon: 'el-icon-user-solid',
@@ -337,7 +353,11 @@
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
                            rules: [{
                                required: true,
                                validator: validatePass,
                                trigger: 'blur'
                            }]
                            },
                            {
                                label: '确认密码',
@@ -345,7 +365,11 @@
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
                            rules: [{
                                required: true,
                                validator: validatePass2,
                                trigger: 'blur'
                            }]
                            },
                        ]
                    },
@@ -353,8 +377,7 @@
                        label: '详细信息',
                        prop: 'detailInfo',
                        icon: 'el-icon-s-order',
                        column: [
                            {
                    column: [{
                                label: "用户昵称",
                                prop: "name",
                                hide: true,
@@ -392,8 +415,7 @@
                                label: "用户性别",
                                prop: "sex",
                                type: "select",
                                dicData: [
                                    {
                        dicData: [{
                                        label: "男",
                                        value: 1
                                    },
@@ -505,8 +527,7 @@
                dialogClickModal: false,
                menuWidth: 120,
                editBtnText: '配置',
                column: [
                    {
                column: [{
                        label: "登录账号",
                        prop: "account",
                        search: true,
@@ -565,8 +586,7 @@
            excelOption: {
                submitBtn: false,
                emptyBtn: false,
                column: [
                    {
                column: [{
                        label: '模板上传',
                        prop: 'excelFile',
                        type: 'upload',
@@ -585,8 +605,7 @@
                        type: "switch",
                        align: "center",
                        width: 80,
                        dicData: [
                            {
                    dicData: [{
                                label: "否",
                                value: 0
                            },
@@ -597,13 +616,11 @@
                        ],
                        value: 0,
                        slot: true,
                        rules: [
                            {
                    rules: [{
                                required: true,
                                message: "请选择是否覆盖",
                                trigger: "blur"
                            }
                        ]
                    }]
                    },
                    {
                        label: '模板下载',
@@ -865,7 +882,9 @@
                type: "warning"
            }).then(() => {
                NProgress.start()
                exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
                exportBlob(
                    `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
                ).then(res => {
                    downloadXls(res.data, `用户数据表${dateNow()}.xlsx`)
                    NProgress.done()
                })

 src/views/userHouse/hireInfoList.vue

@@ -14,7 +14,7 @@
                    </template>

                    <template slot="menuLeft">
                        <el-button type="danger" :size="size" plain icon="el-icon-delete"
                        <el-button type="danger" size="small" plain icon="el-icon-delete"
                            v-if="permission.houseRental_delete" @click="handleDelete">删 除
                        </el-button>
                    </template>

 src/views/userHouse/houseHoldList.vue

@@ -11,10 +11,10 @@
                        <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"
                        <el-button type="success" size="small" plain v-if="permission.household_import"
                            icon="el-icon-upload2" @click="handleImport">导入
                        </el-button>
                        <el-button type="warning" size="small" plain v-if="this.permission.household_export"
                        <el-button type="warning" size="small" plain v-if="permission.household_export"
                            icon="el-icon-download" @click="handleExport">导出
                        </el-button>
                    </template>

 src/views/userHouse/houseList.vue

@@ -8,23 +8,29 @@
                    @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"
                        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.house_del"
                            @click="handleDelete">删 除
                        </el-button>
                        <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
                        <!-- <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> -->
                        <el-button type="success" size="small" plain v-if="permission.house_import"
                            icon="el-icon-upload2" @click="handleImport">导入
                        </el-button>
                        <el-button type="warning" size="small" plain v-if="permission.house_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="handleHouseholdManager(row)">住户管理
                            v-if="permission.house_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)">标签
                            v-if="permission.house_tag" @click="manageLabel(row)">标签
                        </el-button>
                    </template>

@@ -305,7 +311,7 @@
                            label: "name",
                            value: "id",
                        },
                        cascader: ["gridId"],
                        cascader: ["gridCode"],
                        rules: [
                            {
                                required: true,
@@ -333,12 +339,12 @@
                    {
                        hide: true,
                        label: "所属网格",
                        prop: "gridId",
                        prop: "gridCode",
                        type: "tree",
                        cell: true,
                        props: {
                            label: "gridName",
                            value: "id",
                            value: "gridCode",
                        },
                        dicUrl:
                            "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
@@ -488,7 +494,7 @@
            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),
                delBtn: this.vaildData(this.permission.house_del, true),
                editBtn: this.vaildData(this.permission.house_edit, true)
            }
        },