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

zhongrj

2024-02-19 bf9bf56712032404f8db7cc7b9a59b5bc0d9406e

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

 src/router/views/index.js

@@ -132,53 +132,53 @@
  {
    path: "/property/process/maintenanceFundApply",
    component: Layout,
    redirect: "/work/process/maintenanceFundApply/form",
    redirect: "/property/process/maintenanceFundApply/form",
    children: [{
        path: "form/:processDefinitionId",
        name: "维修基金申请",
        meta: {
          i18n: "work",
          i18n: "property",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/form"
            "@/views/property/process/maintenanceFundApply/form"
          ),
      },
      {
        path: "handle/:taskId/:processInstanceId/:businessId",
        name: "处理维修基金申请",
        meta: {
          i18n: "work",
          i18n: "property",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/handle"
            "@/views/property/process/maintenanceFundApply/handle"
          ),
      },
      {
        path: "detail/:processInstanceId/:businessId",
        name: "维修基金申请详情",
        meta: {
          i18n: "work",
          i18n: "property",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/detail"
            "@/views/property/process/maintenanceFundApply/detail"
          ),
      },
      {
        path: "edit/:taskId/:processInstanceId/:businessId",
        name: "调整维修基金申请",
        meta: {
          i18n: "work",
          i18n: "property",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/edit"
            "@/views/property/process/maintenanceFundApply/edit"
          ),
      },
    ],
@@ -187,53 +187,53 @@
  {
    path: "/gzll/process/maintenanceFundApply",
    component: Layout,
    redirect: "/work/process/maintenanceFundApply/form",
    redirect: "/gzll/process/maintenanceFundApply/form",
    children: [{
        path: "form/:processDefinitionId",
        name: "维修基金申请",
        meta: {
          i18n: "work",
          i18n: "gzll",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/form"
            "@/views/gzll/process/maintenanceFundApply/form"
          ),
      },
      {
        path: "handle/:taskId/:processInstanceId/:businessId",
        name: "处理维修基金申请",
        meta: {
          i18n: "work",
          i18n: "gzll",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/handle"
            "@/views/gzll/process/maintenanceFundApply/handle"
          ),
      },
      {
        path: "detail/:processInstanceId/:businessId",
        name: "维修基金申请详情",
        meta: {
          i18n: "work",
          i18n: "gzll",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/detail"
            "@/views/gzll/process/maintenanceFundApply/detail"
          ),
      },
      {
        path: "edit/:taskId/:processInstanceId/:businessId",
        name: "调整维修基金申请",
        meta: {
          i18n: "work",
          i18n: "gzll",
        },
        component: () =>
          import(
            /* webpackChunkName: "views" */
            "@/views/work/process/maintenanceFundApply/edit"
            "@/views/gzll/process/maintenanceFundApply/edit"
          ),
      },
    ],

 src/views/property/inviteTenders.vue

@@ -1,10 +1,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.article_delete" @click="handleDelete">删
                    除
@@ -12,12 +11,10 @@
            </template>

            <template slot-scope="{type,size,row }" slot="menu">
                <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 v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -550,7 +547,7 @@
            }
            add({
                ...row,
                district_id: row.articleList
          districtId: row.articleList
            }).then(
                () => {
                    this.onLoad(this.page)
@@ -717,7 +714,9 @@
                this.loading = false
                this.selectionClear()
            })
            getDistrictTree({ filterFlag: 1 }).then((res) => {
        getDistrictTree({
          filterFlag: 1
        }).then((res) => {
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")

 src/views/property/oiae.vue

@@ -1,10 +1,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.article_delete" @click="handleDelete">删
                    除
@@ -22,12 +21,10 @@
        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
          创建议题
        </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 v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -141,8 +138,7 @@
                selection: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "收支标题",
                        prop: "title",
                        span: 24,
@@ -556,6 +552,7 @@
                row.videoUrl = ""
            }
            row.userid = this.userInfo.user_id
        console.log(row)
            row.articleRange = JSON.stringify(row.articleList)
            if (row.url.length > 0) {
                var urls = []
@@ -568,7 +565,7 @@
            }
            add({
                ...row,
                district_id: row.articleList
          districtId: row.articleList
            }).then(
                () => {
                    this.onLoad(this.page)
@@ -733,7 +730,9 @@
                this.loading = false
                this.selectionClear()
            })
            getDistrictTree({ filterFlag: 1 }).then((res) => {
        getDistrictTree({
          filterFlag: 1
        }).then((res) => {
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")

 src/views/property/ownersCommittee.vue

@@ -1,10 +1,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.article_delete" @click="handleDelete">删
                    除
@@ -12,12 +11,10 @@
            </template>

            <template slot-scope="{type,size,row }" slot="menu">
                <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 v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -142,6 +139,24 @@
                    span: 24,
                },
                {
              hide: true,
              parent: false,
              label: "公示范围",
              prop: "articleList",
              type: 'tree',
              dicData: [],
              props: {
                label: "name",
                value: 'id'
              },
              span: 12,
              rules: [{
                required: true,
                message: "请选择公示范围",
                trigger: "blur",
              }, ],
            },
            {
                    width: 100,
                    label: "业主大会类型",
                    prop: "type",
@@ -160,37 +175,6 @@
                        value: 5,
                    }],
                },
                // {
                //   label: "招标来源",
                //   prop: "sourceName",
                //   search: true,
                //   searchSpan: 4,
                //   span: 24,
                //   rules: [{
                //     required: true,
                //     message: "请输入招标类型",
                //     trigger: "blur",
                //   }, ],
                // },
                {
                    hide: true,
                    parent: false,
                    label: "公示范围",
                    prop: "articleList",
                    type: 'tree',
                    dicData: [],
                    props: {
                        label: "name",
                        value: 'id'
                    },
                    span: 12,
                    rules: [{
                        required: true,
                        message: "请选择公示范围",
                        trigger: "blur",
                    },],
                },

                {
                    label: "发布时间",
                    prop: "dateTime",
@@ -431,7 +415,7 @@
            }
            add({
                ...row,
                district_id: row.articleList
          districtId: row.articleList
            }).then(
                () => {
                    this.onLoad(this.page)
@@ -598,7 +582,9 @@
                this.loading = false
                this.selectionClear()
            })
            getDistrictTree({ filterFlag: 1 }).then((res) => {
        getDistrictTree({
          filterFlag: 1
        }).then((res) => {
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")

 src/views/propertySupervision/propertyCapitalManage.vue

@@ -17,6 +17,11 @@
      <template slot-scope="{row, size}" slot="processDefinitionVersion">
        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
      </template>
            <template slot-scope="{row, size}" slot="linkPhone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
                </el-button>
            </template>
    </avue-crud>
    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
  </basic-container>
@@ -119,6 +124,7 @@
              label: '联系电话',
              prop: 'linkPhone',
              // search: true,
                    slot: true
            },
            {
              label: '项目名称',
@@ -154,8 +160,26 @@
        })
        return ids.join(",")
      },

        textDispose () {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
                } else {
                    if (type == 'principalIdCard') {
                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
                    } else {
                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
                    }
                }
            }
        }
    },
    methods: {
        showStringDispose (row, type) {
            row[type] = !row[type]
        },

      searchReset() {
        this.query = {}
        this.onLoad(this.page)
@@ -203,7 +227,15 @@
        }
        this.loading = true
        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
          const data = res.data.data
                const data = {
                    ...res.data.data,
                    records: res.data.data.records.map(item => {
                        return {
                            ...item,
                            'linkPhoneflag': false
                        }
                    })
                }
          this.page.total = data.total
          this.data = data.records
          this.loading = false

 src/views/propertySupervision/propertyCompanyDistrict.vue

@@ -11,6 +11,11 @@
                    @click="handleDelete">删 除
                </el-button>
            </template>
            <template slot-scope="{row, size}" slot="principalPhone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
                </el-button>
            </template>
        </avue-crud>
    </basic-container>
</template>
@@ -164,6 +169,7 @@
                    label: '联系方式',
                    prop: 'principalPhone',
                    span: 12,
                    slot: true,
                    rules: [{
                        required: true,
                        message: "请输入联系方式",
@@ -255,8 +261,26 @@
            })
            return ids.join(",")
        },

        textDispose () {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
                } else {
                    if (type == 'principalIdCard') {
                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
                    } else {
                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
                    }
                }
            }
        }
    },
    methods: {
        showStringDispose (row, type) {
            row[type] = !row[type]
        },

        rowSave (row, done, loading) {
            row.userId = func.join(row.userId)
            add(row).then(
@@ -383,7 +407,15 @@
            }
            this.loading = true
            getList(page.currentPage, page.pageSize, values).then((res) => {
                const data = res.data.data
                const data = {
                    ...res.data.data,
                    records: res.data.data.records.map(item => {
                        return {
                            ...item,
                            'principalPhoneflag': false
                        }
                    })
                }
                this.page.total = data.total
                this.data = data.records
                this.loading = false

 src/views/publicSecurity/bailReporting.vue

@@ -22,6 +22,11 @@
                    {{ showStatus(row.status).text }}
                </el-tag>
            </template>
            <template slot-scope="{row, size}" slot="phone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
                    v-text="textDispose(row, 'phoneflag', 'phone')">
                </el-button>
            </template>
        </avue-crud>

        <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
@@ -136,6 +141,7 @@
                    prop: "phone",
                    searchSpan: 4,
                    search: true,
                    slot: true,
                    rules: [{
                        validator: validatorPhone,
                        trigger: 'blur'
@@ -304,9 +310,27 @@

                return tags
            }
        },

        textDispose () {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
                } else {
                    if (type == 'principalIdCard') {
                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
                    } else {
                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
                    }
                }
            }
        }
    },
    methods: {
        showStringDispose (row, type) {
            row[type] = !row[type]
        },

        colseDetail () {
            this.auditBasePopup = false
            this.onLoad(this.page)
@@ -479,6 +503,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'phoneflag', false)
                    if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
                        var urls = []
                        var names = item.imageUrls.split(",").filter(item => item != '')

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -23,6 +23,12 @@
                    {{ showStatus(row.status).text }}
                </el-tag>
            </template>

            <template slot-scope="{row, size}" slot="phone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
                    v-text="textDispose(row, 'phoneflag', 'phone')">
                </el-button>
            </template>
        </avue-crud>


@@ -154,6 +160,7 @@
                    prop: "phone",
                    searchSpan: 4,
                    search: true,
                    slot: true,
                    rules: [{
                        validator: validatorPhone,
                        trigger: 'blur'
@@ -314,9 +321,27 @@

                return tags
            }
        },

        textDispose () {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
                } else {
                    if (type == 'principalIdCard') {
                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
                    } else {
                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
                    }
                }
            }
        }
    },
    methods: {
        showStringDispose (row, type) {
            row[type] = !row[type]
        },

        // 弹窗关闭回调
        handleClose () {
            this.cancelAudit()
@@ -595,6 +620,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'phoneflag', false)
                    if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
                        var urls = []
                        var names = item.imageUrls.split(",").filter(item => item != '')