From ecf90632dd8e5514ffa6b35ddc48764b7d248e41 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:21:23 +0800
Subject: [PATCH] 业主大会

---
 src/views/article/publicSignUp.vue                     | 1356 +++++++++++++++---------------
 src/views/property/inviteTenders.vue                   |    2 
 src/views/article/components/discussionManageChild.vue |  561 ++++++------
 src/views/property/ownersCommittee.vue                 |  131 --
 src/views/propertySupervision/ownersCommittee.vue      |  650 ++++++++++++++
 5 files changed, 1,633 insertions(+), 1,067 deletions(-)

diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index ec9ad87..5301181 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,324 +1,325 @@
 <template>
-    <div>
-        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
-            <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
+      <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { getPersonPublicSelect } from "@/api/public"
+  import {
+    getPersonPublicSelect
+  } from "@/api/public"
 
-import {
+  import {
     getListPd,
     getDetailPd,
     addPd,
     updatePd,
     removePd
-} from "@/api/discuss/publicDiscuss"
+  } from "@/api/discuss/publicDiscuss"
 
-import {
+  import {
     getPage
-} from "@/api/discuss/userTopics"
+  } from "@/api/discuss/userTopics"
 
-import option from "@/option/discuss/publicDiscuss"
-import {
+  import option from "@/option/discuss/publicDiscuss"
+  import {
     mapGetters
-} from "vuex"
-import {
+  } from "vuex"
+  import {
     getDictionary
-} from '@/api/system/dict'
+  } from '@/api/system/dict'
 
-import {
+  import {
     getList as getHouseholdList,
     getDetatils as getHouseholdDetail
-} from "@/api/userHouse/list/houseHold"
+  } from "@/api/userHouse/list/houseHold"
 
 
 
