From 626af15b65701197a33ad0d1384bae8d56c169ce Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 09 Jan 2024 18:17:22 +0800
Subject: [PATCH] 内容管理字段补充,服务管理页面展示调整

---
 src/views/article/publicSignUp.vue             |   19 
 src/views/article/article.vue                  |   19 
 src/views/article/discussionManage.vue         |   19 
 src/views/property/inviteTenders.vue           | 1428 ++++++++++++------------
 src/views/property/oiae.vue                    |   63 
 src/views/property/propertyCharge.vue          |  682 +++++-----
 src/views/property/convenienceHotline.vue      |  530 ++++----
 src/views/property/propertyChargeRecord.vue    |  631 +++++-----
 src/views/cGovernance/punchCard.vue            |    2 
 src/views/property/propertyCompanyDistrict.vue |   45 
 10 files changed, 1,772 insertions(+), 1,666 deletions(-)

diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 3ebe64b..60c704b 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -221,6 +221,25 @@
                         },],
                     },
                     {
+                        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",
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index de2dfd7..f5751d6 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -210,6 +210,25 @@
                         },],
                     },
                     {
+                        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",
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index d544ca5..30c34a4 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -202,6 +202,25 @@
                         }],
                     },
                     {
+                        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",
diff --git a/src/views/cGovernance/punchCard.vue b/src/views/cGovernance/punchCard.vue
index 8bbc1ef..c10562f 100644
--- a/src/views/cGovernance/punchCard.vue
+++ b/src/views/cGovernance/punchCard.vue
@@ -66,7 +66,7 @@
                         search: true,
                         rules: [{
                             required: true,
-                            message: "请选择发布时间",
+                            message: "请选择打卡时间",
                             trigger: "blur",
                         },],
                     },
diff --git a/src/views/property/convenienceHotline.vue b/src/views/property/convenienceHotline.vue
index 2103701..f241403 100644
--- a/src/views/property/convenienceHotline.vue
+++ b/src/views/property/convenienceHotline.vue
@@ -1,280 +1,302 @@
 <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.district_delete" @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
+            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button size="small" icon="el-icon-delete" plain v-if="permission.district_delete"
+                    @click="handleDelete">删 除
+                </el-button>
+            </template>
+        </avue-crud>
+    </basic-container>
 </template>
 
 <script>
-  import {
+import {
     getList,
     remove,
     update,
     add,
     getDetail
-  } from "@/api/convenienceHotline/convenienceHotline"
-  import {
+} from "@/api/convenienceHotline/convenienceHotline"
+import {
     mapGetters
-  } from "vuex"
-  import website from '@/config/website'
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-        },
-        datetime: "",
-        selectionList: [],
-        option: {
-          height: "auto",
-          calcHeight: 54,
-          dialogWidth: 950,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 280,
-          border: true,
-          //stripe:true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [{
-              label: "名称",
-              prop: "name",
-              searchSpan: 4,
-              search: true,
-              width: 260,
-              rules: [{
-                required: true,
-                message: "请输入名称",
-                trigger: "blur",
-              }, ],
+} from "vuex"
+import website from '@/config/website'
+export default {
+    data () {
+        //手机号格式校验
+        let validatorPhone = function (rule, value, callback) {
+            if (value) {
+                if (!/^1[3456789]\d{9}$/.test(value)) {
+                    callback(new Error('手机号格式有误!'))
+                } else {
+                    callback()
+                }
+            }
+            callback()
+        }
+
+        return {
+            form: {},
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            {
-              label: "电话",
-              prop: "telephone",
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请输入电话",
-                trigger: "blur",
-              }, ],
+            datetime: "",
+            selectionList: [],
+            option: {
+                labelWidth: 66,
+                searchLabelWidth: 66,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
+                height: "auto",
+                calcHeight: 54,
+                dialogWidth: 950,
+                tip: false,
+                border: true,
+                //stripe:true,
+                index: true,
+                viewBtn: true,
+                selection: true,
+                dialogClickModal: false,
+                column: [{
+                    label: "名称",
+                    prop: "name",
+                    searchSpan: 4,
+                    search: true,
+                    width: 260,
+                    rules: [{
+                        required: true,
+                        message: "请输入名称",
+                        trigger: "blur",
+                    },],
+                },
+                {
+                    width: 120,
+                    label: "联系方式",
+                    prop: "telephone",
+                    span: 24,
+                    rules: [{
+                        required: true,
+                        message: "请输入联系方式",
+                        trigger: "blur",
+                    },
+                    {
+                        validator: validatorPhone,
+                        trigger: 'blur'
+                    }],
+                },
+                {
+                    label: "备注",
+                    prop: "remark",
+                    span: 24,
+                    rules: [{
+                        required: true,
+                        message: "请输入备注",
+                        trigger: "blur",
+                    },],
+                },
+                ],
             },
-            {
-              label: "备注",
-              prop: "remark",
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur",
-              }, ],
-            },
-          ],
-        },
-        data: [],
-      }
+            data: [],
+        }
     },
     watch: {},
     computed: {
-      ...mapGetters(["permission", "userInfo"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.district_add, true),
-          viewBtn: this.vaildData(this.permission.district_view, true),
-          delBtn: this.vaildData(this.permission.district_delete, true),
-          editBtn: this.vaildData(this.permission.district_edit, true),
-        }
-      },
-      ids() {
-        let ids = []
-        this.selectionList.forEach((ele) => {
-          ids.push(ele.id)
-        })
-        return ids.join(",")
-      },
+        ...mapGetters(["permission", "userInfo"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.district_add, true),
+                viewBtn: this.vaildData(this.permission.district_view, true),
+                delBtn: this.vaildData(this.permission.district_delete, true),
+                editBtn: this.vaildData(this.permission.district_edit, true),
+            }
+        },
+        ids () {
+            let ids = []
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
+        },
     },
     methods: {
-      rowSave(row, done, loading) {
-        if (row.picUrl.length > 0) {
-          var urls = []
-          var split = row.picUrl.split(",")
-          split.forEach(url => {
-            var names = url.split("jczz/")
-            urls.push(names[1])
-          })
-          row.picUrl = urls.join(",")
-        }
-        row.userid = this.userInfo.user_id
-        add(row).then(
-          () => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            })
-            done()
-          },
-          (error) => {
-            window.console.log(error)
-            loading()
-          }
-        )
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(
-          () => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            })
-            done()
-          },
-          (error) => {
-            window.console.log(error)
-            loading()
-          }
-        )
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(row.id)
-          })
-          .then(() => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            })
-          })
-      },
-      searchReset() {
-        this.query = {}
-        this.onLoad(this.page)
-      },
-      searchChange(params, done) {
-        this.query = params
-        this.page.currentPage = 1
-        this.onLoad(this.page, params)
-        done()
-      },
-      selectionChange(list) {
-        this.selectionList = list
-      },
-      selectionClear() {
-        this.selectionList = []
-        this.$refs.crud.toggleSelection()
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据")
-          return
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(this.ids)
-          })
-          .then(() => {
-            this.onLoad(this.page)
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            })
-            this.$refs.crud.toggleSelection()
-          })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then((res) => {
-            this.form = res.data.data
-            if (this.form.picUrl.length > 0) {
-              var urls = []
-              var names = this.form.picUrl.split(",")
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              this.form.picUrl = urls.join(",")
-            }
-          })
-        }
-        // con
-        done()
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query)
-      },
-      onLoad(page, params = {}) {
-        const {
-          dateTime
-        } = this.query
-        let values = {
-          ...params,
-        }
-        if (dateTime) {
-          values = {
-            ...params,
-            startTime: dateTime[0],
-            endTime: dateTime[1],
-            ...this.query,
-          }
-          values.dateTime = null
-        }
-        this.loading = true
-        getList(page.currentPage, page.pageSize, values).then((res) => {
-          const data = res.data.data
-          this.page.total = data.total
-          this.data = data.records
-          this.data.forEach(item => {
-            if (item.picUrl) {
-              if (item.picUrl.length > 0) {
+        rowSave (row, done, loading) {
+            if (row.picUrl.length > 0) {
                 var urls = []
-                var names = item.picUrl.split(",")
-                names.forEach(name => {
-                  urls.push(website.minioUrl + name)
+                var split = row.picUrl.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
                 })
-                item.picUrl = urls.join(",")
-              }
+                row.picUrl = urls.join(",")
             }
-          })
-          this.loading = false
-          this.selectionClear()
-        })
-      }
+            row.userid = this.userInfo.user_id
+            add(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowUpdate (row, index, done, loading) {
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.onLoad(this.page)
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
+            done()
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            this.$refs.crud.toggleSelection()
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getDetail(this.form.id).then((res) => {
+                    this.form = res.data.data
+                    if (this.form.picUrl.length > 0) {
+                        var urls = []
+                        var names = this.form.picUrl.split(",")
+                        names.forEach(name => {
+                            urls.push(website.minioUrl + name)
+                        })
+                        this.form.picUrl = urls.join(",")
+                    }
+                })
+            }
+            // con
+            done()
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            const {
+                dateTime
+            } = this.query
+            let values = {
+                ...params,
+            }
+            if (dateTime) {
+                values = {
+                    ...params,
+                    startTime: dateTime[0],
+                    endTime: dateTime[1],
+                    ...this.query,
+                }
+                values.dateTime = null
+            }
+            this.loading = true
+            getList(page.currentPage, page.pageSize, values).then((res) => {
+                const data = res.data.data
+                this.page.total = data.total
+                this.data = data.records
+                this.data.forEach(item => {
+                    if (item.picUrl) {
+                        if (item.picUrl.length > 0) {
+                            var urls = []
+                            var names = item.picUrl.split(",")
+                            names.forEach(name => {
+                                urls.push(website.minioUrl + name)
+                            })
+                            item.picUrl = urls.join(",")
+                        }
+                    }
+                })
+                this.loading = false
+                this.selectionClear()
+            })
+        }
     }
-  }
+}
 </script>
 
 <style>
