From d5e3ad419b5f6770e93d6adae753461b9ace462f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 28 Dec 2023 08:40:35 +0800
Subject: [PATCH] 公益报名+议事

---
 src/views/article/publicSignUp.vue                     |  928 +++++++--
 src/views/article/article.vue                          | 1451 ++++++++--------
 src/views/article/discussionManage.vue                 | 1050 ++++++-----
 src/views/article/components/publicSignUpChild.vue     |  415 ++++
 src/views/property/inviteTenders.vue                   |    5 
 src/views/property/oiae.vue                            |    9 
 src/views/article/components/discussionManageChild.vue |  734 ++++++++
 src/views/task/reportForRepairs.vue                    |  619 +++---
 8 files changed, 3,469 insertions(+), 1,742 deletions(-)

diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 9d0f4e3..67b5b79 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -1,787 +1,784 @@
 <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>
-                <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
+  <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>
+        <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
         </el-button>
         <el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
         </el-button> -->
-            </template>
+      </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, 0)">
+      <template slot-scope="{type,size,row }" slot="menu">
+        <!-- <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row, 0)">
                     公益报名
                 </el-button>
                 <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>
-                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    发布
-                </el-button>
-            </template>
+                </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 }" slot="publish">
-                <el-tag>{{
+      <template slot-scope="{ row }" slot="publish">
+        <el-tag>{{
                     row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
                 }}
-                </el-tag>
-            </template>
+        </el-tag>
+      </template>
 
-            <template slot-scope="{ row }" slot="iscomment">
-                <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
-                    :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
-                </el-switch>
-            </template>
-        </avue-crud>
+      <template slot-scope="{ row }" slot="iscomment">
+        <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
+          :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
+        </el-switch>
+      </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>
+    <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>
+      <div id="" v-else>
+        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+        </avue-form>
+      </div>
+    </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,
     getNoticePd,
     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"
+  } 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,
+  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: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 240,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "文章标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入文章标题",
+                trigger: "blur",
+              }, ],
             },
-            dialogVisibles: false,
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
+            {
+              label: "文章封面",
+              prop: "url",
+              // align:'center',
+              width: 80,
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
             },
-            datetime: "",
-            selectionList: [],
-            option: {
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 240,
-                border: false,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                excelBtn: true,
-                dialogClickModal: false,
-                column: [{
-                    label: "文章标题",
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    rules: [{
-                        required: true,
-                        message: "请输入文章标题",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    label: "文章封面",
-                    prop: "url",
-                    // align:'center',
-                    width: 80,
-                    type: "upload",
-                    listType: "picture-img",
-                    action: "/api/blade-resource/oss/endpoint/put-file",
-                    propsHttp: {
-                        res: "data",
-                        url: "link",
-                    },
-                    // hide: true,
-                    span: 24,
-                },
-                {
-                    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: [],
-                    props: {
-                        label: "name",
-                        value: 'id'
-                    },
-                    hide: true,
-                },
-                {
-                    label: "文章类型",
-                    prop: "articleType",
-                    addDisplay: true,
-                    editDisplay: true,
-                    viewDisplay: true,
-                    searchSpan: 3,
-                    checkStrictly: true,
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=articleType",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey",
-                    },
-                    search: true,
-                    type: "tree",
-                    rules: [{
-                        required: true,
-                        message: "请选择文章类型",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    label: "发布时间",
-                    prop: "dateTime",
-                    type: "datetime",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd",
-                    searchSpan: 5,
-                    searchRange: true,
-                    hide: true,
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    search: true,
-                    rules: [{
-                        required: true,
-                        message: "请选择发布时间",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    label: "发布时间",
-                    prop: "createTime",
-                    type: "date",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd HH:mm:ss",
-                },
-                {
-                    label: "发布状态",
-                    prop: "publish",
-                    searchSpan: 3,
-                    width: 80,
-                    value: "0",
-                    slot: true,
-                    search: true,
-                    type: "select",
-                    rules: [{
-                        required: true,
-                        message: "请选择发布状态",
-                        trigger: "blur",
-                    },],
-                    dicData: [{
-                        label: "未发布",
-                        value: "0",
-                    },
-                    {
-                        label: "已发布",
-                        value: "1",
-                    }
-                    ],
-                },
-                {
-                    label: "评论区",
-                    prop: "iscomment",
-                    width: 80,
-                    slot: true,
-                    type: "switch",
-                    activeColor: "#13ce66",
-                    inactiveColor: "#ccc",
-                    dicData: [{
-                        label: "关闭",
-                        value: "0",
-                    },
-                    {
-                        label: "开启",
-                        value: "1",
-                    }
-                    ],
-                },
-                {
-                    label: "视频",
-                    prop: "videoUrl",
-                    type: "upload",
-                    accept: "video/mp4",
-                    display: false,
-                    hide: true,
-                    span: 24,
-                    listType: "picture-img",
-                    action: "/api/depl/put-depl",
-                    propsHttp: {
-                        url: "data",
-                    },
-                },
-                {
-                    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,
-                },
-                ],
+            {
+              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: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              hide: true,
             },
-            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
-                    }]
-                },
-                {
-                    labelWidth: 100,
-                    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",
-                },
-                ]
+            {
+              label: "文章类型",
+              prop: "articleType",
+              addDisplay: true,
+              editDisplay: true,
+              viewDisplay: true,
+              searchSpan: 3,
+              checkStrictly: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=articleType",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              search: true,
+              type: "tree",
+              rules: [{
+                required: true,
+                message: "请选择文章类型",
+                trigger: "blur",
+              }, ],
             },
-            optionDiscuss: {
-                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
-                    }]
-                }, {
-                    labelWidth: 100,
-                    label: '开启签名',
-                    prop: 'signatureFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 3,
+              width: 80,
+              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 hh:mm:ss",
-                    valueFormat: "timestamp",
-                },
-                ]
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
             },
-            districtTree: [],
-        }
+            {
+              label: "评论区",
+              prop: "iscomment",
+              width: 80,
+              slot: true,
+              type: "switch",
+              activeColor: "#13ce66",
+              inactiveColor: "#ccc",
+              dicData: [{
+                  label: "关闭",
+                  value: "0",
+                },
+                {
+                  label: "开启",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "视频",
+              prop: "videoUrl",
+              type: "upload",
+              accept: "video/mp4",
+              display: false,
+              hide: true,
+              span: 24,
+              listType: "picture-img",
+              action: "/api/depl/put-depl",
+              propsHttp: {
+                url: "data",
+              },
+            },
+            {
+              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: [],
+        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
+              }]
+            },
+            {
+              labelWidth: 100,
+              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'
+              }
+            }, {
+              labelWidth: 100,
+              label: '开启投票',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            }, {
+              labelWidth: 100,
+              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: [],
+      }
     },
     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(",")
+      ...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(",")
+      }
     },
     methods: {
-        iscommentInput (e, data) {
-            upcomment(data.id, e).then(() => {
-                this.$message({
-                    type: "success",
-                    message: "操作成功!",
-                })
-            })
-        },
+      iscommentInput(e, data) {
+        upcomment(data.id, e).then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          })
+        })
+      },
 