-export default {
-    data () {
-        return {
-            dialogVisibles: false,
-            userParams: {},
-            // 分页信息
-            pageUser: {
-                pageSize: 10,
-                pageSizes: [10, 20, 30, 50, 100],
-                currentPage: 1,
-                total: 0
+  export default {
+    data() {
+      return {
+        dialogVisibles: false,
+        userParams: {},
+        // 分页信息
+        pageUser: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+        discussForm: {},
+        dialogVisiblesEdit: false,
+        dialogVisiblesUser: false,
+        editFlag: false,
+        ontitle: '编辑议题',
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          align: 'center',
+          menuAlign: 'center',
+          addBtn: false,
+          searchMenuSpan: 3,
+          menuWidth: 500,
+          column: [
+            //   {
+            //     label: '标题',
+            //     prop: 'title',
+            //     searchSpan: 4,
+            //     span: 6,
+            // },
+            {
+              label: '参与人数',
+              prop: 'topsCount',
+              searchSpan: 4,
+              display: false,
+              span: 6,
             },
-            discussForm: {},
-            dialogVisiblesEdit: false,
-            dialogVisiblesUser: false,
-            editFlag: false,
-            ontitle: '编辑议题',
-            // 弹框标题
-            title: '',
-            // 是否展示弹框
-            box: false,
-            // 是否显示查询
-            search: true,
-            // 加载中
-            loading: true,
-            // 是否为查看模式
-            view: false,
-            // 查询信息
-            query: {},
-            // 分页信息
-            page: {
-                pageSize: 10,
-                pageSizes: [10, 20, 30, 50, 100],
-                currentPage: 1,
-                total: 0
+            {
+              label: '开启投票',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              span: 6,
+              value: 0,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择开启状态",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: '投票限制',
+              prop: 'voteRestrictions',
+              type: 'radio',
+              button: true,
+              span: 6,
+              dicData: [{
+                label: '一人一票',
+                value: 0
+              }, {
+                label: '一户一票',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择投票限制",
+                trigger: "blur",
+              }, ],
+              value: 0
+            }, {
+              label: '签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              span: 6,
+              dicData: [{
+                label: '不需要',
+                value: 0
+              }, {
+                label: '需要',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否签名",
+                trigger: "blur",
+              }, ],
+              value: 0
+            }, {
+              label: '指定用户',
+              prop: 'appointUser',
+              type: 'radio',
+              button: true,
+              span: 6,
+              dicData: [{
+                label: '不限制',
+                value: 0
+              }, {
+                label: '指定用户',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否指定用户",
+                trigger: "blur",
+              }, ],
+              value: 0
             },
 
-            // 选择行
-            selectionList: [],
-            // 表单配置
-            option: {
-                height: "auto",
-                calcHeight: 54,
-                align: 'center',
-                menuAlign: 'center',
-                addBtn: false,
-                searchMenuSpan: 3,
-                menuWidth: 500,
-                column: [{
-                    label: '标题',
-                    prop: 'title',
-                    searchSpan: 4,
-                    span: 6,
-                },
-                {
-                    label: '参与人数',
-                    prop: 'topsCount',
-                    searchSpan: 4,
-                    display: false,
-                    span: 6,
-                },
-                {
-                    label: '开启投票',
-                    prop: 'openFlag',
-                    type: 'radio',
-                    button: true,
-                    span: 6,
-                    value: 0,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选择开启状态",
-                        trigger: "blur",
-                    },],
-                }, {
-                    label: '投票限制',
-                    prop: 'voteRestrictions',
-                    type: 'radio',
-                    button: true,
-                    span: 6,
-                    dicData: [{
-                        label: '一人一票',
-                        value: 0
-                    }, {
-                        label: '一户一票',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选择投票限制",
-                        trigger: "blur",
-                    },],
-                    value: 0
-                }, {
-                    label: '签名',
-                    prop: 'signatureFlag',
-                    type: 'radio',
-                    button: true,
-                    span: 6,
-                    dicData: [{
-                        label: '不需要',
-                        value: 0
-                    }, {
-                        label: '需要',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选择是否签名",
-                        trigger: "blur",
-                    },],
-                    value: 0
-                }, {
-                    label: '指定用户',
-                    prop: 'appointUser',
-                    type: 'radio',
-                    button: true,
-                    span: 6,
-                    dicData: [{
-                        label: '不限制',
-                        value: 0
-                    }, {
-                        label: '指定用户',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选择是否指定用户",
-                        trigger: "blur",
-                    },],
-                    value: 0
-                },
-
-                {
-                    display: false,
-                    label: "选择用户",
-                    prop: "userIds",
-                    type: 'select',
-                    span: 6,
-                    remote: true,
-                    hide: true,
-                    dicUrl: "",
-                    props: {
-                        label: 'name',
-                        value: 'id',
-                    },
-                    dicData: [],
-                    rules: [
-                        {
-                            required: true,
-                            message: '请输入姓名',
-                            trigger: 'blur'
-                        }
-                    ],
-                },
-
-                {
-                    label: "截止时间",
-                    span: 6,
-                    prop: "endTime",
-                    type: "datetime",
-                    format: "yyyy-MM-dd hh:mm:ss",
-                    valueFormat: "yyyy-MM-dd hh:mm:ss",
-                    // format: "yyyy-MM-dd hh:mm:ss",
-                    // valueFormat: "yyyy-MM-dd hh:mm:ss",
-                    rules: [{
-                        required: true,
-                        message: "请选择截止时间",
-                        trigger: "blur",
-                    },],
-                }
-                ]
+            {
+              display: false,
+              label: "选择用户",
+              prop: "userIds",
+              type: 'select',
+              span: 6,
+              remote: true,
+              hide: true,
+              dicUrl: "",
+              props: {
+                label: 'name',
+                value: 'id',
+              },
+              dicData: [],
+              rules: [{
+                required: true,
+                message: '请输入姓名',
+                trigger: 'blur'
+              }],
             },
-            // 表单列表
-            disCussFrom: {},
-            dialogVisibles: false,
-            articleId: '',
-            discussion: {},
-        }
+
+            {
+              label: "截止时间",
+              span: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "yyyy-MM-dd hh:mm:ss",
+              // format: "yyyy-MM-dd hh:mm:ss",
+              // valueFormat: "yyyy-MM-dd hh:mm:ss",
+              rules: [{
+                required: true,
+                message: "请选择截止时间",
+                trigger: "blur",
+              }, ],
+            }
+          ]
+        },
+        // 表单列表
+        disCussFrom: {},
+        dialogVisibles: false,
+        articleId: '',
+        discussion: {},
+      }
     },
-    created () {
-        this.getUserList()
+    created() {
+      this.getUserList()
     },
 
-    mounted () {
+    mounted() {
 
     },
 
     watch: {
-        'disCussFrom.appointUser': {
-            handler (newData) {
-                const column = this.findObject(this.option.column, "userIds")
-                if (newData == 1) {
-                    column.display = true
-                } else {
-                    column.display = false
-                }
-            },
+      'disCussFrom.appointUser': {
+        handler(newData) {
+          const column = this.findObject(this.option.column, "userIds")
+          if (newData == 1) {
+            column.display = true
+          } else {
+            column.display = false
+          }
         },
+      },
     },
     computed: {
-        ...mapGetters(["permission"]),
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        }
+      ...mapGetters(["permission"]),
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      }
     },
     methods: {
-        getUserList () {
-            let dicUrl = `/api/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
-            const column = this.findObject(this.option.column, "userIds")
-            column.dicUrl = dicUrl
-        },
+      getUserList() {
+        let dicUrl = `/api/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
+        const column = this.findObject(this.option.column, "userIds")
+        column.dicUrl = dicUrl
+      },
 
-        handleSubmit (row, done) {
-            row.articleId = this.articleId
-            row.eventType = 1
-            addPd(row).then(
-                () => {
-                    this.onLoad(this.discussion)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                    this.dialogVisibles = false
-                },
-                (error) => {
-                    window.console.log(error)
-                }
-            )
-        },
-        init (data) {
-            this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
-            this.dialogVisibles = true
-            this.disCussFrom = {}
-            this.discussion = data
-            this.articleId = data.id
-            this.onLoad(data)
-        },
-
-        handleClose () {
-            this.dialogVisibles = false
-            this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
-
-            console.log(this.$refs, 90999)
-        },
-
-        onLoad (data, params = {
-            eventType: 1,
-            articleId: data.id
-        }) {
-            this.loading = true
-            getListPd(1, 10, Object.assign(params, this.query)).then(res => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.disCussFrom = data.records[0]
-
-                getPersonPublicSelect({
-                    id: this.disCussFrom.userIds
-                }).then(res => {
-                    const column = this.findObject(this.option.column, "userIds")
-                    column.dicData = res.data.data
-
-                    this.loading = false
-                })
+      handleSubmit(row, done) {
+        row.articleId = this.articleId
+        row.eventType = 1
+        addPd(row).then(
+          () => {
+            this.onLoad(this.discussion)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
             })
-        }
+            done()
+            this.dialogVisibles = false
+          },
+          (error) => {
+            window.console.log(error)
+          }
+        )
+      },
+      init(data) {
+        this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+        this.dialogVisibles = true
+        this.disCussFrom = {}
+        this.discussion = data
+        this.articleId = data.id
+        this.onLoad(data)
+      },
+
+      handleClose() {
+        this.dialogVisibles = false
+        this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+
+        console.log(this.$refs, 90999)
+      },
+
+      onLoad(data, params = {
+        eventType: 1,
+        articleId: data.id
+      }) {
+        this.loading = true
+        getListPd(1, 10, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.disCussFrom = data.records[0]
+
+          getPersonPublicSelect({
+            id: this.disCussFrom.userIds
+          }).then(res => {
+            const column = this.findObject(this.option.column, "userIds")
+            column.dicData = res.data.data
+
+            this.loading = false
+          })
+        })
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.el-pagination {
+  .el-pagination {
     margin-top: 20px;
-}
-</style>
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index 30c34a4..c4ad3eb 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -1,735 +1,733 @@
 <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.article_delete" @click="handleDelete">删
-                    除
-                </el-button>
-            </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.article_delete" @click="handleDelete">删
+          除
+        </el-button>
+      </template>
 
-            <template slot-scope="{ type, size, row }" slot="menu">
-                <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row)">
-                    公益报名
-                </el-button>
-                <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>
-                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    发布
-                </el-button>
-            </template>
+      <template slot-scope="{ type, size, row }" slot="menu">
+        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row)">
+          公益报名
+        </el-button>
+        <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>
+        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+          发布
+        </el-button>
+      </template>
 
-            <template slot-scope="{ row, size }" slot="publish">
-                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
-                </el-tag>
-            </template>
+      <template slot-scope="{ row, size }" slot="publish">
+        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+        </el-tag>
+      </template>
 
-            <template slot-scope="{ row, size }" slot="iscomment">
-                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
-                </el-tag>
-            </template>
-        </avue-crud>
+      <template slot-scope="{ row, size }" slot="iscomment">
+        <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
+        </el-tag>
+      </template>
+    </avue-crud>
 
-        <publicSignUpChild ref="publicSignUpChild"></publicSignUpChild>
+    <publicSignUpChild ref="publicSignUpChild"></publicSignUpChild>
 
-        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-            <span slot="title" class="dialog-footer">
-                {{ discussForm.ontitle }}
-            </span>
-            <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm"></avue-form>
-        </el-dialog>
-    </basic-container>
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+      <span slot="title" class="dialog-footer">
+        {{ discussForm.ontitle }}
+      </span>
+      <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm"></avue-form>
+    </el-dialog>
+  </basic-container>
 </template>
 
 <script>
-import {
+  import {
     getList,
     remove,
     update,
     add,
     getNotice,
     upcomment
-} from "@/api/article/article"
+  } from "@/api/article/article"
 
-import {
+  import {
     getListPd,
     removePd,
     updatePd,
     addPd,
     getDetailPd,
     upcommentPd
-} from "@/api/discuss/publicDiscuss"
+  } from "@/api/discuss/publicDiscuss"
 
-import website from '@/config/website'
+  import website from '@/config/website'
 
-import {
+  import {
     getDistrictTree
-} from "@/api/district/index"
+  } from "@/api/district/index"
 
-import {
+  import {
     mapGetters
-} from "vuex"
-import publicSignUpChild from "./components/publicSignUpChild"
+  } from "vuex"
+  import publicSignUpChild from "./components/publicSignUpChild"
 
-export default {
+  export default {
     components: {
-        publicSignUpChild
+      publicSignUpChild
     },
-    data () {
-        return {
-            discussForm: {
-                ontitle: '',
-                title: '',
-                openFlag: 0,
-                numberRestrictions: 0,
-                voteRestrictions: 0,
-                userRestrictions: 0,
-                endTime: '',
-                articleId: '',
-                createTime: '',
-                updateTime: '',
-                deleteFlag: '',
-                repeatVote: 0,
-                voteNumberPublic: 0,
-                appointUser: '',
-                userIds: '',
-                eventType: 0,
-            },
-            dialogVisibles: false,
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 96,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 500,
+    data() {
+      return {
+        discussForm: {
+          ontitle: '',
+          title: '',
+          openFlag: 0,
+          numberRestrictions: 0,
+          voteRestrictions: 0,
+          userRestrictions: 0,
+          endTime: '',
+          articleId: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          repeatVote: 0,
+          voteNumberPublic: 0,
+          appointUser: '',
+          userIds: '',
+          eventType: 0,
+        },
+        dialogVisibles: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 500,
 
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                border: false,
-                //stripe:true,
-                index: true,
-                viewBtn: false,
-                selection: true,
-                excelBtn: true,
-                dialogClickModal: false,
-                column: [
-                    {
-                        label: "文章标题",
-                        prop: "title",
-                        span: 24,
-                        row: true,
-                        searchSpan: 4,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入文章标题",
-                            trigger: "blur",
-                        },],
-                    },
-                    {
-                        width: 110,
-                        label: "文章封面",
-                        prop: "url",
-                        // align:'center',
-                        type: "upload",
-                        listType: "picture-img",
-                        action: "/api/blade-resource/oss/endpoint/put-file",
-                        propsHttp: {
-                            res: "data",
-                            url: "link",
-                        },
-                        // hide: true,
-                        span: 24,
-                    },
-                    {
-                        label: "文章范围",
-                        prop: "articleList",
-                        span: 12,
-                        minRows: 2,
-                        type: "cascader",
-                        multiple: true,
-                        tags: true,
-                        dicData: [],
-                        rules: [{
-                            required: true,
-                            message: "请选择文章范围",
-                            trigger: "blur",
-                        },],
-                        props: {
-                            label: "name",
-                            value: 'id'
-                        },
-                        hide: true,
-                    },
-                    {
-                        width: 110,
-                        label: "文章类型",
-                        prop: "type",
-                        searchSpan: 4,
-                        value: 3,
-                        slot: true,
-                        search: true,
-                        type: "select",
-                        rules: [{
-                            required: true,
-                            message: "请选择文章类型",
-                            trigger: "blur",
-                        },],
-                        dicData: [{
-                            label: "公益报名",
-                            value: 3, //  // 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查
-                        }],
-                    },
-                    {
-                        label: "发布时间",
-                        prop: "dateTime",
-                        type: "daterange",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                        searchSpan: 6,
-                        searchRange: true,
-                        hide: true,
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请选择发布时间",
-                            trigger: "blur",
-                        },],
-                    },
-                    {
-                        width: 100,
-                        label: "发布时间",
-                        prop: "createTime",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        width: 100,
-                        label: "发布状态",
-                        prop: "publish",
-                        searchSpan: 4,
-                        value: "0",
-                        slot: true,
-                        search: true,
-                        type: "select",
-                        rules: [{
-                            required: true,
-                            message: "请选择发布状态",
-                            trigger: "blur",
-                        },],
-                        dicData: [{
-                            label: "未发布",
-                            value: "0",
-                        },
-                        {
-                            label: "已发布",
-                            value: "1",
-                        }
-                        ],
-                    },
-                    {
-                        width: 80,
-                        label: "评论区",
-                        prop: "iscomment",
-                        slot: true,
-                        type: "select",
-                        dicData: [{
-                            label: "关闭",
-                            value: "0",
-                        },
-                        {
-                            label: "开启",
-                            value: "1",
-                        }
-                        ],
-                    },
-                    {
-                        label: "文章内容",
-                        prop: "content",
-                        component: "AvueUeditor",
-                        options: {
-                            action: "/api/blade-resource/oss/endpoint/put-file",
-                            props: {
-                                res: "data",
-                                url: "link",
-                            },
-                        },
-                        hide: true,
-                        minRows: 6,
-                        span: 24,
-                    },
-                ],
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: false,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "文章标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入文章标题",
+                trigger: "blur",
+              }, ],
             },
-            data: [],
-            optionEnroll: {
-                column: [{
-                    label: "",
-                    type: 'title',
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    offset: 2,
-                    styles: {
-                        fontSize: '24px'
-                    }
-                }, {
-                    labelWidth: 100,
-                    label: '开启',
-                    prop: 'openFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选开启状态",
-                        trigger: "blur",
-                    },],
-                }, {
-                    labelWidth: 100,
-                    label: '投票限制',
-                    prop: 'voteRestrictions',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '一人一票',
-                        value: 0
-                    }, {
-                        label: '一户一票',
-                        value: 1
-                    }],
-                    rules: [{
-                        required: true,
-                        message: "请选投票限制",
-                        trigger: "blur",
-                    },],
+            {
+              width: 110,
+              label: "文章封面",
+              prop: "url",
+              // align:'center',
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            {
+              label: "文章范围",
+              prop: "articleList",
+              span: 12,
+              minRows: 2,
+              type: "cascader",
+              multiple: true,
+              tags: true,
+              dicData: [],
+              rules: [{
+                required: true,
+                message: "请选择文章范围",
+                trigger: "blur",
+              }, ],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              hide: true,
+            },
+            {
+              width: 110,
+              label: "文章类型",
+              prop: "type",
+              searchSpan: 4,
+              value: 3,
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择文章类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "公益报名",
+                value: 3, //  // 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查
+              }],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              width: 100,
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 4,
+              value: "0",
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
                 },
                 {
-                    label: "截止时间",
-                    row: true,
-                    offset: 6,
-                    prop: "endTime",
-                    type: "datetime",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    rules: [{
-                        required: true,
-                        message: "请选截止时间",
-                        trigger: "blur",
-                    },],
-                },
-                ]
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
             },