-  .avue-upload__icon {
+.avue-upload__icon {
     line-height: 6;
-  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
index f1c2dba..52b15fe 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -1,768 +1,780 @@
 <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)">
-          公益报名
-        </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>
+            <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>
 
-      <template slot-scope="{ row }" slot="publish">
-        <el-tag>{{
-          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
-          }}
-        </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-tag>{{
-          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
-          }}
-        </el-tag>
-      </template>
-    </avue-crud>
+            <template slot-scope="{ row, size }" slot="iscomment">
+                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
+                </el-tag>
+            </template>
+        </avue-crud>
 
+        <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>
 
-    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-      <span slot="title" class="dialog-footer">
-        {{discussForm.ontitle}}
-      </span>
-      <div id="" v-if="discussForm.eventType == 1">
-        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
-      </div>
-
-      <div id="" v-else>
-        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
-        </avue-form>
-      </div>
-    </el-dialog>
-
-
-
-
-  </basic-container>
+    </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: {
-          height: "auto",
-          calcHeight: 54,
-          dialogWidth: 950,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 3,
-          menuWidth: 450,
-          border: false,
-          //stripe:true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          excelBtn: true,
-          dialogClickModal: false,
-          column: [{
-              label: "招标标题",
-              prop: "title",
-              span: 24,
-              row: true,
-              searchSpan: 4,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入招标标题",
-                trigger: "blur",
-              }, ],
+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,
             },
-            {
-              label: "招标封面",
-              prop: "url",
-              // align:'center',
-              width: 80,
-              type: "upload",
-              listType: "picture-img",
-              action: "/api/blade-resource/oss/endpoint/put-file",
-              propsHttp: {
-                res: "data",
-                url: "link",
-              },
-              // hide: true,
-              span: 24,
+            dialogVisibles: false,
+            form: {},
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            // {
-            //   label: "招标来源",
-            //   prop: "sourceName",
-            //   search: true,
-            //   searchSpan: 4,
-            //   span: 24,
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入招标类型",
-            //     trigger: "blur",
-            //   }, ],
-            // },
-            {
-              label: "招标范围",
-              prop: "articleList",
-              span: 12,
-              minRows: 2,
-              type: "cascader",
-              multiple: true,
-              tags: true,
-              dicData: [],
-              rules: [{
-                required: true,
-                message: "请选择招标范围",
-                trigger: "blur",
-              }, ],
-              props: {
-                label: "name",
-                value: 'id'
-              },
-              hide: true,
-            },
-            {
-              label: "招标类型",
-              prop: "type",
-              searchSpan: 3,
-              width: 80,
-              value: 2,
-              slot: true,
-              search: true,
-              type: "select",
-              rules: [{
-                required: true,
-                message: "请选择招标类型",
-                trigger: "blur",
-              }, ],
-              dicData: [{
-                label: "物业招标",
-                value: 2,
-              }],
-            },
-            {
-              label: "发布时间",
-              prop: "dateTime",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd",
-              searchSpan: 5,
-              searchRange: true,
-              hide: true,
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请选择发布时间",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "发布时间",
-              prop: "createTime",
-              type: "date",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-            },
-            {
-              label: "发布状态",
-              prop: "publish",
-              searchSpan: 3,
-              width: 80,
-              value: "0",
-              slot: true,
-              search: true,
-              type: "select",
-              rules: [{
-                required: true,
-                message: "请选择发布状态",
-                trigger: "blur",
-              }, ],
-              dicData: [{
-                  label: "未发布",
-                  value: "0",
+            datetime: "",
+            selectionList: [],
+            option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 450,
+
+                height: "auto",
+                calcHeight: 54,
+                dialogWidth: 950,
+                tip: false,
+                border: false,
+                //stripe:true,
+                index: true,
+                viewBtn: true,
+                selection: true,
+                excelBtn: true,
+                dialogClickModal: false,
+                column: [{
+                    label: "招标标题",
+                    prop: "title",
+                    span: 24,
+                    row: true,
+                    searchSpan: 4,
+                    search: true,
+                    rules: [{
+                        required: true,
+                        message: "请输入招标标题",
+                        trigger: "blur",
+                    },],
                 },
                 {
-                  label: "已发布",
-                  value: "1",
-                }
-              ],
-            },
-            {
-              label: "评论区",
-              prop: "iscomment",
-              width: 80,
-              slot: true,
-              type: "select",
-              dicData: [{
-                  label: "关闭",
-                  value: "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,
+                },
+                // {
+                //   label: "招标来源",
+                //   prop: "sourceName",
+                //   search: true,
+                //   searchSpan: 4,
+                //   span: 24,
+                //   rules: [{
+                //     required: true,
+                //     message: "请输入招标类型",
+                //     trigger: "blur",
+                //   }, ],
+                // },
+                {
+                    label: "招标范围",
+                    prop: "articleList",
+                    span: 12,
+                    minRows: 2,
+                    type: "cascader",
+                    multiple: true,
+                    tags: true,
+                    dicData: [],
+                    rules: [{
+                        required: true,
+                        message: "请选择招标范围",
+                        trigger: "blur",
+                    },],
+                    props: {
+                        label: "name",
+                        value: 'id'
+                    },
+                    hide: true,
                 },
                 {
-                  label: "开启",
-                  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",
+                    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,
+                    }],
                 },
-              },
-              hide: true,
-              minRows: 6,
-              span: 24,
-            },
-          ],
-        },
-        data: [],
-        optionEnroll: {
-          column: [{
-              label: "",
-              type: 'title',
-              prop: "title",
-              span: 24,
-              row: true,
-              offset: 2,
-              styles: {
-                fontSize: '24px'
-              }
-            }, {
-              labelWidth: 100,
-              label: '开启',
-              prop: 'openFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
-            },
+                {
+                    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",
+                },
 
-            {
-              label: "截止时间",
-              row: true,
-              offset: 6,
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd hh:mm:ss",
-              valueFormat: "timestamp",
+                {
+                    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: "select",
+                    dicData: [{
+                        label: "关闭",
+                        value: "0",
+                    },
+                    {
+                        label: "开启",
+                        value: "1",
+                    }
+                    ],
+                },
+                {
+                    label: "视频",
+                    prop: "videoUrl",
+                    type: "upload",
+                    accept: "video/mp4",
+                    display: false,
+                    hide: true,
+                    span: 24,
+                    listType: "picture-img",
+                    action: "/api/depl/put-depl",
+                    propsHttp: {
+                        url: "data",
+                    },
+                },
+                {
+                    label: "招标内容",
+                    prop: "content",
+                    component: "AvueUeditor",
+                    options: {
+                        action: "/api/blade-resource/oss/endpoint/put-file",
+                        // customConfig: {
+                        //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+                        // },//wangEditor编辑的配置
+                        props: {
+                            res: "data",
+                            url: "link",
+                        },
+                    },
+                    hide: true,
+                    minRows: 6,
+                    span: 24,
+                },
+                ],
             },
-          ]
-        },
-        optionDiscuss: {
-          column: [{
-              label: "",
-              type: 'title',
-              prop: "title",
-              span: 24,
-              row: true,
-              offset: 2,
-              styles: {
-                fontSize: '24px'
-              }
-            }, {
-              labelWidth: 100,
-              label: '开启投票',
-              prop: 'openFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
-            }, {
-              labelWidth: 100,
-              label: '开启签名',
-              prop: 'signatureFlag',
-              type: 'radio',
-              button: true,
-              row: true,
-              offset: 6,
-              dicData: [{
-                label: '开启',
-                value: 0
-              }, {
-                label: '不开启',
-                value: 1
-              }]
+            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",
+                },
+                ]
             },
