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

guanqb

2024-02-19 c914aacbfe9fe96ded0caf45d8b0e265c69c0954

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

 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")