-            districtTree: [],
-        }
+            {
+              width: 80,
+              label: "评论区",
+              prop: "iscomment",
+              slot: true,
+              type: "select",
+              dicData: [{
+                  label: "关闭",
+                  value: "0",
+                },
+                {
+                  label: "开启",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "文章内容",
+              prop: "content",
+              component: "AvueUeditor",
+              options: {
+                action: "/api/blade-resource/oss/endpoint/put-file",
+                props: {
+                  res: "data",
+                  url: "link",
+                },
+              },
+              hide: true,
+              minRows: 6,
+              span: 24,
+            },
+          ],
+        },
+        data: [],
+        optionEnroll: {
+          column: [
+            //   {
+            //     label: "",
+            //     type: 'title',
+            //     prop: "title",
+            //     span: 24,
+            //     row: true,
+            //     offset: 2,
+            //     styles: {
+            //         fontSize: '24px'
+            //     }
+            // },
+            {
+              labelWidth: 100,
+              label: '开启',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选开启状态",
+                trigger: "blur",
+              }, ],
+            }, {
+              labelWidth: 100,
+              label: '投票限制',
+              prop: 'voteRestrictions',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '一人一票',
+                value: 0
+              }, {
+                label: '一户一票',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选投票限制",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              rules: [{
+                required: true,
+                message: "请选截止时间",
+                trigger: "blur",
+              }, ],
+            },
+          ]
+        },
+        districtTree: [],
+      }
     },
     watch: {
-        "form.articleType": {
-            handler (val) {
-                if (val) {
-                    var videoUrl = this.findObject(this.option.column, "videoUrl")
-                    var content = this.findObject(this.option.column, "content")
-                    if (val.indexOf('ksp') != -1) {
-                        videoUrl.display = true
-                        content.display = false
-                        videoUrl.rules = [{
-                            required: false,
-                            message: "请选择视频",
-                            trigger: "blur",
-                        },]
-                    } else {
-                        videoUrl.display = false
-                        content.display = true
-                        videoUrl.rules = ""
-                    }
-                }
-            },
-            immediate: true,
-        }
+      "form.articleType": {
+        handler(val) {
+          if (val) {
+            var videoUrl = this.findObject(this.option.column, "videoUrl")
+            var content = this.findObject(this.option.column, "content")
+            if (val.indexOf('ksp') != -1) {
+              videoUrl.display = true
+              content.display = false
+              videoUrl.rules = [{
+                required: false,
+                message: "请选择视频",
+                trigger: "blur",
+              }, ]
+            } else {
+              videoUrl.display = false
+              content.display = true
+              videoUrl.rules = ""
+            }
+          }
+        },
+        immediate: true,
+      }
     },
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.article_add, true),
-                viewBtn: this.vaildData(this.permission.article_view, true),
-                delBtn: this.vaildData(this.permission.article_delete, true),
-                editBtn: this.vaildData(this.permission.article_edit, true),
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-
-        showStatus () {
-            return (data, type) => {
-                if (data == 0) {
-                    return {
-                        text: type == 1 ? '未发布' : '关闭',
-                        type: 'info'
-                    }
-                } else if (data == 1) {
-                    return {
-                        text: type == 1 ? '已发布' : '开启',
-                        type: 'success'
-                    }
-                }
-            }
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.article_add, true),
+          viewBtn: this.vaildData(this.permission.article_view, true),
+          delBtn: this.vaildData(this.permission.article_delete, true),
+          editBtn: this.vaildData(this.permission.article_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+
+      showStatus() {
+        return (data, type) => {
+          if (data == 0) {
+            return {
+              text: type == 1 ? '未发布' : '关闭',
+              type: 'info'
+            }
+          } else if (data == 1) {
+            return {
+              text: type == 1 ? '已发布' : '开启',
+              type: 'success'
+            }
+          }
+        }
+      }
     },
     methods: {
 
 
-        openUserPopup (row) {
-            this.$refs.publicSignUpChild.openUser(row)
-        },
+      openUserPopup(row) {
+        this.$refs.publicSignUpChild.openUser(row)
+      },
 
-        openDilog (row, type) {
-            this.dialogVisibles = true
-            this.discussForm.eventType = type
-            this.discussForm.articleId = row.id
-            this.discussForm.title = row.title
-            this.discussForm.ontitle = '公益报名'
-            this.getpunlicDiscussDetail(row)
-        },
+      openDilog(row, type) {
+        this.dialogVisibles = true
+        this.discussForm.eventType = type
+        this.discussForm.articleId = row.id
+        this.discussForm.title = row.title
+        this.discussForm.ontitle = '公益报名'
+        this.getpunlicDiscussDetail(row)
+      },
 
-        getpunlicDiscussDetail (row) {
-            getDetailPd({
-                articleId: row.id
-            }).then((res) => {
-                if (res.data.data) {
-                    let data = res.data.data
-                    this.discussForm = data
-                }
+      getpunlicDiscussDetail(row) {
+        getDetailPd({
+          articleId: row.id
+        }).then((res) => {
+          if (res.data.data) {
+            let data = res.data.data
+            this.discussForm = data
+          }
+        })
+      },
+
+      handleSubmit(form, done) {
+        done()
+        addPd(form).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
             })
-        },
-
-        handleSubmit (form, done) {
+            this.dialogVisibles = false
             done()
-            addPd(form).then(
-                () => {
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.dialogVisibles = false
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    // loading();
-                }
-            )
-        },
+          },
+          (error) => {
+            window.console.log(error)
+            // loading();
+          }
+        )
+      },
 
