From bf9bf56712032404f8db7cc7b9a59b5bc0d9406e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Feb 2024 17:40:10 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/publicSecurity/keynotePlaceManage.vue           |   28 
 src/views/property/inviteTenders.vue                      | 1519 +++++++++---------
 src/views/property/oiae.vue                               | 1523 +++++++++---------
 src/router/views/index.js                                 |   36 
 src/views/publicSecurity/bailReporting.vue                |   27 
 src/views/propertySupervision/propertyCapitalManage.vue   |  426 ++--
 src/views/property/ownersCommittee.vue                    | 1288 +++++++-------
 src/views/propertySupervision/propertyCompanyDistrict.vue |   36 
 8 files changed, 2,491 insertions(+), 2,392 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8f53214..5bb5671 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -132,53 +132,53 @@
   {
     path: "/property/process/maintenanceFundApply",
     component: Layout,
-    redirect: "/work/process/maintenanceFundApply/form",
+    redirect: "/property/process/maintenanceFundApply/form",
     children: [{
         path: "form/:processDefinitionId",
         name: "维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "property",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/form"
+            "@/views/property/process/maintenanceFundApply/form"
           ),
       },
       {
         path: "handle/:taskId/:processInstanceId/:businessId",
         name: "处理维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "property",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/handle"
+            "@/views/property/process/maintenanceFundApply/handle"
           ),
       },
       {
         path: "detail/:processInstanceId/:businessId",
         name: "维修基金申请详情",
         meta: {
-          i18n: "work",
+          i18n: "property",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/detail"
+            "@/views/property/process/maintenanceFundApply/detail"
           ),
       },
       {
         path: "edit/:taskId/:processInstanceId/:businessId",
         name: "调整维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "property",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/edit"
+            "@/views/property/process/maintenanceFundApply/edit"
           ),
       },
     ],
@@ -187,53 +187,53 @@
   {
     path: "/gzll/process/maintenanceFundApply",
     component: Layout,
-    redirect: "/work/process/maintenanceFundApply/form",
+    redirect: "/gzll/process/maintenanceFundApply/form",
     children: [{
         path: "form/:processDefinitionId",
         name: "维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "gzll",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/form"
+            "@/views/gzll/process/maintenanceFundApply/form"
           ),
       },
       {
         path: "handle/:taskId/:processInstanceId/:businessId",
         name: "处理维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "gzll",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/handle"
+            "@/views/gzll/process/maintenanceFundApply/handle"
           ),
       },
       {
         path: "detail/:processInstanceId/:businessId",
         name: "维修基金申请详情",
         meta: {
-          i18n: "work",
+          i18n: "gzll",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/detail"
+            "@/views/gzll/process/maintenanceFundApply/detail"
           ),
       },
       {
         path: "edit/:taskId/:processInstanceId/:businessId",
         name: "调整维修基金申请",
         meta: {
-          i18n: "work",
+          i18n: "gzll",
         },
         component: () =>
           import(
             /* webpackChunkName: "views" */
-            "@/views/work/process/maintenanceFundApply/edit"
+            "@/views/gzll/process/maintenanceFundApply/edit"
           ),
       },
     ],
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
index f40eced..ca88ede 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -1,816 +1,815 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
-            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot="menuLeft">
-                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
-                    除
-                </el-button>
-            </template>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+          除
+        </el-button>
+      </template>
 
-            <template slot-scope="{type,size,row }" slot="menu">
-                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    撤销
-                </el-button>
-                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    发布
-                </el-button>
-            </template>
+      <template slot-scope="{type,size,row }" slot="menu">
+        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+          撤销
+        </el-button>
+        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+          发布
+        </el-button>
+      </template>
 
-            <template slot-scope="{ row, size }" slot="publish">
-                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
-                </el-tag>
-            </template>
+      <template slot-scope="{ row, size }" slot="publish">
+        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+        </el-tag>
+      </template>
 
-            <template slot-scope="{ row }" 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>
+      <div id="" v-else>
+        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+        </avue-form>
+      </div>
+    </el-dialog>
 