-          ]
-        },
-        districtTree: [],
-      };
+            districtTree: [],
+        }
     },
     watch: {
-      "form.articleType": {
-        handler(val) {
-          if (val) {
-            var videoUrl = this.findObject(this.option.column, "videoUrl");
-            var content = this.findObject(this.option.column, "content");
-            if (val.indexOf('ksp') != -1) {
-              videoUrl.display = true;
-              content.display = false;
-              videoUrl.rules = [{
-                required: false,
-                message: "请选择视频",
-                trigger: "blur",
-              }, ];
-            } else {
-              videoUrl.display = false;
-              content.display = true;
-              videoUrl.rules = "";
-            }
-          }
-        },
-        immediate: true,
-      }
+        "form.articleType": {
+            handler (val) {
+                if (val) {
+                    var videoUrl = this.findObject(this.option.column, "videoUrl")
+                    var content = this.findObject(this.option.column, "content")
+                    if (val.indexOf('ksp') != -1) {
+                        videoUrl.display = true
+                        content.display = false
+                        videoUrl.rules = [{
+                            required: false,
+                            message: "请选择视频",
+                            trigger: "blur",
+                        },]
+                    } else {
+                        videoUrl.display = false
+                        content.display = true
+                        videoUrl.rules = ""
+                    }
+                }
+            },
+            immediate: true,
+        }
     },
     computed: {
-      ...mapGetters(["permission", "userInfo"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.article_add, true),
-          viewBtn: this.vaildData(this.permission.article_view, true),
-          delBtn: this.vaildData(this.permission.article_delete, true),
-          editBtn: this.vaildData(this.permission.article_edit, true),
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach((ele) => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
+        ...mapGetters(["permission", "userInfo"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.article_add, true),
+                viewBtn: this.vaildData(this.permission.article_view, true),
+                delBtn: this.vaildData(this.permission.article_delete, true),
+                editBtn: this.vaildData(this.permission.article_edit, true),
+            }
+        },
+        ids () {
+            let ids = []
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
+        },
+        showStatus () {
+            return (data, type) => {
+                if (data == 0) {
+                    return {
+                        text: type == 1 ? '未发布' : '关闭',
+                        type: 'info'
+                    }
+                } else if (data == 1) {
+                    return {
+                        text: type == 1 ? '已发布' : '开启',
+                        type: 'success'
+                    }
+                }
+            }
+        }
     },
     methods: {
 
-      openDilog(row, type) {
-        this.dialogVisibles = true
-        this.discussForm.eventType = type
-        this.discussForm.articleId = row.id
-        this.discussForm.title = row.title
-        if (type == 0) {
-          this.discussForm.ontitle = '公益报名'
-        } else {
-          this.discussForm.ontitle = '创建议题'
-        }
-      },
-
-      handleSubmit(form, done) {
-        done();
-        addPd(form).then(
-          () => {
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.dialogVisibles = false
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            // loading();
-          }
-        );
-      },
-
-      handleClose(done) {
-        done();
-        // this.$confirm('确认关闭?')
-        //   .then(_ => {
-        //     done();
-        //   })
-        //   .catch(_ => {});
-      },
-      rowSave(row, done, loading) {
-        if (row.videoUrl.length == 0) {
-          row.videoUrl = "";
-        }
-        row.userid = this.userInfo.user_id;
-        row.articleRange = JSON.stringify(row.articleList)
-        if (row.url.length > 0) {
-          var urls = []
-          var split = row.url.split(",");
-          split.forEach(url => {
-            var names = url.split("jczz/");
-            urls.push(names[1])
-          })
-          row.url = urls.join(",")
-        }
-        add(row).then(
-          () => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      rowUpdate(row, index, done, loading) {
-        row.articleRange = JSON.stringify(row.articleList)
-        if (row.url.length > 0) {
-          var urls = []
-          var split = row.url.split(",");
-          split.forEach(url => {
-            var names = url.split("jczz/");
-            urls.push(names[1])
-          })
-          row.url = urls.join(",")
-        }
-
-        update(row).then(
-          () => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getNotice(this.form.id).then((res) => {
-            let data = res.data.data
-            // data.forEach(item=>{
-            if (data.url.length > 0) {
-              var urls = []
-              var names = data.url.split(",");
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              data.url = urls.join(",")
+        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 = '创建议题'
             }
-            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(",")
+        },
+
+        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 = ""
             }
-          })
-          this.loading = false;
-          this.selectionClear();
-        });
-        getDistrictTree(params = {}).then((res) => {
-          const data = res.data.data;
-          this.districtTree = data;
-          const column = this.findObject(this.option.column, "articleList");
-          column.dicData = res.data.data;
-          this.loading = false;
-        });
-      },
-      updateFb(row) {
-        if (row.publish == "0") {
-          row.publish = "1";
-        } else {
-          row.publish = "0";
+            row.userid = this.userInfo.user_id
+            row.articleRange = JSON.stringify(row.articleList)
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
+            }
+            add(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowUpdate (row, index, done, loading) {
+            row.articleRange = JSON.stringify(row.articleList)
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
+            }
+
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                })
+        },
+        searchReset () {
+            this.query = {}
+            this.onLoad(this.page)
+        },
+        searchChange (params, done) {
+            this.query = params
+            this.page.currentPage = 1
+            this.onLoad(this.page, params)
+            done()
+        },
+        selectionChange (list) {
+            this.selectionList = list
+        },
+        selectionClear () {
+            this.selectionList = []
+            this.$refs.crud.toggleSelection()
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(this.ids)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getNotice(this.form.id).then((res) => {
+                    let data = res.data.data
+                    // data.forEach(item=>{
+                    if (data.url.length > 0) {
+                        var urls = []
+                        var names = data.url.split(",")
+                        names.forEach(name => {
+                            urls.push(website.minioUrl + name)
+                        })
+                        data.url = urls.join(",")
+                    }
+                    data.articleList = JSON.parse(data.articleRange)
+                    this.form = data
+                })
+            }
+            // con
+            done()
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            const {
+                dateTime
+            } = this.query
+            let values = {
+                ...params,
+            }
+            if (dateTime) {
+                values = {
+                    ...params,
+                    startTime: dateTime[0],
+                    endTime: dateTime[1],
+                    ...this.query,
+                }
+                values.dateTime = null
+            }
+            values.type = 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(params = {}).then((res) => {
+                const data = res.data.data
+                this.districtTree = data
+                const column = this.findObject(this.option.column, "articleList")
+                column.dicData = res.data.data
+                this.loading = false
+            })
+        },
+        updateFb (row) {
+            if (row.publish == "0") {
+                row.publish = "1"
+            } else {
+                row.publish = "0"
+            }
+            if (row.url.length > 0) {
+                var urls = []
+                var split = row.url.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.url = urls.join(",")
+            }
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        kqcomment () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据开启评论?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                return upcomment(this.ids, "1")
+            })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
+        },
+        gbcomment () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据")
+                return
+            }
+            this.$confirm("确定将选择数据开启评论?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                return upcomment(this.ids, "0")
+            })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    this.$refs.crud.toggleSelection()
+                })
         }