-        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) {
-            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
-                    // 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(",")
-                    }
-                    // })
-                    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 = 0
-            this.loading = true
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.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()
-                })
+      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) {
+        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
+            // 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(",")
+            }
+            // })
+            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 = 0
+        this.loading = true
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.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/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
new file mode 100644
index 0000000..7d94fe0
--- /dev/null
+++ b/src/views/article/components/discussionManageChild.vue
@@ -0,0 +1,734 @@
+<template>
+  <basicContainer>
+    <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
+      @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
+      v-model="data" @selection-change="selectionChange" @row-save="rowSave" @row-del="rowDel"
+      @refresh-change="refreshChange">
+
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" icon="el-icon-edit" size="small" @click.stop="openEdit(scope.row,scope.index)">编辑
+        </el-button>
+        <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openDilog(scope.row,scope.index)">编辑议题
+        </el-button>
+        <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openUser(scope.row,0)">参与用户
+        </el-button>
+      </template>
+    </avue-crud>
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
+      <span slot="title" class="dialog-footer">
+        {{ontitle}}
+      </span>
+
+      <div id="" v-if="editFlag">
+        <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
+        </avue-form>
+      </div>
+
+      <div id="">
+        <avue-crud :option="optionList" :data="form" ref="crud" @row-update="rowUpdate" @row-del="rowDel">
+          <template slot="menuLeft" v-if="!editFlag">
+            <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
+            </el-button>
+          </template>
+          <template #icon="scope">
+            <i :class="scope.row.icon" style="font-size:14px"></i>
+          </template>
+          <template #menu="{row,size}">
+            <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
+            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
+            <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row,1)">选择此项人数
+              ：{{row.number}} 详情</el-button>
+          </template>
+        </avue-crud>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesEdit" width="50%" :before-close="editHandleClose">
+      <span slot="title" class="dialog-footer">
+        编辑议题
+      </span>
+      <div id="">
+        <avue-form @submit="handleSubmitEdit" :option="optionDiscussEdit" v-model="discussForm"></avue-form>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
+      <!-- <span slot="title" class="dialog-footer">
+        {{discussForm.ontitle}}
+      </span> -->
+      <avue-crud :data="userData" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
+    </el-dialog>
+
+  </basicContainer>
+</template>
+
+<script>
+  import {
+    getListPd,
+    getDetailPd,
+    addPd,
+    updatePd,
+    removePd
+  } from "@/api/discuss/publicDiscuss";
+
+  import {
+    getLists,
+    getList,
+    getDetail,
+    add,
+    update,
+    remove
+  } from "@/api/discuss/topics";
+
+  import {
+    getPage
+  } from "@/api/discuss/userTopics";
+
+  import option from "@/option/discuss/publicDiscuss";
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionary
+  } from '@/api/system/dict'
+
+  export default {
+    data() {
+      return {
+        option1: {
+          addBtn: false,
+          menu: false,
+          column: [{
+            label: '姓名',
+            prop: 'name'
+          }, {
+            label: '头像',
+            prop: 'avatar'
+          }, {
+            label: '手机',
+            prop: 'phone'
+          }, {
+            label: '小区',
+            prop: 'aoiName'
+          }, {
+            label: '地址',
+            prop: 'addressName'
+          }, {
+            label: '时间',
+            prop: 'createTime'
+          }]
+        },
+        userParams: {},
+        // 分页信息
+        pageUser: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+        discussForm: {
+          title: '',
+          openFlag: 0,
+          numberRestrictions: 0,
+          voteRestrictions: 0,
+          userRestrictions: 0,
+          endTime: '',
+          articleId: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          repeatVote: 0,
+          voteNumberPublic: 0,
+          appointUser: '',
+          userIds: '',
+          eventType: 1,
+        },
+        dialogVisiblesEdit: false,
+        dialogVisiblesUser: false,
+        editFlag: false,
+        optionList: {
+          headerAlign: 'center',
+          align: 'center',
+          border: true,
+          addBtn: false,
+          editBtn: false,
+          delBtn: false,
+          defaultExpandAll: true,
+          rowKey: 'id',
+          rowParentKey: 'parentId',
+          column: [{
+              label: '标题',
+              prop: 'discussContent',
+            },
+            {
+              label: '选项内容',
+              prop: 'optionContent',
+            }
+          ]
+        },
+        optionDiscuss: {
+          emptyText: '取消',
+          column: [{
+              label: '议题',
+              prop: 'discussContent',
+              type: 'input',
+              row: true,
+            }, {
+              label: '选项范围',
+              prop: 'optionRange',
+              type: 'radio',
+              button: true,
+              row: true,
+              dicData: [{
+                label: '多选',
+                value: 1
+              }, {
+                label: '单选',
+                value: 0
+              }]
+            }, {
+              label: '排序',
+              prop: 'sort',
+              controlsPosition: '',
+              type: 'number'
+            },
+            {
+              label: '选项内容',
+              prop: 'children',
+              type: 'dynamic',
+              span: 24,
+              children: {
+                column: [{
+                  label: '选项标题',
+                  prop: 'optionContent',
+                  type: 'input',
+                  rules: [{
+                    required: true,
+                    message: '请输入选项标题',
+                    trigger: 'blur'
+                  }]
+                }, {
+                  label: '选项说明',
+                  prop: 'optionDetail',
+                  type: 'input',
+                }]
+              }
+            },
+          ]
+        },
+        optionDiscussEdit: {
+          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
+              }]
+            }, {
+              labelWidth: 100,
+              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",
+            },
+          ]
+        },
+        disCussFrom: {
+          discussContent: '',
+          optionRange: 0,
+          sort: 1,
+          optionContent: '',
+          optionDetail: '',
+          number: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          publicDiscussId: '',
+          parentId: '',
+          level: '',
+          children: [{
+            optionContent: '',
+            optionDetail: '',
+            number: '',
+            createTime: '',
+            updateTime: '',
+            deleteFlag: '',
+            publicDiscussId: '',
+            parentId: '',
+            level: '',
+          }]
+
+        },
+        ontitle: '编辑议题',
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+        // 表单数据
+        form: [],
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: {
+          // selection: true,
+          height: "auto",
+          calcHeight: 54,
+          align: 'center',
+          menuAlign: 'center',
+          // addBtn: false,
+          editBtn: false,
+          searchMenuSpan: 3,
+          // searchBtn: true,
+          menuWidth: 500,
+          column: [{
+              label: 'ID',
+              prop: 'id',
+              searchSpan: 4,
+              // search: true,
+              display: false,
+            },
+            {
+              label: '标题',
+              prop: 'title',
+              searchSpan: 4,
+              disabled: true,
+            },
+            {
+              label: '参与人数',
+              prop: 'topsCount',
+              searchSpan: 4,
+              display: false,
+            },
+            {
+              label: '开启投票',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择开启状态",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: '投票限制',
+              prop: 'voteRestrictions',
+              type: 'radio',
+              button: true,
+              dicData: [{
+                label: '一人一票',
+                value: 0
+              }, {
+                label: '一户一票',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择投票限制",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: '签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              dicData: [{
+                label: '不需要',
+                value: 0
+              }, {
+                label: '需要',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否签名",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: '指定用户',
+              prop: 'appointUser',
+              type: 'radio',
+              button: true,
+              dicData: [{
+                label: '不限制',
+                value: 0
+              }, {
+                label: '指定用户',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否指定用户",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "截止时间",
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+              rules: [{
+                required: true,
+                message: "请选择截止时间",
+                trigger: "blur",
+              }, ],
+            }
+          ]
+        },
+        // 表单列表
+        data: [],
+        userData: [],
+        dataTop: [],
+        dialogVisibles: false,
+        publicDiscussId: '',
+        discussion: {},
+      }
+    },
+    mounted() {
+
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row) {
+        addPd(row).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.dialogVisibles = false
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            // loading();
+          }
+        )
+      },
+
+      init(data) {
+        this.discussion = data
+        // let row = {
+        //   title: data.title
+        // }
+        // this.data.push(row)
+        this.onLoad(data)
+      },
+
+      openUser(row, type) {
+        console.table(row)
+        this.dialogVisiblesUser = true
+        if (type == 0) {
+          this.userParams = {
+            publicDiscussId: row.id
+          }
+        } else {
+          this.userParams = {
+            topicsId: row.id
+          }
+        }
+        this.getUserPage(this.pageUser, this.userParams)
+      },
+
+      getUserPage(page, params = {}) {
+        getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.pageUser.total = data.total;
+          this.userData = data.records;
+        });
+      },
+
+      openEdit(row) {
+        this.discussForm = row
+        let times = new Date(row.endTime).getTime();
+        this.discussForm.endTime = times
+        this.dialogVisiblesEdit = true
+      },
+      // 提交修改
+      handleSubmitEdit(form, done) {
+        done()
+        if (!this.discussForm.id) {
+          addPd(this.discussForm).then(() => {
+            this.dialogVisiblesEdit = false
+            this.onLoad(this.discussion);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+        } else {
+          updatePd(this.discussForm).then(() => {
+            this.dialogVisiblesEdit = false
+            this.onLoad(this.discussion);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          })
+        }
+      },
+
+      deletes(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            // this.onLoad(this.page);
+            this.dialogVisibles = false
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+
+      handleClose() {
+        this.editFlag = false
+        this.dialogVisibles = false
+        this.disCussFrom = {}
+      },
+
+      edithandleClose() {
+        this.dialogVisiblesEdit = false
+      },
+
+      edit(row) {
+        this.disCussFrom = row
+        this.editFlag = true
+      },
+
+      add() {
+        this.editFlag = true
+      },
+
+      handleReset() {
+        this.editFlag = false
+      },
+
+      openDilog(row, type) {
+        this.dialogVisibles = true
+        this.loading = true;
+        this.publicDiscussId = row.id
+        let params = {
+          level: 1,
+          publicDiscussId: row.id
+        }
+        getLists(1, 100, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.form = data;
+          this.loading = false;
+          this.selectionClear();
+        })
+      },
+
+      handleSubmit(form, done) {
+        done();
+        form.publicDiscussId = this.publicDiscussId
+        add(form).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.editFlag = false
+            let params = {
+              level: 1,
+              publicDiscussId: this.publicDiscussId
+            }
+            getLists(1, 100, Object.assign(params, this.query)).then(res => {
+              const data = res.data.data;
+              this.form = data;
+            })
+          },
+          (error) => {
+            window.console.log(error);
+            // loading();
+          }
+        );
+      },
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        this.onLoad(this.discussion);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.discussion);
+      },
+
+      handleAdd() {
+        this.title = '新增'
+        this.form = {}
+        this.box = true
+      },
+      handleEdit(row) {
+        this.title = '编辑'
+        this.box = true
+        getDetailPd(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      handleView(row) {
+        this.title = '查看'
+        this.view = true;
+        this.box = true;
+        getDetailPd(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return removePd(this.ids);
+          })
+          .then(() => {
+            this.selectionClear();
+            this.onLoad(this.discussion);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.discussion);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      beforeClose(done) {
+        done()
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        // this.$refs.table.clearSelection();
+      },
+      // currentChange(currentPage) {
+      //   this.page.currentPage = currentPage;
+      //   this.onLoad(this.page);
+      // },
+      // sizeChange(pageSize) {
+      //   this.page.pageSize = pageSize;
+      //   this.onLoad(this.page);
+      // },
+      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.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .el-pagination {
+    margin-top: 20px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/article/components/publicSignUpChild.vue b/src/views/article/components/publicSignUpChild.vue
new file mode 100644
index 0000000..209c0e9
--- /dev/null
+++ b/src/views/article/components/publicSignUpChild.vue
@@ -0,0 +1,415 @@
+<template>
+  <basicContainer>
+    <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
+      @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
+      v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel" @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> -->
+        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
+          @click="handleDelete">批量删除
+        </el-button>
+      </template>
+
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" icon="el-icon-s-custom" size="small" @click.stop="openDilog(scope.row,0)">
+          编辑
+        </el-button>
+        <el-button type="primary" icon="el-icon-s-custom" size="small" @click.stop="openUser(scope.row,0)">
+          参与用户
+        </el-button>
+      </template>
+    </avue-crud>
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+      <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+      </avue-form>
+    </el-dialog>
+
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
+      <!-- <span slot="title" class="dialog-footer">
+        {{discussForm.ontitle}}
+      </span> -->
+      <avue-crud :data="dataUser" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
+    </el-dialog>
+
+
+  </basicContainer>
+</template>
+
+<script>
+  import {
+    getListPd,
+    getDetailPd,
+    addPd,
+    updatePd,
+    removePd,
+  } from "@/api/discuss/publicDiscuss";
+  import {
+    getPageUser,
+  } from "@/api/discuss/userPublicEnroll";
+  import option from "@/option/discuss/publicDiscuss";
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionary
+  } from '@/api/system/dict'
+
+  export default {
+    data() {
+      return {
+        option1: {
+          menu: false,
+          addBtn: false,
+          column: [{
+            label: '姓名',
+            prop: 'name'
+          }, {
+            label: '头像',
+            prop: 'avatar'
+          }, {
+            label: '手机',
+            prop: 'phone'
+          }, {
+            label: '小区',
+            prop: 'aoiName'
+          }, {
+            label: '地址',
+            prop: 'addressName'
+          }, {
+            label: '时间',
+            prop: 'createTime'
+          }]
+        },
+        discussForm: {
+          ontitle: '',
+          title: '',
+          openFlag: 0,
+          numberRestrictions: 0,
+          voteRestrictions: 0,
+          userRestrictions: 0,
+          endTime: '',
+          articleId: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          repeatVote: 0,
+          voteNumberPublic: 0,
+          appointUser: '',
+          userIds: '',
+          eventType: 1,
+        },
+        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
+              }]
+            },
+            {
+              labelWidth: 100,
+              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",
+            },
+          ]
+        },
+        dialogVisibles: false,
+        dialogVisiblesUser: false,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+
+        // 分页信息
+        pageUser: {
+          pageSize: 10,
+          pageSizes: [10, 20, 30, 50, 100],
+          currentPage: 1,
+          total: 0
+        },
+        // 表单数据
+        form: {},
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: {
+          selection: true,
+          height: "auto",
+          calcHeight: 54,
+          align: 'center',
+          menuAlign: 'center',
+          addBtn: false,
+          editBtn: false,
+          searchMenuSpan: 3,
+          searchBtn: true,
+          menuWidth: 500,
+          column: [{
+              label: 'ID',
+              prop: 'id',
+              searchSpan: 4,
+              // search: true,
+            },
+            {
+              label: '标题',
+              prop: 'title',
+              searchSpan: 4,
+              search: true,
+            },
+            {
+              label: '参与人数',
+              prop: 'enrollCount',
+              searchSpan: 4,
+              search: true,
+            },
+            {
+              label: '截止时间',
+              prop: 'endTime',
+              searchSpan: 4,
+              search: true,
+            }
+          ]
+        },
+        // 表单列表
+        data: [],
+        dataUser: [],
+      }
+    },
+    mounted() {
+      // this.init();
+      // this.onLoad(this.page);
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      init(data) {
+        this.houseCode = data.houseCode
+        this.onLoad(this.page)
+      },
+      getUser(page, params = {}) {
+        getPageUser(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.pageUser.total = data.total;
+          this.dataUser = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+      userHandleClose() {
+        this.dialogVisiblesUser = false
+      },
+      openUser(row) {
+        this.dialogVisiblesUser = true
+        this.getUser(this.pageUser, params = {})
+      },
+      openDilog(row, type) {
+        this.dialogVisibles = true
+        this.discussForm = row
+        let times = new Date(row.endTime).getTime();
+        this.discussForm.endTime = times
+        console.table(this.discussForm)
+        if (type == 0) {
+          this.discussForm.ontitle = '公益报名'
+        } else {
+          this.discussForm.ontitle = '创建议题'
+        }
+      },
+
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        this.onLoad(this.page);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      handleSubmit(form, done) {
+        done()
+        if (!this.discussForm.id) {
+          addPd(this.discussForm).then(() => {
+            this.dialogVisibles = false
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+        } else {
+          updatePd(this.discussForm).then(() => {
+            this.dialogVisibles = false
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          })
+        }
+      },
+      handleAdd() {
+        this.title = '新增'
+        this.form = {}
+        this.box = true
+      },
+      handleEdit(row) {
+        this.title = '编辑'
+        this.box = true
+        getDetailPd(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      handleView(row) {
+        this.title = '查看'
+        this.view = true;
+        this.box = true;
+        getDetailPd(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return removePd(this.ids);
+          })
+          .then(() => {
+            this.selectionClear();
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      beforeClose(done) {
+        done()
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        // this.$refs.table.clearSelection();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+        this.onLoad(this.page);
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+        this.onLoad(this.page);
+      },
+      onLoad(page, params = {
+        eventType: 0
+      }) {
+        this.loading = true;
+        getListPd(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .el-pagination {
+    margin-top: 20px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 113ba42..2d904b4 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -1,144 +1,99 @@
 <template>
-  <basicContainer>
-    <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
-      @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
-      v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel" @refresh-change="refreshChange"
-      @on-load="onLoad">
+  <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 type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
-          @click="handleDelete">批量删除
+        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
         </el-button>
       </template>
 
-      <template slot-scope="scope" slot="menu">
-        <el-button type="text" icon="el-icon-edit" size="small" @click.stop="openEdit(scope.row,scope.index)">编辑
+      <template slot-scope="{type,size,row }" slot="menu">
+
+        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
+          创建议题
         </el-button>
-        <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openDilog(scope.row,scope.index)">编辑议题
+        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+          撤销
         </el-button>
-        <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openUser(scope.row,0)">参与用户
+        <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 }" slot="publish">
+        <el-tag>{{row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"}}
+        </el-tag>
+      </template>
+
+      <template slot-scope="{ row }" slot="iscomment">
+        <el-tag>{{ row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"}}
+        </el-tag>
       </template>
     </avue-crud>
 
-    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
-      <span slot="title" class="dialog-footer">
-        {{ontitle}}
-      </span>
 
-      <div id="" v-if="editFlag">
-        <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
-        </avue-form>
-      </div>
 
-      <div id="">
-        <avue-crud :option="optionList" :data="form" ref="crud" @row-save="rowSave" @row-update="rowUpdate"
-          @row-del="rowDel">
-          <template slot="menuLeft" v-if="!editFlag">
-            <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
-            </el-button>
-          </template>
-          <template #icon="scope">
-            <i :class="scope.row.icon" style="font-size:14px"></i>
-          </template>
-          <template #menu="{row,size}">
-            <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
-            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
-            <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row,1)">选择此项人数
-              ：{{row.number}} 详情</el-button>
-          </template>
-        </avue-crud>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesEdit" width="50%" :before-close="editHandleClose">
-      <span slot="title" class="dialog-footer">
-        编辑议题
-      </span>
-      <div id="">
-        <avue-form @submit="handleSubmitEdit" :option="optionDiscussEdit" v-model="discussForm"></avue-form>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="80%" :before-close="handleClose">
+      <discussionManageChild ref="discussionManageChild" />
       <!-- <span slot="title" class="dialog-footer">
         {{discussForm.ontitle}}
       </span> -->
-      <avue-crud :data="userData" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
+      <!--  <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>
 
-  </basicContainer>
+
+  </basic-container>
 </template>
 
 <script>
   import {
-    getListPd,
-    getDetailPd,
-    addPd,
-    updatePd,
-    removePd
-  } from "@/api/discuss/publicDiscuss";
-
-  import {
-    getLists,
     getList,
-    getDetail,
-    add,
+    remove,
     update,
-    remove
-  } from "@/api/discuss/topics";
+    add,
+    getNotice,
+    upcomment
+  } from "@/api/article/article";
 
   import {
-    getPage
-  } from "@/api/discuss/userTopics";
-
-  import option from "@/option/discuss/publicDiscuss";
+    getListPd,
+    removePd,
+    updatePd,
+    addPd,
+    getNoticePd,
+    upcommentPd
+  } from "@/api/discuss/publicDiscuss";
+  import website from '@/config/website';
+  import {
+    getDistrictTree
+  } from "@/api/district/index";
   import {
     mapGetters
   } from "vuex";
-  import {
-    getDictionary
-  } from '@/api/system/dict'
-
+  import discussionManageChild from "./components/discussionManageChild"
   export default {
+    components: {
+      discussionManageChild
+    },
     data() {
       return {
-        option1: {
-          addBtn: false,
-          menu: false,
-          column: [{
-            label: '姓名',
-            prop: 'name'
-          }, {
-            label: '头像',
-            prop: 'avatar'
-          }, {
-            label: '手机',
-            prop: 'phone'
-          }, {
-            label: '小区',
-            prop: 'aoiName'
-          }, {
-            label: '地址',
-            prop: 'addressName'
-          }, {
-            label: '时间',
-            prop: 'createTime'
-          }]
-        },
-        userParams: {},
-        // 分页信息
-        pageUser: {
-          pageSize: 10,
-          pageSizes: [10, 20, 30, 50, 100],
-          currentPage: 1,
-          total: 0
-        },
         discussForm: {
+          ontitle: '',
           title: '',
           openFlag: 0,
           numberRestrictions: 0,
           voteRestrictions: 0,
           userRestrictions: 0,
+          signatureFlag: 0,
           endTime: '',
           articleId: '',
           createTime: '',
@@ -146,84 +101,207 @@
           deleteFlag: '',
           repeatVote: 0,
           voteNumberPublic: 0,
-          appointUser: '',
+          appointUser: 0,
           userIds: '',
           eventType: 1,
         },
-        dialogVisiblesEdit: false,
-        dialogVisiblesUser: false,
-        editFlag: false,
-        optionList: {
-          headerAlign: 'center',
-          align: 'center',
-          border: true,
-          addBtn: false,
-          editBtn: false,
-          delBtn: false,
-          defaultExpandAll: true,
-          rowKey: 'id',
-          rowParentKey: 'parentId',
-          column: [{
-              label: '标题',
-              prop: 'discussContent',
-            },
-            {
-              label: '选项内容',
-              prop: 'optionContent',
-            }
-          ]
+        dialogVisibles: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
         },
-        optionDiscuss: {
-          emptyText: '取消',
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
           column: [{
-              label: '议题',
-              prop: 'discussContent',
-              type: 'input',
-              row: true,
-            }, {
-              label: '选项范围',
-              prop: 'optionRange',
-              type: 'radio',
-              button: true,
-              row: true,
-              dicData: [{
-                label: '多选',
-                value: 1
-              }, {
-                label: '单选',
-                value: 0
-              }]
-            }, {
-              label: '排序',
-              prop: 'sort',
-              controlsPosition: '',
-              type: 'number'
-            },
-            {
-              label: '选项内容',
-              prop: 'children',
-              type: 'dynamic',
+              label: "资讯标题",
+              prop: "title",
               span: 24,
-              children: {
-                column: [{
-                  label: '选项标题',
-                  prop: 'optionContent',
-                  type: 'input',
-                  rules: [{
-                    required: true,
-                    message: '请输入选项标题',
-                    trigger: 'blur'
-                  }]
-                }, {
-                  label: '选项说明',
-                  prop: 'optionDetail',
-                  type: 'input',
-                }]
-              }
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入资讯标题",
+                trigger: "blur",
+              }, ],
             },
-          ]
+            {
+              label: "资讯封面",
+              prop: "url",
+              // align:'center',
+              width: 80,
+              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,
+            },
+            {
+              label: "文章类型",
+              prop: "articleType",
+              addDisplay: true,
+              editDisplay: true,
+              viewDisplay: true,
+              searchSpan: 3,
+              checkStrictly: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              search: true,
+              type: "tree",
+              rules: [{
+                required: true,
+                message: "请选择文章类型",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 3,
+              width: 80,
+              value: "0",
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
+                },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "评论区",
+              prop: "iscomment",
+              width: 80,
+              slot: true,
+              type: "select",
+              dicData: [{
+                  label: "关闭",
+                  value: "0",
+                },
+                {
+                  label: "开启",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "视频",
+              prop: "videoUrl",
+              type: "upload",
+              accept: "video/mp4",
+              display: false,
+              hide: true,
+              span: 24,
+              listType: "picture-img",
+              action: "/api/depl/put-depl",
+              propsHttp: {
+                url: "data",
+              },
+            },
+            {
+              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,
+            },
+          ],
         },
-        optionDiscussEdit: {
+        data: [],
+        optionDiscuss: {
           column: [{
               label: "",
               type: 'title',
@@ -248,22 +326,72 @@
               }, {
                 label: '不开启',
                 value: 1
-              }]
+              }],
+              rules: [{
+                required: true,
+                message: "请选择开启状态",
+                trigger: "blur",
+              }, ],
             }, {
               labelWidth: 100,
-              label: '开启签名',
+              label: '投票限制',
+              prop: 'voteRestrictions',
+              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: 'signatureFlag',
               type: 'radio',
               button: true,
               row: true,
               offset: 6,
               dicData: [{
-                label: '开启',
+                label: '不需要',
                 value: 0
               }, {
-                label: '不开启',
+                label: '需要',
                 value: 1
-              }]
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否签名",
+                trigger: "blur",
+              }, ],
+            }, {
+              labelWidth: 100,
+              label: '指定用户',
+              prop: 'appointUser',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '不限制',
+                value: 0
+              }, {
+                label: '指定用户',
+                value: 1
+              }],
+              rules: [{
+                required: true,
+                message: "请选择是否指定用户",
+                trigger: "blur",
+              }, ],
             },
             {
               label: "截止时间",
@@ -273,250 +401,86 @@
               type: "datetime",
               format: "yyyy-MM-dd hh:mm:ss",
               valueFormat: "timestamp",
+              rules: [{
+                required: true,
+                message: "请选择截止时间",
+                trigger: "blur",
+              }, ],
             },
           ]
         },
-        disCussFrom: {
-          discussContent: '',
-          optionRange: 0,
-          sort: 1,
-          optionContent: '',
-          optionDetail: '',
-          number: '',
-          createTime: '',
-          updateTime: '',
-          deleteFlag: '',
-          publicDiscussId: '',
-          parentId: '',
-          level: '',
-          children: [{
-            optionContent: '',
-            optionDetail: '',
-            number: '',
-            createTime: '',
-            updateTime: '',
-            deleteFlag: '',
-            publicDiscussId: '',
-            parentId: '',
-            level: '',
-          }]
-
-        },
-        ontitle: '编辑议题',
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          pageSize: 10,
-          pageSizes: [10, 20, 30, 50, 100],
-          currentPage: 1,
-          total: 0
-        },
-        // 表单数据
-        form: [],
-        // 选择行
-        selectionList: [],
-        // 表单配置
-        option: {
-          selection: true,
-          height: "auto",
-          calcHeight: 54,
-          align: 'center',
-          menuAlign: 'center',
-          addBtn: false,
-          editBtn: false,
-          searchMenuSpan: 3,
-          searchBtn: true,
-          menuWidth: 500,
-          column: [{
-              label: 'ID',
-              prop: 'id',
-              searchSpan: 4,
-              // search: true,
-            },
-            {
-              label: '标题',
-              prop: 'title',
-              searchSpan: 4,
-              search: true,
-            },
-            {
-              label: '参与人数',
-              prop: 'topsCount',
-              searchSpan: 4,
-              search: true,
-            },
-            {
-              label: '截止时间',
-              prop: 'endTime',
-              searchSpan: 4,
-              search: true,
+        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 = "";
             }
-          ]
+          }
         },
-        // 表单列表
-        data: [],
-        userData: [],
-        dataTop: [],
-        dialogVisibles: false,
-        publicDiscussId: '',
+        immediate: true,
       }
     },
-    mounted() {
-      // this.init();
-      // this.onLoad(this.page);
-    },
     computed: {
-      ...mapGetters(["permission"]),
+      ...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 => {
+        this.selectionList.forEach((ele) => {
           ids.push(ele.id);
         });
         return ids.join(",");
-      }
+      },
     },
     methods: {
-
-      openUser(row, type) {
-        console.table(row)
-        this.dialogVisiblesUser = true
-        if (type == 0) {
-          this.userParams = {
-            publicDiscussId: row.id
-          }
-        } else {
-          this.userParams = {
-            topicsId: row.id
-          }
-        }
-        this.getUserPage(this.pageUser, this.userParams)
-      },
-
-      getUserPage(page, params = {}) {
-        getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.pageUser.total = data.total;
-          this.userData = data.records;
-        });
-      },
-
-      openEdit(row) {
-        this.discussForm = row
-        let times = new Date(row.endTime).getTime();
-        this.discussForm.endTime = times
-        this.dialogVisiblesEdit = true
-      },
-      // 提交修改
-      handleSubmitEdit(form, done) {
-        done()
-        if (!this.discussForm.id) {
-          addPd(this.discussForm).then(() => {
-            this.dialogVisiblesEdit = false
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-        } else {
-          updatePd(this.discussForm).then(() => {
-            this.dialogVisiblesEdit = false
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          })
-        }
-      },
-
-      deletes(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            // this.onLoad(this.page);
-            this.dialogVisibles = false
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-
-      handleClose() {
-        this.editFlag = false
-        this.dialogVisibles = false
-        this.disCussFrom = {}
-      },
-
-      edithandleClose() {
-        this.dialogVisiblesEdit = false
-      },
-
-      edit(row) {
-        this.disCussFrom = row
-        this.editFlag = true
-      },
-
-      add() {
-        this.editFlag = true
-      },
-
-      handleReset() {
-        this.editFlag = false
-      },
-
       openDilog(row, type) {
+        var that = this
         this.dialogVisibles = true
-        this.loading = true;
-        this.publicDiscussId = row.id
-        let params = {
-          level: 1,
-          publicDiscussId: row.id
-        }
-        getLists(1, 100, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.form = data;
-          this.loading = false;
-          this.selectionClear();
+        this.$nextTick(() => {
+          that.$refs.discussionManageChild.init(row)
         })
+        // 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();
-        form.publicDiscussId = this.publicDiscussId
-        add(form).then(
+        addPd(form).then(
           () => {
             this.$message({
               type: "success",
               message: "操作成功!",
             });
-            this.editFlag = false
-            let params = {
-              level: 1,
-              publicDiscussId: this.publicDiscussId
-            }
-            getLists(1, 100, Object.assign(params, this.query)).then(res => {
-              const data = res.data.data;
-              this.form = data;
-            })
+            this.dialogVisibles = false
+            done();
           },
           (error) => {
             window.console.log(error);
@@ -525,38 +489,106 @@
         );
       },
 
-      init() {},
-      searchHide() {
-        this.search = !this.search;
+      handleClose(done) {
+        done();
+        // this.$confirm('确认关闭？')
+        //   .then(_ => {
+        //     done();
+        //   })
+        //   .catch(_ => {});
       },
-      searchChange() {
-        this.onLoad(this.page);
+      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(",")
+        }
+        // 类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
+        row.type = 4
+        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.page.currentPage = 1;
         this.onLoad(this.page);
       },
-
-      handleAdd() {
-        this.title = '新增'
-        this.form = {}
-        this.box = true
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
       },
-      handleEdit(row) {
-        this.title = '编辑'
-        this.box = true
-        getDetailPd(row.id).then(res => {
-          this.form = res.data.data;
-        });
+      selectionChange(list) {
+        this.selectionList = list;
       },
-      handleView(row) {
-        this.title = '查看'
-        this.view = true;
-        this.box = true;
-        getDetailPd(row.id).then(res => {
-          this.form = res.data.data;
-        });
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
@@ -566,75 +598,171 @@
         this.$confirm("确定将选择数据删除?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
-            type: "warning"
+            type: "warning",
           })
           .then(() => {
-            return removePd(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id);
+            return remove(this.ids);
           })
           .then(() => {
             this.onLoad(this.page);
             this.$message({
               type: "success",
-              message: "操作成功!"
+              message: "操作成功!",
             });
+            this.$refs.crud.toggleSelection();
           });
       },
-      beforeClose(done) {
-        done()
-        this.form = {};
-        this.view = false;
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        // this.$refs.table.clearSelection();
+      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(",")
+            }
+            // })
+            this.form = data;
+          });
+        }
+        // con
+        done();
       },
       currentChange(currentPage) {
         this.page.currentPage = currentPage;
-        this.onLoad(this.page);
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize;
-        this.onLoad(this.page);
       },
-      onLoad(page, params = {
-        eventType: 1
-      }) {
+      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 = 4
         this.loading = true;
-        getListPd(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        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 lang="scss" scoped>
-  .el-pagination {
-    margin-top: 20px;
+<style>
+  .avue-upload__icon {
+    line-height: 6;
   }
 </style>
\ No newline at end of file
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index 6cc23ca..2017d5a 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -1,89 +1,98 @@
 <template>
-  <basicContainer>
-    <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
-      @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
-      v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel" @refresh-change="refreshChange"
-      @on-load="onLoad">
+  <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> -->
-        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
-          @click="handleDelete">批量删除
+        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
         </el-button>
       </template>
 
-      <template slot-scope="scope" slot="menu">
-        <el-button type="text" icon="el-icon-s-custom" size="small" @click.stop="openDilog(scope.row,0)">
-          编辑
+      <template slot-scope="{type,size,row }" slot="menu">
+        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
+          公益报名
         </el-button>
-        <el-button type="primary" icon="el-icon-s-custom" size="small" @click.stop="openUser(scope.row,0)">
-          参与用户
+        <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 }" slot="publish">
+        <el-tag>{{
+          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
+          }}
+        </el-tag>
+      </template>
+
+      <template slot-scope="{ row }" slot="iscomment">
+        <el-tag>{{
+          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
+          }}
+        </el-tag>
       </template>
     </avue-crud>
 
     <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-      <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
-      </avue-form>
-    </el-dialog>
-
-
-    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
-      <!-- <span slot="title" class="dialog-footer">
+      <span slot="title" class="dialog-footer">
         {{discussForm.ontitle}}
-      </span> -->
-      <avue-crud :data="dataUser" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
+      </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>
 
 
-  </basicContainer>
+
+
+  </basic-container>
 </template>
 
 <script>
   import {
-    getListPd,
-    getDetailPd,
-    addPd,
-    updatePd,
-    removePd,
-  } from "@/api/discuss/publicDiscuss";
+    getList,
+    remove,
+    update,
+    add,
+    getNotice,
+    upcomment
+  } from "@/api/article/article";
+
   import {
-    getPageUser,
-  } from "@/api/discuss/userPublicEnroll";
-  import option from "@/option/discuss/publicDiscuss";
+    getListPd,
+    removePd,
+    updatePd,
+    addPd,
+    getNoticePd,
+    upcommentPd
+  } from "@/api/discuss/publicDiscuss";
+
+  import website from '@/config/website';
+
+
+  import {
+    getDistrictTree
+  } from "@/api/district/index";
+
   import {
     mapGetters
   } from "vuex";
-  import {
-    getDictionary
-  } from '@/api/system/dict'
+  import publicSignUpChild from "./components/publicSignUpChild"
 
   export default {
+    components: {
+      publicSignUpChild
+    },
     data() {
       return {
-        option1: {
-          menu: false,
-          addBtn: false,
-          column: [{
-            label: '姓名',
-            prop: 'name'
-          }, {
-            label: '头像',
-            prop: 'avatar'
-          }, {
-            label: '手机',
-            prop: 'phone'
-          }, {
-            label: '小区',
-            prop: 'aoiName'
-          }, {
-            label: '地址',
-            prop: 'addressName'
-          }, {
-            label: '时间',
-            prop: 'createTime'
-          }]
-        },
         discussForm: {
           ontitle: '',
           title: '',
@@ -102,6 +111,267 @@
           userIds: '',
           eventType: 1,
         },
+        dialogVisibles: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "资讯标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入资讯标题",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "资讯封面",
+              prop: "url",
+              // align:'center',
+              width: 80,
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            // {
+            //   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: "type",
+              searchSpan: 3,
+              width: 80,
+              value: 2,
+              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: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 3,
+              width: 80,
+              value: "0",
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
+                },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "评论区",
+              prop: "iscomment",
+              width: 80,
+              slot: true,
+              type: "select",
+              dicData: [{
+                  label: "关闭",
+                  value: "0",
+                },
+                {
+                  label: "开启",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              // 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 hh:mm:ss",
+              valueFormat: "timestamp",
+              rules: [{
+                required: true,
+                message: "请选截止时间",
+                trigger: "blur",
+              }, ],
+            },
+            // {
+            //   label: "视频",
+            //   prop: "videoUrl",
+            //   type: "upload",
+            //   accept: "video/mp4",
+            //   display: false,
+            //   hide: true,
+            //   span: 24,
+            //   listType: "picture-img",
+            //   action: "/api/depl/put-depl",
+            //   propsHttp: {
+            //     url: "data",
+            //   },
+            // },
+            {
+              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: [],
         optionEnroll: {
           column: [{
               label: "",
@@ -127,12 +397,79 @@
               }, {
                 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 hh:mm:ss",
+              valueFormat: "timestamp",
+              rules: [{
+                required: true,
+                message: "请选截止时间",
+                trigger: "blur",
+              }, ],
+            },
+          ]
+        },
+        optionDiscuss: {
+          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
+              }]
+            }, {
+              labelWidth: 100,
+              label: '开启签名',
+              prop: 'signatureFlag',
               type: 'radio',
               button: true,
               row: true,
@@ -156,178 +493,181 @@
             },
           ]
         },
-        dialogVisibles: false,
-        dialogVisiblesUser: false,
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          pageSize: 10,
-          pageSizes: [10, 20, 30, 50, 100],
-          currentPage: 1,
-          total: 0
-        },
-
-        // 分页信息
-        pageUser: {
-          pageSize: 10,
-          pageSizes: [10, 20, 30, 50, 100],
-          currentPage: 1,
-          total: 0
-        },
-        // 表单数据
-        form: {},
-        // 选择行
-        selectionList: [],
-        // 表单配置
-        option: {
-          selection: true,
-          height: "auto",
-          calcHeight: 54,
-          align: 'center',
-          menuAlign: 'center',
-          addBtn: false,
-          editBtn: false,
-          searchMenuSpan: 3,
-          searchBtn: true,
-          menuWidth: 500,
-          column: [{
-              label: 'ID',
-              prop: 'id',
-              searchSpan: 4,
-              // search: true,
-            },
-            {
-              label: '标题',
-              prop: 'title',
-              searchSpan: 4,
-              search: true,
-            },
-            {
-              label: '参与人数',
-              prop: 'enrollCount',
-              searchSpan: 4,
-              search: true,
-            },
-            {
-              label: '截止时间',
-              prop: 'endTime',
-              searchSpan: 4,
-              search: true,
+        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 = "";
             }
-          ]
+          }
         },
-        // 表单列表
-        data: [],
-        dataUser: [],
+        immediate: true,
       }
     },