-    </basic-container>
+  </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,
-            },
-            dialogVisibles: false,
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 96,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 450,
+  export default {
+    data() {
+      return {
+        discussForm: {
+          ontitle: '',
+          title: '',
+          openFlag: 0,
+          numberRestrictions: 0,
+          voteRestrictions: 0,
+          userRestrictions: 0,
+          endTime: '',
+          articleId: '',
+          createTime: '',
+          updateTime: '',
+          deleteFlag: '',
+          repeatVote: 0,
+          voteNumberPublic: 0,
+          appointUser: '',
+          userIds: '',
+          eventType: 1,
+        },
+        dialogVisibles: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
 
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                border: true,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                excelBtn: true,
-                dialogClickModal: false,
-                column: [{
-                    label: "招标标题",
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    searchLabelWidth: 76,
-                    rules: [{
-                        required: true,
-                        message: "请输入招标标题",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    width: 110,
-                    label: "招标封面",
-                    prop: "url",
-                    // align:'center',
-                    type: "upload",
-                    listType: "picture-img",
-                    action: "/api/blade-resource/oss/endpoint/put-file",
-                    propsHttp: {
-                        res: "data",
-                        url: "link",
-                    },
-                    // hide: true,
-                    span: 24,
-                },
-                // {
-                //   label: "招标来源",
-                //   prop: "sourceName",
-                //   search: true,
-                //   searchSpan: 4,
-                //   span: 24,
-                //   rules: [{
-                //     required: true,
-                //     message: "请输入招标类型",
-                //     trigger: "blur",
-                //   }, ],
-                // },
-                {
-                    hide: true,
-                    parent: false,
-                    label: "招标范围",
-                    prop: "articleList",
-                    type: 'tree',
-                    dicData: [],
-                    props: {
-                        label: "name",
-                        value: 'id'
-                    },
-                    span: 12,
-                    rules: [{
-                        required: true,
-                        message: "请选择招标范围",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    width: 100,
-                    label: "招标类型",
-                    prop: "type",
-                    value: 2,
-                    slot: true,
-                    searchSpan: 4,
-                    // search: true,
-                    type: "select",
-                    rules: [{
-                        required: true,
-                        message: "请选择招标类型",
-                        trigger: "blur",
-                    },],
-                    dicData: [{
-                        label: "物业招标",
-                        value: 2,
-                    }],
-                },
-                {
-                    label: "发布时间",
-                    prop: "dateTime",
-                    type: "daterange",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd",
-                    searchSpan: 6,
-                    searchRange: true,
-                    hide: true,
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    search: true,
-                    rules: [{
-                        required: true,
-                        message: "请选择发布时间",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    width: 144,
-                    label: "发布时间",
-                    prop: "createTime",
-                    type: "date",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd HH:mm:ss",
-                },
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "招标标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              searchLabelWidth: 76,
+              rules: [{
+                required: true,
+                message: "请输入招标标题",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 110,
+              label: "招标封面",
+              prop: "url",
+              // align:'center',
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            // {
+            //   label: "招标来源",
+            //   prop: "sourceName",
+            //   search: true,
+            //   searchSpan: 4,
+            //   span: 24,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入招标类型",
+            //     trigger: "blur",
+            //   }, ],
+            // },
+            {
+              hide: true,
+              parent: false,
+              label: "招标范围",
+              prop: "articleList",
+              type: 'tree',
+              dicData: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              span: 12,
+              rules: [{
+                required: true,
+                message: "请选择招标范围",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 100,
+              label: "招标类型",
+              prop: "type",
+              value: 2,
+              slot: true,
+              searchSpan: 4,
+              // search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择招标类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "物业招标",
+                value: 2,
+              }],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 144,
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
 
-                {
-                    width: 110,
-                    label: "所属街道",
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    prop: "streetName",
-                    search: true,
-                    searchSpan: 4
-                },
-                {
-                    width: 156,
-                    overHidden: true,
-                    label: "所属社区",
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    prop: "communityName",
-                    search: true,
-                    searchSpan: 4
-                },
-                {
-                    width: 100,
-                    label: "发布状态",
-                    prop: "publish",
-                    value: "0",
-                    slot: true,
-                    searchSpan: 4,
-                    search: true,
-                    type: "select",
-                    rules: [{
-                        required: true,
-                        message: "请选择发布状态",
-                        trigger: "blur",
-                    },],
-                    dicData: [{
-                        label: "未发布",
-                        value: "0",
-                    },
-                    {
-                        label: "已发布",
-                        value: "1",
-                    }
-                    ],
-                },
-                {
-                    width: 100,
-                    label: "评论区",
-                    prop: "iscomment",
-                    slot: true,
-                    type: "switch",
-                    activeColor: "#13ce66",
-                    inactiveColor: "#ccc",
-                    value: '1',
-                    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,
-                },
-                ],
+            {
+              width: 110,
+              label: "所属街道",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "streetName",
+              search: true,
+              searchSpan: 4
             },
-            data: [],
-            optionEnroll: {
-                column: [{
-                    label: "",
-                    type: 'title',
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    offset: 2,
-                    styles: {
-                        fontSize: '24px'
-                    }
-                }, {
-                    label: '开启',
-                    prop: 'openFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
+            {
+              width: 156,
+              overHidden: true,
+              label: "所属社区",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "communityName",
+              search: true,
+              searchSpan: 4
+            },
+            {
+              width: 100,
+              label: "发布状态",
+              prop: "publish",
+              value: "0",
+              slot: true,
+              searchSpan: 4,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
                 },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              width: 100,
+              label: "评论区",
+              prop: "iscomment",
+              slot: true,
+              type: "switch",
+              activeColor: "#13ce66",
+              inactiveColor: "#ccc",
+              value: '1',
+              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'
+              }
+            }, {
+              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: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
             },
-            optionDiscuss: {
-                column: [{
-                    label: "",
-                    type: 'title',
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    offset: 2,
-                    styles: {
-                        fontSize: '24px'
-                    }
-                }, {
-                    label: '开启投票',
-                    prop: 'openFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
-                }, {
-                    label: '开启签名',
-                    prop: 'signatureFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
-                },
-                {
-                    label: "截止时间",
-                    row: true,
-                    offset: 6,
-                    prop: "endTime",
-                    type: "datetime",
-                    format: "yyyy-MM-dd hh:mm:ss",
-                    valueFormat: "timestamp",
-                },
-                ]
+          ]
+        },
+        optionDiscuss: {
+          column: [{
+              label: "",
+              type: 'title',
+              prop: "title",
+              span: 24,
+              row: true,
+              offset: 2,
+              styles: {
+                fontSize: '24px'
+              }
+            }, {
+              label: '开启投票',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            }, {
+              label: '开启签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
             },
-            districtTree: [],
-        }
+            {
+              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(",")
-        },
-        showStatus () {
-            return (data, type) => {
-                if (data == 0) {
-                    return {
-                        text: type == 1 ? '未发布' : '关闭',
-                        type: 'info'
-                    }
-                } else if (data == 1) {
-                    return {
-                        text: type == 1 ? '已发布' : '开启',
-                        type: 'success'
-                    }
-                }
-            }
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.article_add, true),
+          viewBtn: this.vaildData(this.permission.article_view, true),
+          delBtn: this.vaildData(this.permission.article_delete, true),
+          editBtn: this.vaildData(this.permission.article_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      showStatus() {
+        return (data, type) => {
+          if (data == 0) {
+            return {
+              text: type == 1 ? '未发布' : '关闭',
+              type: 'info'
+            }
+          } else if (data == 1) {
+            return {
+              text: type == 1 ? '已发布' : '开启',
+              type: 'success'
+            }
+          }
+        }
+      }
     },
     methods: {
-        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,
-                district_id: row.articleList
-            }).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,
-                district_id: row.articleList
-            }).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getNotice(this.form.id).then((res) => {
-                    let data = res.data.data
-                    // data.forEach(item=>{
-                    if (data.url.length > 0) {
-                        var urls = []
-                        var names = data.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        data.url = urls.join(",")
-                    }
-                    data.articleList = JSON.parse(data.articleRange)
-                    this.form = data
-                })
-            }
-            // con
-            done()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const {
-                dateTime
-            } = this.query
-            let values = {
-                ...params,
-            }
-            if (dateTime) {
-                values = {
-                    ...params,
-                    startTime: dateTime[0],
-                    endTime: dateTime[1],
-                    ...this.query,
-                }
-                values.dateTime = null
-            }
-            values.type = 2
-            this.loading = true
-            console.log(values)
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.data.forEach(item => {
-                    if (item.url.length > 0) {
-                        var urls = []
-                        var names = item.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.url = urls.join(",")
-                    }
-                })
-                this.loading = false
-                this.selectionClear()
-            })
-            getDistrictTree({ filterFlag: 1 }).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,
+          districtId: row.articleList
+        }).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,
+          district_id: row.articleList
+        }).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getNotice(this.form.id).then((res) => {
+            let data = res.data.data
+            // data.forEach(item=>{
+            if (data.url.length > 0) {
+              var urls = []
+              var names = data.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              data.url = urls.join(",")
+            }
+            data.articleList = JSON.parse(data.articleRange)
+            this.form = data
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
+          ...params,
+        }
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          }
+          values.dateTime = null
+        }
+        values.type = 2
+        this.loading = true
+        console.log(values)
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.url.length > 0) {
+              var urls = []
+              var names = item.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.url = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+        getDistrictTree({
+          filterFlag: 1
+        }).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>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
+  }
 
-:deep(.avue-form__menu--center) {
+  :deep(.avue-form__menu--center) {
     text-align: left;
-}
+  }
 
-:deep(.avue-form__menu--center .el-button) {
+  :deep(.avue-form__menu--center .el-button) {
     margin: 0 5px 0 0;
-}
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index e9f9284..1c1f85e 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -1,824 +1,823 @@
 <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 v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+          撤销
+        </el-button>
+        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+          发布
+        </el-button>
+      </template>
 
-            <template slot-scope="{ row, size }" slot="publish">
-                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
-                </el-tag>
-            </template>
+      <template slot-scope="{ row, size }" slot="publish">
+        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+        </el-tag>
+      </template>
 
-            <template slot-scope="{ row }" 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>
+      <div id="" v-else>
+        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+        </avue-form>
+      </div>
+    </el-dialog>
 
-    </basic-container>
+  </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: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 280,
+
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "收支标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              searchLabelWidth: 76,
+              rules: [{
+                required: true,
+                message: "请输入收支标题",
+                trigger: "blur",
+              }],
             },
-            dialogVisibles: false,
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
+
+            {
+              width: 110,
+              label: "缩略图",
+              prop: "url",
+              // align:'center',
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
             },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 280,
 
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                border: true,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                excelBtn: true,
-                dialogClickModal: false,
-                column: [
-                    {
-                        label: "收支标题",
-                        prop: "title",
-                        span: 24,
-                        row: true,
-                        searchSpan: 4,
-                        search: true,
-                        searchLabelWidth: 76,
-                        rules: [{
-                            required: true,
-                            message: "请输入收支标题",
-                            trigger: "blur",
-                        }],
-                    },
+            // {
+            //   label: "收支来源",
+            //   prop: "sourceName",
+            //   search: true,
+            //   searchSpan: 4,
+            //   span: 24,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入收支类型",
+            //     trigger: "blur",
+            //   }, ],
+            // },
 
-                    {
-                        width: 110,
-                        label: "缩略图",
-                        prop: "url",
-                        // align:'center',
-                        type: "upload",
-                        listType: "picture-img",
-                        action: "/api/blade-resource/oss/endpoint/put-file",
-                        propsHttp: {
-                            res: "data",
-                            url: "link",
-                        },
-                        // hide: true,
-                        span: 24,
-                    },
+            {
+              hide: true,
+              parent: false,
+              label: "收支范围",
+              prop: "articleList",
+              type: 'tree',
+              dicData: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              span: 12,
+              rules: [{
+                required: true,
+                message: "请选择收支范围",
+                trigger: "blur",
+              }, ],
 
-                    // {
-                    //   label: "收支来源",
-                    //   prop: "sourceName",
-                    //   search: true,
-                    //   searchSpan: 4,
-                    //   span: 24,
-                    //   rules: [{
-                    //     required: true,
-                    //     message: "请输入收支类型",
-                    //     trigger: "blur",
-                    //   }, ],
-                    // },
-
-                    {
-                        hide: true,
-                        parent: false,
-                        label: "收支范围",
-                        prop: "articleList",
-                        type: 'tree',
-                        dicData: [],
-                        props: {
-                            label: "name",
-                            value: 'id'
-                        },
-                        span: 12,
-                        rules: [{
-                            required: true,
-                            message: "请选择收支范围",
-                            trigger: "blur",
-                        },],
-
-                    },
-                    {
-                        label: "收支类型",
-                        prop: "type",
-                        width: 80,
-                        value: 1,
-                        slot: true,
-                        searchSpan: 4,
-                        search: true,
-                        type: "select",
-                        rules: [{
-                            required: true,
-                            message: "请选择收支类型",
-                            trigger: "blur",
-                        },],
-                        dicData: [{
-                            label: "经营性收支",
-                            value: 1,
-                        }],
-                    },
-
-                    {
-                        label: "发布时间",
-                        prop: "dateTime",
-                        type: "daterange",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                        searchSpan: 6,
-                        searchRange: true,
-                        hide: true,
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请选择发布时间",
-                            trigger: "blur",
-                        },],
-                    },
-
-                    {
-                        width: 100,
-                        label: "发布时间",
-                        prop: "createTime",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        width: 110,
-                        label: "所属街道",
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        prop: "streetName",
-                        search: true,
-                        searchSpan: 4
-                    },
-
-                    {
-                        width: 156,
-                        overHidden: true,
-                        label: "所属社区",
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        prop: "communityName",
-                        search: true,
-                        searchSpan: 4
-                    },
-                    {
-                        width: 100,
-                        label: "发布状态",
-                        prop: "publish",
-                        value: "0",
-                        slot: true,
-                        searchSpan: 4,
-                        search: true,
-                        searchLabelWidth: 76,
-                        type: "select",
-                        rules: [{
-                            required: true,
-                            message: "请选择发布状态",
-                            trigger: "blur",
-                        },],
-                        dicData: [{
-                            label: "未发布",
-                            value: "0",
-                        },
-                        {
-                            label: "已发布",
-                            value: "1",
-                        }
-                        ],
-                    },
-                    {
-                        width: 100,
-                        label: "评论区",
-                        prop: "iscomment",
-                        slot: true,
-                        type: "switch",
-                        activeColor: "#13ce66",
-                        inactiveColor: "#ccc",
-                        value: '1',
-                        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'
-                    }
-                }, {
-                    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: "type",
+              width: 80,
+              value: 1,
+              slot: true,
+              searchSpan: 4,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择收支类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "经营性收支",
+                value: 1,
+              }],
             },