-        handleClose (done) {
-            done()
-            // this.$confirm('确认关闭?')
-            //   .then(_ => {
-            //     done();
-            //   })
-            //   .catch(_ => {});
-        },
-        rowSave (row, done, loading) {
-            // if (row.videoUrl.length == 0) {
-            //   row.videoUrl = "";
-            // }
-            row.userid = this.userInfo.user_id
-            row.articleRange = JSON.stringify(row.articleList)
-            if (row.url.length > 0) {
-                var urls = []
-                var split = row.url.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.url = urls.join(",")
-            }
-            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.articleRange = JSON.stringify(row.articleList)
-            if (row.url.length > 0) {
-                var urls = []
-                var split = row.url.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.url = urls.join(",")
-            }
-
-            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)) {
-                getNotice(this.form.id).then((res) => {
-                    let data = res.data.data
-                    if (data.url.length > 0) {
-                        var urls = []
-                        var names = data.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        data.url = urls.join(",")
-                    }
-                    data.articleList = JSON.parse(data.articleRange)
-                    this.form = data
-                })
-            }
-            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
-            }
-            values.type = 3
-            this.loading = true
-            console.log(values)
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.data.forEach(item => {
-                    if (item.url.length > 0) {
-                        var urls = []
-                        var names = item.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.url = urls.join(",")
-                    }
-                })
-                this.loading = false
-                this.selectionClear()
-            })
-            getDistrictTree(params = {}).then((res) => {
-                const data = res.data.data
-                this.districtTree = data
-                const column = this.findObject(this.option.column, "articleList")
-                column.dicData = res.data.data
-                this.loading = false
-            })
-        },
-        updateFb (row) {
-            if (row.publish == "0") {
-                row.publish = "1"
-            } else {
-                row.publish = "0"
-            }
-            if (row.url.length > 0) {
-                var urls = []
-                var split = row.url.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.url = urls.join(",")
-            }
-            update(row).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        kqcomment () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据开启评论?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                return upcomment(this.ids, "1")
-            })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        gbcomment () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据开启评论?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                return upcomment(this.ids, "0")
-            })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
+      handleClose(done) {
+        done()
+        // this.$confirm('确认关闭?')
+        //   .then(_ => {
+        //     done();
+        //   })
+        //   .catch(_ => {});
+      },
+      rowSave(row, done, loading) {
+        // if (row.videoUrl.length == 0) {
+        //   row.videoUrl = "";
+        // }
+        row.userid = this.userInfo.user_id
+        row.articleRange = JSON.stringify(row.articleList)
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
         }