-        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>
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index eb75631..9d39345 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -32,22 +32,16 @@
                 </el-button>
             </template>
 
-            <template slot-scope="{ row }" slot="publish">
-                <el-tag>{{
-                    row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
-                }}
+            <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-tag>{{
-                    row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
-                }}
+            <template slot-scope="{ row, size }" slot="iscomment">
+                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
                 </el-tag>
             </template>
         </avue-crud>
-
-
 
         <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
             <span slot="title" class="dialog-footer">
@@ -62,9 +56,6 @@
                 </avue-form>
             </div>
         </el-dialog>
-
-
-
 
     </basic-container>
 </template>
@@ -132,13 +123,16 @@
             datetime: "",
             selectionList: [],
             option: {
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 280,
+
                 height: "auto",
                 calcHeight: 54,
                 dialogWidth: 950,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 450,
                 border: false,
                 //stripe:true,
                 index: true,
@@ -162,10 +156,10 @@
                     },
 
                     {
+                        width: 110,
                         label: "缩略图",
                         prop: "url",
                         // align:'center',
-                        width: 80,
                         type: "upload",
                         listType: "picture-img",
                         action: "/api/blade-resource/oss/endpoint/put-file",
@@ -176,7 +170,7 @@
                         // hide: true,
                         span: 24,
                     },