-            optionDiscuss: {
-                column: [{
-                    label: "",
-                    type: 'title',
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    offset: 2,
-                    styles: {
-                        fontSize: '24px'
-                    }
-                }, {
-                    label: '开启投票',
-                    prop: 'openFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
-                }, {
-                    label: '开启签名',
-                    prop: 'signatureFlag',
-                    type: 'radio',
-                    button: true,
-                    row: true,
-                    offset: 6,
-                    dicData: [{
-                        label: '开启',
-                        value: 0
-                    }, {
-                        label: '不开启',
-                        value: 1
-                    }]
+
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+
+            {
+              width: 100,
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              width: 110,
+              label: "所属街道",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "streetName",
+              search: true,
+              searchSpan: 4
+            },
+
+            {
+              width: 156,
+              overHidden: true,
+              label: "所属社区",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "communityName",
+              search: true,
+              searchSpan: 4
+            },
+            {
+              width: 100,
+              label: "发布状态",
+              prop: "publish",
+              value: "0",
+              slot: true,
+              searchSpan: 4,
+              search: true,
+              searchLabelWidth: 76,
+              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: [],
-        }
+            {
+              width: 100,
+              label: "评论区",
+              prop: "iscomment",
+              slot: true,
+              type: "switch",
+              activeColor: "#13ce66",
+              inactiveColor: "#ccc",
+              value: '1',
+              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'
+              }
+            }, {
+              label: '开启',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            },
+
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        optionDiscuss: {
+          column: [{
+              label: "",
+              type: 'title',
+              prop: "title",
+              span: 24,
+              row: true,
+              offset: 2,
+              styles: {
+                fontSize: '24px'
+              }
+            }, {
+              label: '开启投票',
+              prop: 'openFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            }, {
+              label: '开启签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            },
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        districtTree: [],
+      }
     },
     watch: {
-        "form.articleType": {
-            handler (val) {
-                if (val) {
-                    var videoUrl = this.findObject(this.option.column, "videoUrl")
-                    var content = this.findObject(this.option.column, "content")
-                    if (val.indexOf('ksp') != -1) {
-                        videoUrl.display = true
-                        content.display = false
-                        videoUrl.rules = [{
-                            required: false,
-                            message: "请选择视频",
-                            trigger: "blur",
-                        },]
-                    } else {
-                        videoUrl.display = false
-                        content.display = true
-                        videoUrl.rules = ""
-                    }
-                }
-            },
-            immediate: true,
-        }
+      "form.articleType": {
+        handler(val) {
+          if (val) {
+            var videoUrl = this.findObject(this.option.column, "videoUrl")
+            var content = this.findObject(this.option.column, "content")
+            if (val.indexOf('ksp') != -1) {
+              videoUrl.display = true
+              content.display = false
+              videoUrl.rules = [{
+                required: false,
+                message: "请选择视频",
+                trigger: "blur",
+              }, ]
+            } else {
+              videoUrl.display = false
+              content.display = true
+              videoUrl.rules = ""
+            }
+          }
+        },
+        immediate: true,
+      }
     },
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.article_add, true),
-                viewBtn: this.vaildData(this.permission.article_view, true),
-                delBtn: this.vaildData(this.permission.article_delete, true),
-                editBtn: this.vaildData(this.permission.article_edit, true),
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        showStatus () {
-            return (data, type) => {
-                if (data == 0) {
-                    return {
-                        text: type == 1 ? '未发布' : '关闭',
-                        type: 'info'
-                    }
-                } else if (data == 1) {
-                    return {
-                        text: type == 1 ? '已发布' : '开启',
-                        type: 'success'
-                    }
-                }
-            }
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.article_add, true),
+          viewBtn: this.vaildData(this.permission.article_view, true),
+          delBtn: this.vaildData(this.permission.article_delete, true),
+          editBtn: this.vaildData(this.permission.article_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      showStatus() {
+        return (data, type) => {
+          if (data == 0) {
+            return {
+              text: type == 1 ? '未发布' : '关闭',
+              type: 'info'
+            }
+          } else if (data == 1) {
+            return {
+              text: type == 1 ? '已发布' : '开启',
+              type: 'success'
+            }
+          }
+        }
+      }
     },
     methods: {
-        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,
-                district_id: row.articleList
-            }).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,
-                district_id: row.articleList
-            }).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getNotice(this.form.id).then((res) => {
-                    let data = res.data.data
-                    if (data.url.length > 0) {
-                        var urls = []
-                        var names = data.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        data.url = urls.join(",")
-                    }
-                    data.articleList = JSON.parse(data.articleRange)
-                    this.form = data
-                })
-            }
-            // 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 = 1
-            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({ filterFlag: 1 }).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
+        console.log(row)
+        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,
+          districtId: row.articleList
+        }).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,
+          district_id: row.articleList
+        }).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getNotice(this.form.id).then((res) => {
+            let data = res.data.data
+            if (data.url.length > 0) {
+              var urls = []
+              var names = data.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              data.url = urls.join(",")
+            }
+            data.articleList = JSON.parse(data.articleRange)
+            this.form = data
+          })
+        }
+        // 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 = 1
+        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({
+          filterFlag: 1
+        }).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>
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/property/ownersCommittee.vue b/src/views/property/ownersCommittee.vue
index 87846e7..911c7ff 100644
--- a/src/views/property/ownersCommittee.vue
+++ b/src/views/property/ownersCommittee.vue
@@ -1,697 +1,683 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
-            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot="menuLeft">
-                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
-                    除
-                </el-button>
-            </template>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+          除
+        </el-button>
+      </template>
 