+        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.articleRange = JSON.stringify(row.articleList)
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+
+        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)) {
+          getNotice(this.form.id).then((res) => {
+            let data = res.data.data
+            if (data.url.length > 0) {
+              var urls = []
+              var names = data.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              data.url = urls.join(",")
+            }
+            data.articleList = JSON.parse(data.articleRange)
+            this.form = data
+          })
+        }
+        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
+        }
+        values.type = 3
+        this.loading = true
+        console.log(values)
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.url.length > 0) {
+              var urls = []
+              var names = item.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.url = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+        getDistrictTree(params = {}).then((res) => {
+          const data = res.data.data
+          this.districtTree = data
+          const column = this.findObject(this.option.column, "articleList")
+          column.dicData = res.data.data
+          this.loading = false
+        })
+      },
+      updateFb(row) {
+        if (row.publish == "0") {
+          row.publish = "1"
+        } else {
+          row.publish = "0"
+        }
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+        update(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      kqcomment() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据开启评论?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            return upcomment(this.ids, "1")
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      gbcomment() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据开启评论?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            return upcomment(this.ids, "0")
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      }
     },
-}
+  }
 </script>
 
 <style>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
index 838ce4a..dbf86bb 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -194,7 +194,7 @@
               value: 2,
               slot: true,
               searchSpan: 4,