-                    
+
                     // {
                     //   label: "收支来源",
                     //   prop: "sourceName",
@@ -212,10 +206,10 @@
                     {
                         label: "收支类型",
                         prop: "type",
-                        searchSpan: 3,
                         width: 80,
                         value: 1,
                         slot: true,
+                        searchSpan: 4,
                         search: true,
                         type: "select",
                         rules: [{
@@ -228,13 +222,14 @@
                             value: 1,
                         }],
                     },
+
                     {
                         label: "发布时间",
                         prop: "dateTime",
-                        type: "datetime",
+                        type: "daterange",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
-                        searchSpan: 5,
+                        searchSpan: 6,
                         searchRange: true,
                         hide: true,
                         addDisplay: false,
@@ -247,7 +242,9 @@
                             trigger: "blur",
                         },],
                     },
+
                     {
+                        width: 100,
                         label: "发布时间",
                         prop: "createTime",
                         type: "date",
@@ -255,12 +252,12 @@
                         valueFormat: "yyyy-MM-dd HH:mm:ss",
                     },
                     {
+                        width: 100,
                         label: "发布状态",
                         prop: "publish",
-                        searchSpan: 3,
-                        width: 80,
                         value: "0",
                         slot: true,
+                        searchSpan: 4,
                         search: true,
                         type: "select",
                         rules: [{
@@ -279,9 +276,9 @@
                         ],
                     },
                     {
+                        width: 100,
                         label: "评论区",
                         prop: "iscomment",
-                        width: 80,
                         slot: true,
                         type: "select",
                         dicData: [{
@@ -341,7 +338,6 @@
                         fontSize: '24px'
                     }
                 }, {
-                    labelWidth: 100,
                     label: '开启',
                     prop: 'openFlag',
                     type: 'radio',
@@ -380,7 +376,6 @@
                         fontSize: '24px'
                     }
                 }, {
-                    labelWidth: 100,
                     label: '开启投票',
                     prop: 'openFlag',
                     type: 'radio',
@@ -395,7 +390,6 @@
                         value: 1
                     }]
                 }, {
-                    labelWidth: 100,
                     label: '开启签名',
                     prop: 'signatureFlag',
                     type: 'radio',
@@ -465,6 +459,21 @@
             })
             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: {
 
diff --git a/src/views/property/propertyCharge.vue b/src/views/property/propertyCharge.vue
index 471017d..5409f02 100644
--- a/src/views/property/propertyCharge.vue
+++ b/src/views/property/propertyCharge.vue
@@ -1,360 +1,358 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
-               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
-               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-               :before-open="beforeOpen"
-               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               @refresh-change="refreshChange" @on-load="onLoad">
-    </avue-crud>
-
-
-
-  </basic-container>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
+            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
+            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
+            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+        </avue-crud>
+    </basic-container>
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {getDetail,getList,add,update,remove} from "@/api/property/propertyCharge";
-import website from "@/config/website";
-import func from "@/util/func";
-import {validatePhone} from "@/util/validate";
+import { mapGetters } from "vuex"
+import { getDetail, getList, add, update, remove } from "@/api/property/propertyCharge"
+import website from "@/config/website"
+import func from "@/util/func"
+import { validatePhone } from "@/util/validate"
 const searchSpan = 4
-const labelWidth=110
+const labelWidth = 110
 export default {
-  name: "propertyCharge",
-  data () {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      datetime: "",
-      selectionList: [],
-      memberFlag: false,
-      option: {
-        // menu: false,
-        // addBtn: false,
-        border: true,
-        index: true,
-        selection: false,
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 950,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        //stripe:true,
-        viewBtn: true,
-        excelBtn: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "物业公司",
-            labelWidth:labelWidth,
-            prop: "propertyId",
-            checkStrictly: true,
-            dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
-            props: {
-              label: "name",
-              value: "deptId",
+    name: "propertyCharge",
+    data () {
+        return {
+            form: {},
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            search:true,
-            disabled:false,
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择物业公司",
-              trigger: ["blur","change"]
-            }, ],
-          },
-          {
-            label: "类型",
-            labelWidth:labelWidth,
-            prop: "payType",
-            checkStrictly: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payType",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
-            },
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择类型",
-              trigger: ["blur","change"]
-            }, ],
-          },
+            datetime: "",
+            selectionList: [],
+            memberFlag: false,
+            option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
 
-          {
-            label: "收费项名称",
-            labelWidth:labelWidth,
-            prop: "name",
-            searchSpan: searchSpan,
-            searchLabelWidth: labelWidth,
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入收费项名称",
-              trigger: ["blur","change"]
-            },],
-          },
-          {
-            label: "计算方式",
-            labelWidth:labelWidth,
-            prop: "calculationFormula",
-            checkStrictly: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payCalculationFormula",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
-            },
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择计算方式",
-              trigger: ["blur","change"]
-            }, ],
-          },
-          {
-            label: "单价(元)",
-            labelWidth:labelWidth,
-            prop: "unitPrice",
-            type:'number',
-            precision:2,
-            rules: [{
-              required: true,
-              message: "请输入单价",
-              trigger: ["blur","change"]
-            }]
-          },
-          {
-            label: "缴费周期",
-            labelWidth:labelWidth,
-            placeholder:"几个月收费一次",
-            prop: "payPeriod",
-            checkStrictly: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
-            },
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择缴费周期",
-              trigger: ["blur","change"]
-            }, ],
-          },
+                // menu: false,
+                // addBtn: false,
+                border: true,
+                index: true,
+                selection: false,
+                height: "auto",
+                calcHeight: 54,
+                dialogWidth: 950,
+                tip: false,
+                //stripe:true,
+                viewBtn: true,
+                excelBtn: true,
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "物业公司",
+                        labelWidth: labelWidth,
+                        prop: "propertyId",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
+                        props: {
+                            label: "name",
+                            value: "deptId",
+                        },
+                        searchSpan: 4,
+                        search: true,
+                        disabled: false,
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择物业公司",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+                    {
+                        label: "类型",
+                        labelWidth: labelWidth,
+                        prop: "payType",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=payType",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey",
+                        },
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择类型",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
 