-    mounted() {
-      // this.init();
-      // this.onLoad(this.page);
-    },
     computed: {
-      ...mapGetters(["permission"]),
+      ...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 => {
+        this.selectionList.forEach((ele) => {
           ids.push(ele.id);
         });
         return ids.join(",");
-      }
+      },
     },
     methods: {
-      getUser(page, params = {}) {
-        getPageUser(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.pageUser.total = data.total;
-          this.dataUser = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      userHandleClose() {
-        this.dialogVisiblesUser = false
-      },
-      openUser(row) {
-        this.dialogVisiblesUser = true
-        this.getUser(this.pageUser, params = {})
-      },
+
       openDilog(row, type) {
         this.dialogVisibles = true
-        this.discussForm = row
-        let times = new Date(row.endTime).getTime();
-        this.discussForm.endTime = times
-        console.table(this.discussForm)
+        this.discussForm.eventType = type
+        this.discussForm.articleId = row.id
+        this.discussForm.title = row.title
         if (type == 0) {
           this.discussForm.ontitle = '公益报名'
         } else {
           this.discussForm.ontitle = '创建议题'
         }
       },
-      init() {},
-      searchHide() {
-        this.search = !this.search;
+
+      handleSubmit(form, done) {
+        done();
+        addPd(form).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.dialogVisibles = false
+            done();
+          },
+          (error) => {
+            window.console.log(error);
+            // loading();
+          }
+        );
       },
-      searchChange() {
-        this.onLoad(this.page);
+
+      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.page.currentPage = 1;
         this.onLoad(this.page);
       },
-      handleSubmit(form, done) {
-        done()
-        if (!this.discussForm.id) {
-          addPd(this.discussForm).then(() => {
-            this.dialogVisibles = false
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-        } else {
-          updatePd(this.discussForm).then(() => {
-            this.dialogVisibles = false
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          })
-        }
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
       },
-      handleAdd() {
-        this.title = '新增'
-        this.form = {}
-        this.box = true
+      selectionChange(list) {
+        this.selectionList = list;
       },
-      handleEdit(row) {
-        this.title = '编辑'
-        this.box = true
-        getDetailPd(row.id).then(res => {
-          this.form = res.data.data;
-        });
-      },
-      handleView(row) {
-        this.title = '查看'
-        this.view = true;
-        this.box = true;
-        getDetailPd(row.id).then(res => {
-          this.form = res.data.data;
-        });
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
@@ -337,75 +677,171 @@
         this.$confirm("确定将选择数据删除?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
-            type: "warning"
+            type: "warning",
           })
           .then(() => {
-            return removePd(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id);
+            return remove(this.ids);
           })
           .then(() => {
             this.onLoad(this.page);
             this.$message({
               type: "success",
-              message: "操作成功!"
+              message: "操作成功!",
             });
+            this.$refs.crud.toggleSelection();
           });
       },
-      beforeClose(done) {
-        done()
-        this.form = {};
-        this.view = false;
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        // this.$refs.table.clearSelection();
+      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(",")
+            }
+            // })
+            this.form = data;
+          });
+        }
+        // con
+        done();
       },
       currentChange(currentPage) {
         this.page.currentPage = currentPage;
-        this.onLoad(this.page);
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize;
-        this.onLoad(this.page);
       },