-              search: true,
+              // search: true,
               type: "select",
               rules: [{
                 required: true,
diff --git a/src/views/property/ownersCommittee.vue b/src/views/property/ownersCommittee.vue
index 86409d1..93bdefe 100644
--- a/src/views/property/ownersCommittee.vue
+++ b/src/views/property/ownersCommittee.vue
@@ -30,20 +30,6 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-      <span slot="title" class="dialog-footer">
-        {{ discussForm.ontitle }}
-      </span>
-      <div id="" v-if="discussForm.eventType == 1">
-        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
-      </div>
-
-      <div id="" v-else>
-        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
-        </avue-form>
-      </div>
-    </el-dialog>
-
   </basic-container>
 </template>
 
@@ -131,7 +117,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入招标标题",
+                message: "请输入业主大会标题",
                 trigger: "blur",
               }, ],
             },
@@ -149,6 +135,25 @@
               },
               // hide: true,
               span: 24,
+            },
+            {
+              width: 100,
+              label: "业主大会类型",
+              prop: "type",
+              value: 5,
+              slot: true,
+              searchSpan: 4,
+              // search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择招标类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "业主大会",
+                value: 5,
+              }],
             },
             // {
             //   label: "招标来源",
@@ -173,7 +178,7 @@
               dicData: [],
               rules: [{
                 required: true,
-                message: "请选择招标范围",
+                message: "请选择业主大会范围",
                 trigger: "blur",
               }, ],
               props: {
@@ -219,7 +224,7 @@
               searchSpan: 4,
               search: true,
               type: "select",
-              display:false,
+              display: false,
               rules: [{
                 required: true,
                 message: "请选择发布状态",
@@ -272,95 +277,7 @@
           ],
         },
         data: [],
-        optionEnroll: {
-          column: [{
-              label: "",
-              type: 'title',
-              prop: "title",
-              span: 24,
-              row: true,
-              offset: 2,
-              styles: {
-                fontSize: '24px'
-              }
-            }, {
-              label: '开启',
-              prop: 'openFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
-            },
 
-            {
-              label: "截止时间",
-              row: true,
-              offset: 6,
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd hh:mm:ss",
-              valueFormat: "timestamp",
-            },
-          ]
-        },
-        optionDiscuss: {
-          column: [{
-              label: "",
-              type: 'title',
-              prop: "title",
-              span: 24,
-              row: true,
-              offset: 2,
-              styles: {
-                fontSize: '24px'
-              }
-            }, {
-              label: '开启投票',
-              prop: 'openFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
-            }, {
-              label: '开启签名',
-              prop: 'signatureFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
-            },
-            {
-              label: "截止时间",
-              row: true,
-              offset: 6,
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd hh:mm:ss",
-              valueFormat: "timestamp",
-            },
-          ]
-        },
         districtTree: [],
       }
     },