-            <template slot-scope="{type,size,row }" slot="menu">
-                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    撤销
-                </el-button>
-                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
-                    @click.stop="updateFb(row)">
-                    发布
-                </el-button>
-            </template>
+      <template slot-scope="{type,size,row }" slot="menu">
+        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+          撤销
+        </el-button>
+        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+          发布
+        </el-button>
+      </template>
 
-            <template slot-scope="{ row, size }" slot="publish">
-                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
-                </el-tag>
-            </template>
+      <template slot-scope="{ row, size }" slot="publish">
+        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+        </el-tag>
+      </template>
 
-            <template slot-scope="{ row }" 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>
 
-    </basic-container>
+  </basic-container>
 </template>
 
 <script>
-import {
+  import {
     getList,
     remove,
     update,
     add,
     getNotice,
     upcomment
-} from "@/api/article/article"
+  } from "@/api/article/article"
 
-import {
+  import {
     addPd,
-} 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: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              searchLabelWidth: 46,
+              rules: [{
+                required: true,
+                message: "请输入业主大会标题",
+                trigger: "blur",
+              }, ],
             },
-            dialogVisibles: false,
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
+            {
+              width: 110,
+              label: "封面",
+              prop: "url",
+              // align:'center',
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
             },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 120,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 450,
-
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                border: true,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                excelBtn: true,
-                dialogClickModal: false,
-                column: [{
-                    label: "标题",
-                    prop: "title",
-                    span: 24,
-                    row: true,
-                    searchSpan: 4,
-                    search: true,
-                    searchLabelWidth: 46,
-                    rules: [{
-                        required: true,
-                        message: "请输入业主大会标题",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    width: 110,
-                    label: "封面",
-                    prop: "url",
-                    // align:'center',
-                    type: "upload",
-                    listType: "picture-img",
-                    action: "/api/blade-resource/oss/endpoint/put-file",
-                    propsHttp: {
-                        res: "data",
-                        url: "link",
-                    },
-                    // hide: true,
-                    span: 24,
-                },
-                {
-                    width: 100,
-                    label: "业主大会类型",
-                    prop: "type",
-                    value: 5,
-                    slot: true,
-                    searchSpan: 4,
-                    // search: true,
-                    type: "select",
-                    rules: [{
-                        required: true,
-                        message: "请选择招标类型",
-                        trigger: "blur",
-                    },],
-                    dicData: [{
-                        label: "业主大会",
-                        value: 5,
-                    }],
-                },
-                // {
-                //   label: "招标来源",
-                //   prop: "sourceName",
-                //   search: true,
-                //   searchSpan: 4,
-                //   span: 24,
-                //   rules: [{
-                //     required: true,
-                //     message: "请输入招标类型",
-                //     trigger: "blur",
-                //   }, ],
-                // },
-                {
-                    hide: true,
-                    parent: false,
-                    label: "公示范围",
-                    prop: "articleList",
-                    type: 'tree',
-                    dicData: [],
-                    props: {
-                        label: "name",
-                        value: 'id'
-                    },
-                    span: 12,
-                    rules: [{
-                        required: true,
-                        message: "请选择公示范围",
-                        trigger: "blur",
-                    },],
-                },
-
-                {
-                    label: "发布时间",
-                    prop: "dateTime",
-                    type: "daterange",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd",
-                    searchSpan: 6,
-                    searchRange: true,
-                    hide: true,
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    search: true,
-                    rules: [{
-                        required: true,
-                        message: "请选择发布时间",
-                        trigger: "blur",
-                    },],
-                },
-                {
-                    width: 144,
-                    label: "发布时间",
-                    prop: "createTime",
-                    type: "date",
-                    format: "yyyy-MM-dd",
-                    valueFormat: "yyyy-MM-dd HH:mm:ss",
-                },
-
-                {
-                    width: 110,
-                    label: "所属街道",
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    prop: "streetName",
-                    search: true,
-                    searchSpan: 4
-                },
-
-                {
-                    width: 156,
-                    overHidden: true,
-                    label: "所属社区",
-                    addDisplay: false,
-                    editDisplay: false,
-                    viewDisplay: false,
-                    prop: "communityName",
-                    search: true,
-                    searchSpan: 4
-                },
-
-                {
-                    width: 100,
-                    label: "发布状态",
-                    prop: "publish",
-                    value: "0",
-                    slot: true,
-                    searchSpan: 4,
-                    search: true,
-                    type: "select",
-                    display: false,
-                    rules: [{
-                        required: true,
-                        message: "请选择发布状态",
-                        trigger: "blur",
-                    },],
-                    dicData: [{
-                        label: "未发布",
-                        value: "0",
-                    },
-                    {
-                        label: "已发布",
-                        value: "1",
-                    }
-                    ],
-                },
-                {
-                    width: 100,
-                    label: "评论区",
-                    prop: "iscomment",
-                    slot: true,
-                    type: "switch",
-                    activeColor: "#13ce66",
-                    inactiveColor: "#ccc",
-                    value: '1',
-                    dicData: [{
-                        label: "关闭",
-                        value: "0",
-                    },
-                    {
-                        label: "开启",
-                        value: "1",
-                    }
-                    ],
-                },
-                {
-                    label: "内容",
-                    prop: "content",
-                    component: "AvueUeditor",
-                    options: {
-                        action: "/api/blade-resource/oss/endpoint/put-file",
-                        // customConfig: {
-                        //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
-                        // },//wangEditor编辑的配置
-                        props: {
-                            res: "data",
-                            url: "link",
-                        },
-                    },
-                    hide: true,
-                    minRows: 6,
-                    span: 24,
-                },
-                ],
+            {
+              hide: true,
+              parent: false,
+              label: "公示范围",
+              prop: "articleList",
+              type: 'tree',
+              dicData: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              span: 12,
+              rules: [{
+                required: true,
+                message: "请选择公示范围",
+                trigger: "blur",
+              }, ],
             },
-            data: [],
+            {
+              width: 100,
+              label: "业主大会类型",
+              prop: "type",
+              value: 5,
+              slot: true,
+              searchSpan: 4,
+              // search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择招标类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "业主大会",
+                value: 5,
+              }],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 144,
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
 
-            districtTree: [],
-        }
+            {
+              width: 110,
+              label: "所属街道",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "streetName",
+              search: true,
+              searchSpan: 4
+            },
+
+            {
+              width: 156,
+              overHidden: true,
+              label: "所属社区",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "communityName",
+              search: true,
+              searchSpan: 4
+            },
+
+            {
+              width: 100,
+              label: "发布状态",
+              prop: "publish",
+              value: "0",
+              slot: true,
+              searchSpan: 4,
+              search: true,
+              type: "select",
+              display: false,
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
+                },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              width: 100,
+              label: "评论区",
+              prop: "iscomment",
+              slot: true,
+              type: "switch",
+              activeColor: "#13ce66",
+              inactiveColor: "#ccc",
+              value: '1',
+              dicData: [{
+                  label: "关闭",
+                  value: "0",
+                },
+                {
+                  label: "开启",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "内容",
+              prop: "content",
+              component: "AvueUeditor",
+              options: {
+                action: "/api/blade-resource/oss/endpoint/put-file",
+                // customConfig: {
+                //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+                // },//wangEditor编辑的配置
+                props: {
+                  res: "data",
+                  url: "link",
+                },
+              },
+              hide: true,
+              minRows: 6,
+              span: 24,
+            },
+          ],
+        },
+        data: [],
+
+        districtTree: [],
+      }
     },
     watch: {
-        "form.articleType": {
-            handler (val) {
-                if (val) {
-                    var videoUrl = this.findObject(this.option.column, "videoUrl")
-                    var content = this.findObject(this.option.column, "content")
-                    if (val.indexOf('ksp') != -1) {
-                        videoUrl.display = true
-                        content.display = false
-                        videoUrl.rules = [{
-                            required: false,
-                            message: "请选择视频",
-                            trigger: "blur",
-                        },]
-                    } else {
-                        videoUrl.display = false
-                        content.display = true
-                        videoUrl.rules = ""
-                    }
-                }
-            },
-            immediate: true,
-        }
+      "form.articleType": {
+        handler(val) {
+          if (val) {
+            var videoUrl = this.findObject(this.option.column, "videoUrl")
+            var content = this.findObject(this.option.column, "content")
+            if (val.indexOf('ksp') != -1) {
+              videoUrl.display = true
+              content.display = false
+              videoUrl.rules = [{
+                required: false,
+                message: "请选择视频",
+                trigger: "blur",
+              }, ]
+            } else {
+              videoUrl.display = false
+              content.display = true
+              videoUrl.rules = ""
+            }
+          }
+        },
+        immediate: true,
+      }
     },
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.article_add, true),
-                viewBtn: this.vaildData(this.permission.article_view, true),
-                delBtn: this.vaildData(this.permission.article_delete, true),
-                editBtn: this.vaildData(this.permission.article_edit, true),
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
-        showStatus () {
-            return (data, type) => {
-                if (data == 0) {
-                    return {
-                        text: type == 1 ? '未发布' : '关闭',
-                        type: 'info'
-                    }
-                } else if (data == 1) {
-                    return {
-                        text: type == 1 ? '已发布' : '开启',
-                        type: 'success'
-                    }
-                }
-            }
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.article_add, true),
+          viewBtn: this.vaildData(this.permission.article_view, true),
+          delBtn: this.vaildData(this.permission.article_delete, true),
+          editBtn: this.vaildData(this.permission.article_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+      showStatus() {
+        return (data, type) => {
+          if (data == 0) {
+            return {
+              text: type == 1 ? '未发布' : '关闭',
+              type: 'info'
+            }
+          } else if (data == 1) {
+            return {
+              text: type == 1 ? '已发布' : '开启',
+              type: 'success'
+            }
+          }
+        }
+      }
     },
     methods: {
-        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) {
-            row['type'] = 5
-            row.userid = this.userInfo.user_id
-            row.articleRange = JSON.stringify(row.articleList)
-            if (row.url.length > 0) {
-                var urls = []
-                var split = row.url.split(",")
-                split.forEach(url => {
-                    var names = url.split("jczz/")
-                    urls.push(names[1])
-                })
-                row.url = urls.join(",")
-            }
-            add({
-                ...row,
-                district_id: row.articleList
-            }).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,
-                district_id: row.articleList
-            }).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
-            this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getNotice(this.form.id).then((res) => {
-                    let data = res.data.data
-                    // data.forEach(item=>{
-                    if (data.url.length > 0) {
-                        var urls = []
-                        var names = data.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        data.url = urls.join(",")
-                    }
-                    data.articleList = JSON.parse(data.articleRange)
-                    this.form = data
-                })
-            }
-            // con
-            done()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            const {
-                dateTime
-            } = this.query
-            let values = {
-                ...params,
-            }
-            if (dateTime) {
-                values = {
-                    ...params,
-                    startTime: dateTime[0],
-                    endTime: dateTime[1],
-                    ...this.query,
-                }
-                values.dateTime = null
-            }
-            values.type = 5
-            this.loading = true
-            console.log(values)
-            getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.data.forEach(item => {
-                    if (item.url.length > 0) {
-                        var urls = []
-                        var names = item.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.url = urls.join(",")
-                    }
-                })
-                this.loading = false
-                this.selectionClear()
-            })
-            getDistrictTree({ filterFlag: 1 }).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) {
+        row['type'] = 5
+        row.userid = this.userInfo.user_id
+        row.articleRange = JSON.stringify(row.articleList)
+        if (row.url.length > 0) {
+          var urls = []
+          var split = row.url.split(",")
+          split.forEach(url => {
+            var names = url.split("jczz/")
+            urls.push(names[1])
+          })
+          row.url = urls.join(",")
+        }
+        add({
+          ...row,
+          districtId: row.articleList
+        }).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,
+          district_id: row.articleList
+        }).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getNotice(this.form.id).then((res) => {
+            let data = res.data.data
+            // data.forEach(item=>{
+            if (data.url.length > 0) {
+              var urls = []
+              var names = data.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              data.url = urls.join(",")
+            }
+            data.articleList = JSON.parse(data.articleRange)
+            this.form = data
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
+          ...params,
+        }
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          }
+          values.dateTime = null
+        }
+        values.type = 5
+        this.loading = true
+        console.log(values)
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.data.forEach(item => {
+            if (item.url.length > 0) {
+              var urls = []
+              var names = item.url.split(",")
+              names.forEach(name => {
+                urls.push(website.minioUrl + name)
+              })
+              item.url = urls.join(",")
+            }
+          })
+          this.loading = false
+          this.selectionClear()
+        })
+        getDistrictTree({
+          filterFlag: 1
+        }).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>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
+  }
 