-      onLoad(page, params = {
-        eventType: 0
-      }) {
+      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;
-        getListPd(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        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 lang="scss" scoped>
-  .el-pagination {
-    margin-top: 20px;
+<style>
+  .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 3b14249..08bc75f 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -191,6 +191,11 @@
               multiple: true,
               tags: true,
               dicData: [],
+              rules: [{
+                required: true,
+                message: "请选择资讯范围",
+                trigger: "blur",
+              }, ],
               props: {
                 label: "name",
                 value: 'id'
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index dfd9614..ec81199 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -7,10 +7,10 @@
       <template slot="menuLeft">
         <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
         </el-button>
-        <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
+        <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
         </el-button>
         <el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
-        </el-button>
+        </el-button> -->
       </template>
 
       <template slot-scope="{type,size,row }" slot="menu">
@@ -191,6 +191,11 @@
               multiple: true,
               tags: true,
               dicData: [],
+              rules: [{
+                required: true,
+                message: "请选择资讯范围",
+                trigger: "blur",
+              }, ],
               props: {
                 label: "name",
                 value: 'id'
diff --git a/src/views/task/reportForRepairs.vue b/src/views/task/reportForRepairs.vue
index e5d974c..d47f61e 100644
--- a/src/views/task/reportForRepairs.vue
+++ b/src/views/task/reportForRepairs.vue
@@ -1,324 +1,331 @@
 <!-- 走访日志 -->
 <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>
-        </avue-crud>
-    </basic-container>
+  <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>
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
-import { getList, remove, update, add, getReportForRepairs } from "@/api/task/reportForRepairs"
-import { mapGetters } from "vuex"
-import website from '@/config/website'
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getReportForRepairs
+  } from "@/api/task/reportForRepairs"
+  import {
+    mapGetters
+  } from "vuex"
+  import website from '@/config/website'
 
-export default {
-    data () {
-        return {
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 350,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          // excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "类型",
+              prop: "type",
+              span: 12,
+              searchSpan: 4,
+              dataType: "number",
+              type: "select",
+              width: 100,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=reportForRepairsType",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              search: true,
             },
-            datetime: "",
-            selectionList: [],
-            option: {
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 350,
-                border: true,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                // excelBtn: true,
-                dialogClickModal: false,
-                column: [
-                    {
-                        label: "类型",
-                        prop: "type",
-                        span: 12,
-                        searchSpan: 4,
-                        dataType: "number",
-                        type: "select",
-                        width: 100,
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=reportForRepairsType",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey",
-                        },
-                        search: true,
-                    },
-                    {
-                        label: "姓名",
-                        prop: "realName",
-                        span: 12,
-                        searchSpan: 4,
-                        width: 100,
-                        search: true,
-                    },
-                    {
-                        label: "手机号",
-                        prop: "phone",
-                        span: 12,
-                        width: 100,
-                        searchSpan: 4,
-                        search: true,
-                    },
-                    {
-                        label: "图片",
-                        prop: "imageUrls",
-                        width: 80,
-                        type: "upload",
-                        listType: "picture-card",
-                        dataType: "string",
-                        multiple: true,
-                        action: "/api/blade-resource/oss/endpoint/put-file",
-                        propsHttp: {
-                            res: "data",
-                            name: 'name',
-                            url: "link",
-                        },
-                        span: 24,
-                    },
-                    {
-                        label: "地点",
-                        prop: "addressName",
-                        overHidden: true
-                    },
-                    {
-                        label: "上报时间",
-                        prop: "createTime",
-                        width: 160,
-                        addDisplay: false,
-                        editDisplay: false,
-                        type: "date",
-                        format: "yyyy-MM-dd HH:mm:ss",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "备注",
-                        prop: "remark",
-                        type: "textarea",
-                        hide: true,
-                        span: 24,
-                    }
-                ],
+            {
+              label: "姓名",
+              prop: "realName",
+              span: 12,
+              searchSpan: 4,
+              width: 100,
+              search: true,
             },
-            data: [],
-        }
-    },
-    watch: {
-    },
-    computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.reportForRepairs_add, true),
-                viewBtn: this.vaildData(this.permission.reportForRepairs_view, true),
-                delBtn: this.vaildData(this.permission.reportForRepairs_delete, true),
-                editBtn: this.vaildData(this.permission.reportForRepairs_edit, true),
+            {
+              label: "手机号",
+              prop: "phone",
+              span: 12,
+              width: 100,
+              searchSpan: 4,
+              search: true,
+            },
+            {
+              label: "图片",
+              prop: "imageUrls",
+              width: 80,
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              multiple: true,
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                name: 'name',
+                url: "link",
+              },
+              span: 24,
+            },
+            {
+              label: "地点",
+              prop: "addressName",
+              overHidden: true
+            },
+            {
+              label: "上报时间",
+              prop: "createTime",
+              width: 160,
+              addDisplay: false,
+              editDisplay: false,
+              type: "date",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "备注",
+              prop: "remark",
+              type: "textarea",
+              hide: true,
+              span: 24,
             }
+          ],
         },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