-        ],
-      },
-      data: [],
-    }
-  },
-  watch: {},
-  computed: {
-    ...mapGetters(["permission", "userInfo"]),
-    permissionList () {
-      return {
-        addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
-        viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
-        delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
-        editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
-      }
-    },
-    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 == 'idCard') {
-            return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-          } else {
-            return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-          }
+                    {
+                        label: "收费项名称",
+                        labelWidth: labelWidth,
+                        prop: "name",
+                        searchSpan: searchSpan,
+                        searchLabelWidth: labelWidth,
+                        search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入收费项名称",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+                    {
+                        label: "计算方式",
+                        labelWidth: labelWidth,
+                        prop: "calculationFormula",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=payCalculationFormula",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey",
+                        },
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择计算方式",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+                    {
+                        label: "单价(元)",
+                        labelWidth: labelWidth,
+                        prop: "unitPrice",
+                        type: 'number',
+                        precision: 2,
+                        rules: [{
+                            required: true,
+                            message: "请输入单价",
+                            trigger: ["blur", "change"]
+                        }]
+                    },
+                    {
+                        label: "缴费周期",
+                        labelWidth: labelWidth,
+                        placeholder: "几个月收费一次",
+                        prop: "payPeriod",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey",
+                        },
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择缴费周期",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+
+                ],
+            },
+            data: [],
         }
-      }
     },
-  },
-  methods: {
-    showStringDispose (row, type) {
-      row[type] = !row[type]
-    },
-    manageMember (row) {
-      this.memberFlag = true
-      var that = this
-      this.$nextTick(() => {
-        that.$refs.partyOrganizationMember.init(row)
-      })
-    },
-    rowSave (row, done, loading) {
-      add(row).then(
-        () => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-          done()
+    watch: {},
+    computed: {
+        ...mapGetters(["permission", "userInfo"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
+                viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
+                delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
+                editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
+            }
         },
-        (error) => {
-          window.console.log(error)
-          loading()
-        }
-      )
-    },
-    rowUpdate (row, index, done, loading) {
-      if (row.urls.length > 0) {
-        var urls = []
-        var split = row.urls.split(",")
-        split.forEach(url => {
-          var names = url.split("jczz/")
-          urls.push(names[1])
-        })
-        row.urls = urls.join(",")
-      }
-      update(row).then(
-        () => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-          done()
+        ids () {
+            let ids = []
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
         },
-        (error) => {
-          window.console.log(error)
-          loading()
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'idCard') {
+                        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]
+        },
+        manageMember (row) {
+            this.memberFlag = true
+            var that = this
+            this.$nextTick(() => {
+                that.$refs.partyOrganizationMember.init(row)
+            })
+        },
+        rowSave (row, done, loading) {
+            add(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowUpdate (row, index, done, loading) {
+            if (row.urls.length > 0) {
+                var urls = []
+                var split = row.urls.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.urls = urls.join(",")
+            }
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                })
+        },
+        // 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)) {
+                getDetail(this.form.id).then((res) => {
+                    this.form = res.data.data
+                    const column = this.findObject(this.option.column, "principalId")
+                    let arr = []
+                    arr.push(this.form.areaId)
+                    column.defaultExpandedKeys = arr
+                })
+            }
+
+            // //如果当前角色为物业管理员,则默认物业公司为该用户的物业公司
+            // if (this.userInfo.role_name.indexOf("wygly")>-1){
+            //   let column = this.findObject(this.option.column, "propertyId")
+            //   column.disabled = true
+            //   column.search = false
+            //   this.form.propertyId = this.userInfo.dept_id
+            // }
+
+            done()
+        },
+        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()
+        },
+
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            this.loading = true
+
+            //如果当前角色为物业管理员,则默认筛选该物业公司
+            if (this.userInfo.role_name.indexOf("wygly") > -1) {
+                let column = this.findObject(this.option.column, "propertyId")
+                column.disabled = true
+                column.search = false
+                this.form.propertyId = this.userInfo.dept_id
+
+                params.propertyId = this.userInfo.dept_id
+            }
+
+
+
+            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                const data = res.data.data
+
+                this.page.total = data.total
+                this.data = data.records
+                this.loading = false
+                this.selectionClear()
+            })
         }
-      )
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id)
-        })
-        .then(() => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-        })
-    },
-    // 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)) {
-        getDetail(this.form.id).then((res) => {
-          this.form = res.data.data
-          const column = this.findObject(this.option.column, "principalId")
-          let arr = []
-          arr.push(this.form.areaId)
-          column.defaultExpandedKeys = arr
-        })
-      }
-
-      // //如果当前角色为物业管理员,则默认物业公司为该用户的物业公司
-      // if (this.userInfo.role_name.indexOf("wygly")>-1){
-      //   let column = this.findObject(this.option.column, "propertyId")
-      //   column.disabled = true
-      //   column.search = false
-      //   this.form.propertyId = this.userInfo.dept_id
-      // }
-
-      done()
-    },
-    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()
-    },
-
-    currentChange (currentPage) {
-      this.page.currentPage = currentPage
-    },
-    sizeChange (pageSize) {
-      this.page.pageSize = pageSize
-    },
-    refreshChange () {
-      this.onLoad(this.page, this.query)
-    },
-    onLoad (page, params = {}) {
-      this.loading = true
-
-      //如果当前角色为物业管理员,则默认筛选该物业公司
-      if (this.userInfo.role_name.indexOf("wygly")>-1){
-        let column = this.findObject(this.option.column, "propertyId")
-        column.disabled = true
-        column.search = false
-        this.form.propertyId = this.userInfo.dept_id
-
-        params.propertyId = this.userInfo.dept_id
-      }
-
-
-
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data
-
-        this.page.total = data.total
-        this.data = data.records
-        this.loading = false
-        this.selectionClear()
-      })
-    }
-  },
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/property/propertyChargeRecord.vue b/src/views/property/propertyChargeRecord.vue
index 4e78797..0a1ec31 100644
--- a/src/views/property/propertyChargeRecord.vue
+++ b/src/views/property/propertyChargeRecord.vue
@@ -1,337 +1,330 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
-               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
-               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-               :before-open="beforeOpen"
-               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               @refresh-change="refreshChange" @on-load="onLoad">
-    </avue-crud>
-
-
-
-  </basic-container>
+    <basic-container>
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
+            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
+            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
+            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+        </avue-crud>
+    </basic-container>
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {getDetail,getList,add,update,remove} from "@/api/property/propertyChargeRecord";
-import website from "@/config/website";
-import func from "@/util/func";
-import {validatePhone} from "@/util/validate";
+import { mapGetters } from "vuex"
+import { getDetail, getList, add, update, remove } from "@/api/property/propertyChargeRecord"
+import website from "@/config/website"
+import func from "@/util/func"
+import { validatePhone } from "@/util/validate"
 const searchSpan = 4