-:deep(.avue-form__menu--center) {
+  :deep(.avue-form__menu--center) {
     text-align: left;
-}
+  }
 
-:deep(.avue-form__menu--center .el-button) {
+  :deep(.avue-form__menu--center .el-button) {
     margin: 0 5px 0 0;
-}
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/propertySupervision/propertyCapitalManage.vue b/src/views/propertySupervision/propertyCapitalManage.vue
index 55f5350..32f0bc1 100644
--- a/src/views/propertySupervision/propertyCapitalManage.vue
+++ b/src/views/propertySupervision/propertyCapitalManage.vue
@@ -1,215 +1,247 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-      <template slot-scope="{row, size, index}" slot="menu">
-        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
-          @click.stop="handleWork(row)">处理
-        </el-button>
-        <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
-          @click.stop="handleDetail(row)">详情
-        </el-button>
-        <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
-          @click.stop="handleImage(row, index)">流程图
-        </el-button>
-      </template>
-      <template slot-scope="{row, size}" slot="processDefinitionVersion">
-        <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
-      </template>
-    </avue-crud>
-    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
-  </basic-container>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+            <template slot-scope="{row, size, index}" slot="menu">
+                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
+                    @click.stop="handleWork(row)">处理
+                </el-button>
+                <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
+                    @click.stop="handleDetail(row)">详情
+                </el-button>
+                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
+                    @click.stop="handleImage(row, index)">流程图
+                </el-button>
+            </template>
+            <template slot-scope="{row, size}" slot="processDefinitionVersion">
+                <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+            </template>
+            <template slot-scope="{row, size}" slot="linkPhone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+                    v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+                </el-button>
+            </template>
+        </avue-crud>
+        <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+    </basic-container>
 </template>
 
 <script>
-  import {
+import {
     mapGetters
-  } from "vuex"
-  import {
+} from "vuex"
+import {
     todoList
-  } from "@/api/work/work"
-  import {
+} from "@/api/work/work"
+import {
     flowCategory,
     flowRoute
-  } from "@/util/flow"
+} from "@/util/flow"
 
-  export default {
-    data() {
-      return {
-        form: {},
-        selectionId: '',
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        processInstanceId: '',
-        flowBox: false,
-        workBox: false,
-        option: {
-          labelWidth: 120,
-          searchLabelWidth: 96,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 210,
+export default {
+    data () {
+        return {
+            form: {},
+            selectionId: '',
+            selectionList: [],
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            processInstanceId: '',
+            flowBox: false,
+            workBox: false,
+            option: {
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
 
-          height: 'auto',
-          calcHeight: 30,
-          tip: false,
-          simplePage: true,
-          border: true,
-          index: true,
-          // selection: true,
-          editBtn: false,
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          dialogWidth: 900,
-          dialogClickModal: false,
-          column: [{
-              label: "流程分类",
-              type: "select",
-              row: true,
-              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              slot: true,
-              prop: "category",
-              // search: true,
-              hide: true,
-              width: 100,
+                height: 'auto',
+                calcHeight: 30,
+                tip: false,
+                simplePage: true,
+                border: true,
+                index: true,
+                // selection: true,
+                editBtn: false,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                dialogWidth: 900,
+                dialogClickModal: false,
+                column: [{
+                    label: "流程分类",
+                    type: "select",
+                    row: true,
+                    dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey"
+                    },
+                    dataType: "number",
+                    slot: true,
+                    prop: "category",
+                    // search: true,
+                    hide: true,
+                    width: 100,
+                },
+                {
+                    width: 100,
+                    label: '申请类型',
+                    prop: 'categoryName',
+                    // search: true,
+                },
+                {
+                    width: 220,
+                    overHidden: true,
+                    label: "小区",
+                    prop: "districtId",
+                    // search: true,
+                    type: 'tree',
+                    dicUrl: `/api/blade-district/district/getDistrictTree`,
+                    props: {
+                        label: "name",
+                        value: "id"
+                    },
+                    defaultExpandedKeys: ["361102003"],
+                    searchSpan: 5,
+                    span: 12,
+                },
+                {
+                    width: 110,
+                    label: '联系人',
+                    prop: 'linkman',
+                    // search: true,
+                },
+                {
+                    width: 120,
+                    label: '联系电话',
+                    prop: 'linkPhone',
+                    // search: true,
+                    slot: true
+                },
+                {
+                    label: '项目名称',
+                    prop: 'name',
+                    // search: true,
+                },
+                {
+                    label: '当前步骤',
+                    prop: 'taskName',
+                },
+                // {
+                //   label: '流程版本',
+                //   prop: 'processDefinitionVersion',
+                //   // slot: true,
+                //   width: 80,
+                // },
+                {
+                    width: 144,
+                    label: '申请时间',
+                    prop: 'createTime',
+                },
+                ]
             },
-            {
-              width: 100,
-              label: '申请类型',
-              prop: 'categoryName',
-              // search: true,
-            },
-            {
-              width: 220,
-              overHidden: true,
-              label: "小区",
-              prop: "districtId",
-              // search: true,
-              type: 'tree',
-              dicUrl: `/api/blade-district/district/getDistrictTree`,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              defaultExpandedKeys: ["361102003"],
-              searchSpan: 5,
-              span: 12,
-            },
-            {
-              width: 110,
-              label: '联系人',
-              prop: 'linkman',
-              // search: true,
-            },
-            {
-              width: 120,
-              label: '联系电话',
-              prop: 'linkPhone',
-              // search: true,
-            },
-            {
-              label: '项目名称',
-              prop: 'name',
-              // search: true,
-            },
-            {
-              label: '当前步骤',
-              prop: 'taskName',
-            },
-            // {
-            //   label: '流程版本',
-            //   prop: 'processDefinitionVersion',
-            //   // slot: true,
-            //   width: 80,
-            // },
-            {
-              width: 144,
-              label: '申请时间',
-              prop: 'createTime',
-            },
-          ]
-        },
-        data: []
-      }
+            data: []
+        }
     },
     computed: {
-      ...mapGetters(["permission", "flowRoutes"]),
-      ids() {
-        let ids = []
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id)
-        })
-        return ids.join(",")
-      },
+        ...mapGetters(["permission", "flowRoutes"]),
+        ids () {
+            let ids = []
+            this.selectionList.forEach(ele => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
+        },
+
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'principalIdCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
+        }
     },
     methods: {
-      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()
-      },
-      handleWork(row) {
-        this.$router.push({
-          path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
-        })
-      },
-      handleDetail(row) {
-        this.$router.push({
-          path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
-        })
-      },
-      handleImage(row) {
-        this.processInstanceId = row.processInstanceId
-        this.flowBox = true
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query)
-      },
-      onLoad(page, params = {}) {
-        const query = {
-          ...this.query,
-          category: (params.category) ? flowCategory(params.category) : null
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
+        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()
+        },
+        handleWork (row) {
+            this.$router.push({
+                path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
+            })
+        },
+        handleDetail (row) {
+            this.$router.push({
+                path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+            })
+        },
+        handleImage (row) {
+            this.processInstanceId = row.processInstanceId
+            this.flowBox = true
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            const query = {
+                ...this.query,
+                category: (params.category) ? flowCategory(params.category) : null
+            }
+            this.loading = true
+            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+                const data = {
+                    ...res.data.data,
+                    records: res.data.data.records.map(item => {
+                        return {
+                            ...item,
+                            'linkPhoneflag': false
+                        }
+                    })
+                }
+                this.page.total = data.total
+                this.data = data.records
+                this.loading = false
+                this.selectionClear()
+            })
         }