+        data: [],
+      }
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.reportForRepairs_add, true),
+          viewBtn: this.vaildData(this.permission.reportForRepairs_view, true),
+          delBtn: this.vaildData(this.permission.reportForRepairs_delete, true),
+          editBtn: this.vaildData(this.permission.reportForRepairs_edit, true),
+        }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
     },
     methods: {
-        rowSave (row, done, loading) {
-            if (row.imageUrls.length > 0) {
-                var urls = []
-                var split = row.imageUrls.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.imageUrls = urls.join(",")
-            }
-            add(row).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowUpdate (row, index, done, loading) {
-            if (row.imageUrls.length > 0) {
-                var urls = []
-                var split = row.imageUrls.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.imageUrls = urls.join(",")
-            }
-            update(row).then(
-                () => {
-                    this.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)) {
-                getReportForRepairs(this.form.id).then((res) => {
-                    this.form = res.data.data
-                    if (this.form.imageUrls) {
-                        if (this.form.imageUrls.length > 0) {
-                            var urls = []
-                            var names = this.form.imageUrls.split(",")
-                            names.forEach(name => {
-                                urls.push(website.minioUrl + name)
-                            })
-                            this.form.imageUrls = urls.join(",")
-                        }
-                    }
-                })
-            }
-            // con
-            done()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const { dateTime } = this.query
-            let values = {
-                ...params,
-            }
-            if (dateTime) {
-                values = {
-                    ...params,
-                    startTime: dateTime[0],
-                    endTime: dateTime[1],
-                    ...this.query,
-                }
-                values.dateTime = null
-            }
-            this.loading = true
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.data.forEach(item => {
-                    if (item.imageUrls) {
-                        if (item.imageUrls.length > 0) {
-                            var urls = []
-                            var names = item.imageUrls.split(",")
-                            names.forEach(name => {
-                                urls.push(website.minioUrl + name)
-                            })
-                            item.imageUrls = urls.join(",")
-                        }
-                    }
-                })
-                this.loading = false
-                this.selectionClear()
-            })
+      rowSave(row, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
         }
+        add(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowUpdate(row, index, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+        update(row).then(
+          () => {
+            this.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)) {
+          getReportForRepairs(this.form.id).then((res) => {
+            this.form = res.data.data
+            if (this.form.imageUrls) {
+              if (this.form.imageUrls.length > 0) {
+                var urls = []
+                var names = this.form.imageUrls.split(",")
+                names.forEach(name => {
+                  urls.push(website.minioUrl + name)
+                })
+                this.form.imageUrls = urls.join(",")
+              }
+            }
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
+          ...params,
+        }
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          }
+          values.dateTime = null
+        }
+        this.loading = true
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.imageUrls) {
+              if (item.imageUrls.length > 0) {
+                var urls = []
+                var names = item.imageUrls.split(",")
+                names.forEach(name => {
+                  urls.push(website.minioUrl + name)
+                })
+                item.imageUrls = urls.join(",")
+              }
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     },
-}
+  }
 </script>
 
 <style>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
-</style>
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3