@@ -462,7 +379,7 @@
         //   .catch(_ => {});
       },
       rowSave(row, done, loading) {
-        row['type'] = 99
+        row['type'] = 5
         row.userid = this.userInfo.user_id
         row.articleRange = JSON.stringify(row.articleList)
         if (row.url.length > 0) {
@@ -617,7 +534,7 @@
           }
           values.dateTime = null
         }
-        values.type = 99
+        values.type = 5
         this.loading = true
         console.log(values)
         getList(page.currentPage, page.pageSize, values).then((res) => {
diff --git a/src/views/propertySupervision/ownersCommittee.vue b/src/views/propertySupervision/ownersCommittee.vue
new file mode 100644
index 0000000..552e758
--- /dev/null
+++ b/src/views/propertySupervision/ownersCommittee.vue
@@ -0,0 +1,650 @@
+<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.article_delete" @click="handleDelete">删
+          除
+        </el-button>
+      </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>
+        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+          发布
+        </el-button>
+      </template> -->
+
+      <template slot-scope="{ row, size }" slot="publish">
+        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+        </el-tag>
+      </template>
+
+      <template slot-scope="{ row, size }" slot="iscomment">
+        <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
+        </el-tag>
+      </template>
+    </avue-crud>
+
+  </basic-container>
+</template>
+
+<script>
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getNotice,
+    upcomment
+  } from "@/api/article/article"
+
+  import {
+    addPd,
+  } from "@/api/discuss/publicDiscuss"
+
+  import website from '@/config/website'
+
+
+  import {
+    getDistrictTree
+  } from "@/api/district/index"
+
+  import {
+    mapGetters
+  } from "vuex"
+
+  export default {
+    data() {
+      return {
+        discussForm: {
+          ontitle: '',
+          title: '',
+          openFlag: 0,
+          numberRestrictions: 0,
+          voteRestrictions: 0,
+          userRestrictions: 0,
+          endTime: '',
+          articleId: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          repeatVote: 0,
+          voteNumberPublic: 0,
+          appointUser: '',
+          userIds: '',
+          eventType: 1,
+        },
+        dialogVisibles: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: false,
+          //stripe:true,
+          index: true,
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          editBtn: false,
+          selection: false,
+          excelBtn: false,
+          menu: false,
+          dialogClickModal: false,
+          column: [{
+              label: "标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入业主大会标题",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 110,
+              label: "封面",
+              prop: "url",
+              // align:'center',
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            {
+              width: 100,
+              label: "业主大会类型",
+              prop: "type",
+              value: 5,
+              slot: true,
+              searchSpan: 4,
+              // search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择招标类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "业主大会",
+                value: 5,
+              }],
+            },
+            // {
+            //   label: "招标来源",
+            //   prop: "sourceName",
+            //   search: true,
+            //   searchSpan: 4,
+            //   span: 24,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入招标类型",
+            //     trigger: "blur",
+            //   }, ],
+            // },
+            {
+              label: "公示范围",
+              prop: "articleList",
+              span: 12,
+              minRows: 2,
+              type: "cascader",
+              multiple: true,
+              tags: true,
+              dicData: [],
+              rules: [{
+                required: true,
+                message: "请选择业主大会范围",
+                trigger: "blur",
+              }, ],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              hide: true,
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 144,
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+
+            // {
+            //   width: 100,
+            //   label: "发布状态",
+            //   prop: "publish",
+            //   value: "0",
+            //   slot: true,
+            //   searchSpan: 4,
+            //   search: true,
+            //   type: "select",
+            //   display: false,
+            //   rules: [{
+            //     required: true,
+            //     message: "请选择发布状态",
+            //     trigger: "blur",
+            //   }, ],
+            //   dicData: [{
+            //       label: "未发布",
+            //       value: "0",
+            //     },
+            //     {
+            //       label: "已发布",
+            //       value: "1",
+            //     }
+            //   ],
+            // },
+            // {
+            //   width: 100,
+            //   label: "评论区",
+            //   prop: "iscomment",
+            //   slot: true,
+            //   type: "select",
+            //   dicData: [{
+            //       label: "关闭",
+            //       value: "0",
+            //     },
+            //     {
+            //       label: "开启",
+            //       value: "1",
+            //     }
+            //   ],
+            // },
+            {
+              label: "内容",
+              prop: "content",
+              component: "AvueUeditor",
+              options: {
+                action: "/api/blade-resource/oss/endpoint/put-file",
+                // customConfig: {
+                //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+                // },//wangEditor编辑的配置
+                props: {
+                  res: "data",
+                  url: "link",
+                },
+              },
+              hide: true,
+              minRows: 6,
+              span: 24,
+            },
+          ],
+        },
+        data: [],
+
+        districtTree: [],
+      }
+    },
+    watch: {
+      "form.articleType": {
+        handler(val) {
+          if (val) {
+            var videoUrl = this.findObject(this.option.column, "videoUrl")
+            var content = this.findObject(this.option.column, "content")
+            if (val.indexOf('ksp') != -1) {
+              videoUrl.display = true
+              content.display = false
+              videoUrl.rules = [{
+                required: false,
+                message: "请选择视频",
+                trigger: "blur",
+              }, ]
+            } else {
+              videoUrl.display = false
+              content.display = true
+              videoUrl.rules = ""
+            }
+          }
+        },
+        immediate: true,
+      }
+    },
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.article_add, true),
+          viewBtn: this.vaildData(this.permission.article_view, true),
+          delBtn: this.vaildData(this.permission.article_delete, true),
+          editBtn: this.vaildData(this.permission.article_edit, true),
+        }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      showStatus() {
+        return (data, type) => {
+          if (data == 0) {
+            return {
+              text: type == 1 ? '未发布' : '关闭',
+              type: 'info'
+            }
+          } else if (data == 1) {
+            return {
+              text: type == 1 ? '已发布' : '开启',
+              type: 'success'
+            }
+          }
+        }
+      }
+    },
+    methods: {
+
+      openDilog(row, type) {
+        this.dialogVisibles = true
+        this.discussForm.eventType = type
+        this.discussForm.articleId = row.id
+        this.discussForm.title = row.title
+        if (type == 0) {
+          this.discussForm.ontitle = '公益报名'
+        } else {
+          this.discussForm.ontitle = '创建议题'
+        }
+      },
+
+      handleSubmit(form, done) {
+        done()
+        addPd(form).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.dialogVisibles = false
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            // loading();
+          }
+        )
+      },
+
+      handleClose(done) {
+        done()
+        // this.$confirm('确认关闭?')
+        //   .then(_ => {
+        //     done();
+        //   })
+        //   .catch(_ => {});
+      },
+      rowSave(row, done, loading) {
+        row['type'] = 5
+        row.userid = this.userInfo.user_id
+        row.articleRange = JSON.stringify(row.articleList)
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+        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.articleRange = JSON.stringify(row.articleList)
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+
+        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)) {
+          getNotice(this.form.id).then((res) => {
+            let data = res.data.data
+            // data.forEach(item=>{
+            if (data.url.length > 0) {
+              var urls = []
+              var names = data.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              data.url = urls.join(",")
+            }
+            data.articleList = JSON.parse(data.articleRange)
+            this.form = 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
+        }
+        values.type = 5
+        values.publish = 1
+        this.loading = true
+        console.log(values)
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.url.length > 0) {
+              var urls = []
+              var names = item.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.url = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+        getDistrictTree(params = {}).then((res) => {
+          const data = res.data.data
+          this.districtTree = data
+          const column = this.findObject(this.option.column, "articleList")
+          column.dicData = res.data.data
+          this.loading = false
+        })
+      },
+      updateFb(row) {
+        if (row.publish == "0") {
+          row.publish = "1"
+        } else {
+          row.publish = "0"
+        }
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+        update(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      kqcomment() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据开启评论?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            return upcomment(this.ids, "1")
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      gbcomment() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据开启评论?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            return upcomment(this.ids, "0")
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      }
+    },
+  }
+</script>
+
+<style>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3