-const labelWidth=110
 export default {
-  name: "propertyChargeRecord",
-  data () {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      datetime: "",
-      selectionList: [],
-      memberFlag: false,
-      option: {
-        // menu: false,
-        // addBtn: false,
-        border: true,
-        index: true,
-        selection: false,
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 950,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        //stripe:true,
-        viewBtn: true,
-        excelBtn: true,
-        dialogClickModal: false,
-        addBtn:false,
-        editBtn:false,
-        column: [
-          {
-            label: "物业公司",
-            labelWidth:labelWidth,
-            prop: "propertyId",
-            checkStrictly: true,
-            dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
-            props: {
-              label: "name",
-              value: "deptId",
+    name: "propertyChargeRecord",
+    data () {
+        return {
+            form: {},
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            search:true,
-            disabled:false,
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择物业公司",
-              trigger: ["blur","change"]
-            }, ],
-          },
+            datetime: "",
+            selectionList: [],
+            memberFlag: false,
+            option: {
+                labelWidth: 96,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
 
-          {
-            label: "付款人",
-            labelWidth:labelWidth,
-            prop: "payUser",
-            searchSpan: searchSpan,
-            searchLabelWidth: labelWidth,
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入收费项名称",
-              trigger: ["blur","change"]
-            },],
-          },
-          {
-            label: "付款时间",
-            labelWidth:labelWidth,
-            prop: "payTime",
-            rules: [{
-              required: true,
-              message: "请选择计算方式",
-              trigger: ["blur","change"]
-            }, ],
-          },
-          {
-            label: "付款金额(元)",
-            labelWidth:labelWidth,
-            prop: "payPrice",
-            type:'number',
-            precision:2,
-            rules: [{
-              required: true,
-              message: "请输入单价",
-              trigger: ["blur","change"]
-            }]
-          },
-          {
-            label: "付款方式",
-            labelWidth:labelWidth,
-            prop: "payFunc",
-            checkStrictly: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
+                // menu: false,
+                // addBtn: false,
+                border: true,
+                index: true,
+                selection: false,
+                height: "auto",
+                calcHeight: 54,
+                dialogWidth: 950,
+                tip: false,
+                //stripe:true,
+                viewBtn: true,
+                excelBtn: true,
+                dialogClickModal: false,
+                addBtn: false,
+                editBtn: false,
+                column: [
+                    {
+                        label: "物业公司",
+                        prop: "propertyId",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
+                        props: {
+                            label: "name",
+                            value: "deptId",
+                        },
+                        searchSpan,
+                        search: true,
+                        disabled: false,
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择物业公司",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+
+                    {
+
+                        label: "付款人",
+                        prop: "payUser",
+                        searchSpan: searchSpan,
+                        searchLabelWidth: 80,
+                        search: true,
+                        rules: [{
+                            required: true,
+                            message: "请输入收费项名称",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+                    {
+                        label: "付款时间",
+                        prop: "payTime",
+                        rules: [{
+                            required: true,
+                            message: "请选择计算方式",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+                    {
+                        label: "付款金额(元)",
+                        prop: "payPrice",
+                        type: 'number',
+                        precision: 2,
+                        rules: [{
+                            required: true,
+                            message: "请输入单价",
+                            trigger: ["blur", "change"]
+                        }]
+                    },
+                    {
+                        label: "付款方式",
+                        prop: "payFunc",
+                        checkStrictly: true,
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey",
+                        },
+                        type: "select",
+                        rules: [{
+                            required: true,
+                            message: "请选择缴费周期",
+                            trigger: ["blur", "change"]
+                        },],
+                    },
+
+                ],
             },
-            type: "select",
-            rules: [{
-              required: true,
-              message: "请选择缴费周期",
-              trigger: ["blur","change"]
-            }, ],
-          },
-
-        ],
-      },
-      data: [],
-    }
-  },
-  watch: {},
-  computed: {
-    ...mapGetters(["permission", "userInfo"]),
-    permissionList () {
-      return {
-        addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
-        viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
-        delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
-        editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
-      }
-    },
-    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 == 'idCard') {
-            return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-          } else {
-            return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-          }
+            data: [],
         }
-      }
     },
-  },
-  methods: {
-    showStringDispose (row, type) {
-      row[type] = !row[type]
-    },
-    manageMember (row) {
-      this.memberFlag = true
-      var that = this
-      this.$nextTick(() => {
-        that.$refs.partyOrganizationMember.init(row)
-      })
-    },
-    rowSave (row, done, loading) {
-      add(row).then(
-        () => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-          done()
+    watch: {},
+    computed: {
+        ...mapGetters(["permission", "userInfo"]),
+        permissionList () {
+            return {
+                addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
+                viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
+                delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
+                editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
+            }
         },
-        (error) => {
-          window.console.log(error)
-          loading()
-        }
-      )
-    },
-    rowUpdate (row, index, done, loading) {
-      if (row.urls.length > 0) {
-        var urls = []
-        var split = row.urls.split(",")
-        split.forEach(url => {
-          var names = url.split("jczz/")
-          urls.push(names[1])
-        })
-        row.urls = urls.join(",")
-      }
-      update(row).then(
-        () => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-          done()
+        ids () {
+            let ids = []
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id)
+            })
+            return ids.join(",")
         },
-        (error) => {
-          window.console.log(error)
-          loading()
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'idCard') {
+                        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]
+        },
+        manageMember (row) {
+            this.memberFlag = true
+            var that = this
+            this.$nextTick(() => {
+                that.$refs.partyOrganizationMember.init(row)
+            })
+        },
+        rowSave (row, done, loading) {
+            add(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowUpdate (row, index, done, loading) {
+            if (row.urls.length > 0) {
+                var urls = []
+                var split = row.urls.split(",")
+                split.forEach(url => {
+                    var names = url.split("jczz/")
+                    urls.push(names[1])
+                })
+                row.urls = urls.join(",")
+            }
+            update(row).then(
+                () => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                    done()
+                },
+                (error) => {
+                    window.console.log(error)
+                    loading()
+                }
+            )
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id)
+                })
+                .then(() => {
+                    this.onLoad(this.page)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    })
+                })
+        },
+        // 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)) {
+                getDetail(this.form.id).then((res) => {
+                    this.form = res.data.data
+                    const column = this.findObject(this.option.column, "principalId")
+                    let arr = []
+                    arr.push(this.form.areaId)
+                    column.defaultExpandedKeys = arr
+                })
+            }
+
+            // //如果当前角色为物业管理员,则默认物业公司为该用户的物业公司
+            // if (this.userInfo.role_name.indexOf("wygly")>-1){
+            //   let column = this.findObject(this.option.column, "propertyId")
+            //   column.disabled = true
+            //   column.search = false
+            //   this.form.propertyId = this.userInfo.dept_id
+            // }
+
+            done()
+        },
+        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()
+        },
+
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query)
+        },
+        onLoad (page, params = {}) {
+            this.loading = true
+
+            //如果当前角色为物业管理员,则默认筛选该物业公司
+            if (this.userInfo.role_name.indexOf("wygly") > -1) {
+                let column = this.findObject(this.option.column, "propertyId")
+                column.disabled = true
+                column.search = false
+                this.form.propertyId = this.userInfo.dept_id
+
+                params.propertyId = this.userInfo.dept_id
+            }
+
+
+
+            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+                const data = res.data.data
+
+                this.page.total = data.total
+                this.data = data.records
+                this.loading = false
+                this.selectionClear()
+            })
         }