-        this.loading = true
-        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
-          const data = res.data.data
-          this.page.total = data.total
-          this.data = data.records
-          this.loading = false
-          this.selectionClear()
-        })
-      }
     }
-  }
+}
 </script>
\ No newline at end of file
diff --git a/src/views/propertySupervision/propertyCompanyDistrict.vue b/src/views/propertySupervision/propertyCompanyDistrict.vue
index a526101..f4e1eea 100644
--- a/src/views/propertySupervision/propertyCompanyDistrict.vue
+++ b/src/views/propertySupervision/propertyCompanyDistrict.vue
@@ -11,6 +11,11 @@
                     @click="handleDelete">删 除
                 </el-button>
             </template>
+            <template slot-scope="{row, size}" slot="principalPhone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+                </el-button>
+            </template>
         </avue-crud>
     </basic-container>
 </template>
@@ -72,7 +77,7 @@
                 viewBtn: true,
                 selection: true,
                 dialogClickModal: false,
-                addBtn:false,
+                addBtn: false,
                 column: [{
                     overHidden: true,
                     label: '小区名称',
@@ -164,6 +169,7 @@
                     label: '联系方式',
                     prop: 'principalPhone',
                     span: 12,
+                    slot: true,
                     rules: [{
                         required: true,
                         message: "请输入联系方式",
@@ -255,8 +261,26 @@
             })
             return ids.join(",")
         },
+
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'principalIdCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
+        }
     },
     methods: {
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
         rowSave (row, done, loading) {
             row.userId = func.join(row.userId)
             add(row).then(
@@ -383,7 +407,15 @@
             }
             this.loading = true
             getList(page.currentPage, page.pageSize, values).then((res) => {
-                const data = res.data.data
+                const data = {
+                    ...res.data.data,
+                    records: res.data.data.records.map(item => {
+                        return {
+                            ...item,
+                            'principalPhoneflag': false
+                        }
+                    })
+                }
                 this.page.total = data.total
                 this.data = data.records
                 this.loading = false
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 6ebb8f3..ec7c919 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -22,6 +22,11 @@
                     {{ showStatus(row.status).text }}
                 </el-tag>
             </template>
+            <template slot-scope="{row, size}" slot="phone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
+                    v-text="textDispose(row, 'phoneflag', 'phone')">
+                </el-button>
+            </template>
         </avue-crud>
 
         <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
@@ -102,7 +107,7 @@
                 editBtn: false,
                 selection: true,
                 dialogClickModal: false,
-                header:false,
+                header: false,
                 column: [{
                     span: 12,
                     label: "社区",
@@ -136,6 +141,7 @@
                     prop: "phone",
                     searchSpan: 4,
                     search: true,
+                    slot: true,
                     rules: [{
                         validator: validatorPhone,
                         trigger: 'blur'
@@ -304,9 +310,27 @@
 
                 return tags
             }
+        },
+
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'principalIdCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
         }
     },
     methods: {
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
         colseDetail () {
             this.auditBasePopup = false
             this.onLoad(this.page)
@@ -479,6 +503,7 @@
                 this.page.total = data.total
                 this.data = data.records
                 this.data.forEach(item => {
+                    this.$set(item, 'phoneflag', false)
                     if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
                         var urls = []
                         var names = item.imageUrls.split(",").filter(item => item != '')
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 090aeb2..7825f5d 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -11,7 +11,7 @@
                     @click="lookDetail(row, 0)">查 看
                 </el-button>
                 <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"" plain
-                                        @click=" goAudit(row)">审 核
+                                                            @click=" goAudit(row)">审 核
                 </el-button>
                 <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                     @click="rowDel(row)">删 除
@@ -22,6 +22,12 @@
                 <el-tag :size="size" :type="showStatus(row.status).type">
                     {{ showStatus(row.status).text }}
                 </el-tag>
+            </template>
+
+            <template slot-scope="{row, size}" slot="phone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
+                    v-text="textDispose(row, 'phoneflag', 'phone')">
+                </el-button>
             </template>
         </avue-crud>
 
@@ -154,6 +160,7 @@
                     prop: "phone",
                     searchSpan: 4,
                     search: true,
+                    slot: true,
                     rules: [{
                         validator: validatorPhone,
                         trigger: 'blur'
@@ -314,9 +321,27 @@
 
                 return tags
             }
+        },
+
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'principalIdCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
         }
     },
     methods: {
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
         // 弹窗关闭回调
         handleClose () {
             this.cancelAudit()
@@ -595,6 +620,7 @@
                 this.page.total = data.total
                 this.data = data.records
                 this.data.forEach(item => {
+                    this.$set(item, 'phoneflag', false)
                     if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
                         var urls = []
                         var names = item.imageUrls.split(",").filter(item => item != '')

--
Gitblit v1.9.3