-      )
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id)
-        })
-        .then(() => {
-          this.onLoad(this.page)
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          })
-        })
-    },
-    // 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)) {
-        getDetail(this.form.id).then((res) => {
-          this.form = res.data.data
-          const column = this.findObject(this.option.column, "principalId")
-          let arr = []
-          arr.push(this.form.areaId)
-          column.defaultExpandedKeys = arr
-        })
-      }
-
-      // //如果当前角色为物业管理员,则默认物业公司为该用户的物业公司
-      // if (this.userInfo.role_name.indexOf("wygly")>-1){
-      //   let column = this.findObject(this.option.column, "propertyId")
-      //   column.disabled = true
-      //   column.search = false
-      //   this.form.propertyId = this.userInfo.dept_id
-      // }
-
-      done()
-    },
-    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()
-    },
-
-    currentChange (currentPage) {
-      this.page.currentPage = currentPage
-    },
-    sizeChange (pageSize) {
-      this.page.pageSize = pageSize
-    },
-    refreshChange () {
-      this.onLoad(this.page, this.query)
-    },
-    onLoad (page, params = {}) {
-      this.loading = true
-
-      //如果当前角色为物业管理员,则默认筛选该物业公司
-      if (this.userInfo.role_name.indexOf("wygly")>-1){
-        let column = this.findObject(this.option.column, "propertyId")
-        column.disabled = true
-        column.search = false
-        this.form.propertyId = this.userInfo.dept_id
-
-        params.propertyId = this.userInfo.dept_id
-      }
-
-
-
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data
-
-        this.page.total = data.total
-        this.data = data.records
-        this.loading = false
-        this.selectionClear()
-      })
-    }
-  },
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/property/propertyCompanyDistrict.vue b/src/views/property/propertyCompanyDistrict.vue
index b1457a3..63d149a 100644
--- a/src/views/property/propertyCompanyDistrict.vue
+++ b/src/views/property/propertyCompanyDistrict.vue
@@ -30,6 +30,18 @@
 import func from "@/util/func"
 export default {
     data () {
+        //手机号格式校验
+        let validatorPhone = function (rule, value, callback) {
+            if (value) {
+                if (!/^1[3456789]\d{9}$/.test(value)) {
+                    callback(new Error('手机号格式有误!'))
+                } else {
+                    callback()
+                }
+            }
+            callback()
+        }
+
         return {
             form: {},
             query: {},
@@ -42,13 +54,16 @@
             datetime: "",
             selectionList: [],
             option: {
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
                 height: "auto",
                 calcHeight: 54,
                 dialogWidth: 1150,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 350,
                 border: true,
                 //stripe:true,
                 index: true,
@@ -57,7 +72,6 @@
                 dialogClickModal: false,
                 column: [
                     {
-                        width: 220,
                         overHidden: true,
                         label: '小区名称',
                         addDisplay: false,
@@ -87,7 +101,6 @@
                         },
                         defaultExpandedKeys: ["361102003"],
                         span: 12,
-                        labelWidth: 120,
                         width: 260,
                         rules: [{
                             required: true,
@@ -97,11 +110,11 @@
                     },
 
                     {
+                        overHidden: true,
+                        label: "物业公司",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        width: 160,
-                        label: "物业公司",
                         prop: "propertyCompanyName",
                         search: true,
                         searchSpan: 4,
@@ -118,7 +131,6 @@
                         prop: 'propertyCompanyId',
                         type: 'tree',
                         span: 12,
-                        labelWidth: 120,
                         dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
                         cascader: ['userId'],
                         props: {
@@ -132,10 +144,10 @@
                         }]
                     },
                     {
+                        width: 110,
                         label: '项目经理',
                         prop: 'principal',
                         span: 12,
-                        labelWidth: 120,
                         search: true,
                         searchSpan: 4,
                         rules: [{
@@ -145,21 +157,24 @@
                         },],
                     },
                     {
+                        width: 120,
                         label: '联系方式',
                         prop: 'principalPhone',
                         span: 12,
-                        labelWidth: 120,
                         rules: [{
                             required: true,
                             message: "请输入联系方式",
                             trigger: "blur",
-                        },],
+                        },
+                        {
+                            validator: validatorPhone,
+                            trigger: 'blur'
+                        }],
                     },
                     {
                         label: "物业成员",
                         prop: "userId",
                         span: 12,
-                        labelWidth: 120,
                         type: "tree",
                         multiple: true,
                         remote: true,
@@ -171,10 +186,10 @@
                         dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
                     },
                     {
+                        width: 100,
                         label: "物业阶段",
                         span: 12,
                         prop: "propertyStage",
-                        labelWidth: 120,
                         type: "select",
                         search: true,
                         searchSpan: 4,
@@ -186,10 +201,10 @@
                         },
                     },
                     {
+                        width: 100,
                         label: "合同开始时间",
                         prop: "startTime",
                         span: 12,
-                        labelWidth: 120,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
@@ -200,9 +215,9 @@
                         },],
                     },
                     {
+                        width: 100,
                         label: "合同结束时间",
                         prop: "endTime",
-                        labelWidth: 120,
                         span: 12,
                         type: "date",
                         format: "yyyy-MM-dd",

--
Gitblit v1.9.3