bug 修复

linwei

2024-01-05 a7689afd3cd1fe4bbbd907e9aa2931a940ae8e5b

bug 修复

 src/views/article/article.vue

@@ -631,7 +631,6 @@
        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(",")
@@ -640,11 +639,10 @@
              })
              data.url = urls.join(",")
            }
            // })
            data.articleList = JSON.parse(data.articleRange)
            this.form = data
          })
        }
        // con
        done()
      },
      currentChange(currentPage) {

 src/views/article/components/deitDiscussion.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-01-04 15:18:13
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-01-05 17:23:39
 * @LastEditTime: 2024-01-04 17:13:22
 * @FilePath: \jczz_web\src\views\article\components\deitDiscussion.vue
 * @Description: 
 * 
@@ -32,8 +32,7 @@
                    </template>
                    <template #menu="{ row, size }">
                        <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
                        <el-button v-if="row.level === 1" :size="size" text type="danger"
                            @click="deletes(row)">删除</el-button>
            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
                        <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
                            选择此项人数：{{ row.number }} 详情</el-button>
                    </template>
@@ -91,7 +90,7 @@
                createTime: '',
                updateTime: '',
                deleteFlag: '',
                publicDiscussId: '',
          articleId: '',
                parentId: '',
                level: '',
                children: [{
@@ -101,15 +100,14 @@
                    createTime: '',
                    updateTime: '',
                    deleteFlag: '',
                    publicDiscussId: '',
            articleId: '',
                    parentId: '',
                    level: '',
                }]
            },
            optionDiscuss: {
                emptyText: '取消',
                column: [
                    {
          column: [{
                        label: '议题',
                        prop: 'discussContent',
                        type: 'input',
@@ -173,8 +171,7 @@
                defaultExpandAll: true,
                rowKey: 'id',
                rowParentKey: 'parentId',
                column: [
                    {
          column: [{
                        label: '标题',
                        prop: 'discussContent',
                    },
@@ -185,7 +182,7 @@
                ]
            },

            publicDiscussId: '',
        articleId: '',

            userData: [],
            userOption: {
@@ -201,9 +198,7 @@
                    label: '手机',
                    prop: 'phone'
                }, {
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
            label: '小区',
                    prop: 'aoiName'
                }, {
                    label: '地址',
@@ -223,14 +218,13 @@
        }
    },

    watch: {
    },
    watch: {},

    methods: {
        initData (newData) {
            this.editFlag = false
            this.popupTableShow = true
            this.publicDiscussId = newData.id
        this.articleId = newData.id

            this.onLoad()
        },
@@ -242,7 +236,7 @@

        handleSubmit (form, done) {
            done()
            form.publicDiscussId = this.publicDiscussId
        form.articleId = this.articleId

            add(form).then(
                () => {
@@ -255,7 +249,7 @@

                    let params = {
                        level: 1,
                        publicDiscussId: this.publicDiscussId
              articleId: this.articleId
                    }

                    getLists(1, 100, Object.assign(params, this.query)).then(res => {
@@ -349,7 +343,7 @@

            if (type == 0) {
                this.userParams = {
                    publicDiscussId: row.id
            articleId: row.id
                }
            } else {
                this.userParams = {
@@ -372,7 +366,7 @@

            let params = {
                level: 1,
                publicDiscussId: this.publicDiscussId
          articleId: this.articleId
            }

            getLists(1, 100, Object.assign(params, this.query)).then(res => {

 src/views/article/components/discussionManageChild.vue

@@ -1,73 +1,11 @@
<template>
    <basicContainer>
        <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange"
            :option="option" v-model="form" @selection-change="selectionChange" @row-save="rowSave" @row-del="rowDel"
            @row-update="rowUpdate" @refresh-change="refreshChange">
            <template slot="menuLeft">
                <el-button type="primary" size="small" icon="el-icon-plus" v-if="data.length <= 0"
                    @click="$refs.crud.rowAdd()">新增</el-button>
            </template>

            <!--  <template slot="menuLeft">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
        </el-button>
      </template> -->
            <template slot-scope="scope" slot="menu">
                <!-- <el-button type="text" icon="el-icon-edit" size="small" @click.stop="openEdit(scope.row,scope.index)">编辑
        </el-button> -->
                <el-button type="primary" icon="el-icon-edit" size="small"
                    @click.stop="openDilog(scope.row, scope.index)">编辑议题
                </el-button>
                <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openUser(scope.row, 0)">参与用户
                </el-button>
            </template>
        </avue-crud>

  <div>
        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="80%" :before-close="handleClose">
            <span slot="title" class="dialog-footer">
                {{ ontitle }}
            </span>

            <div id="" v-if="editFlag">
                <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
                </avue-form>
      <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
    </el-dialog>
            </div>

            <div id="" v-if="!editFlag">
                <avue-crud :option="optionList" :data="form" ref="crud" @row-update="rowUpdate" @row-del="rowDel">
                    <template slot="menuLeft" v-if="!editFlag">
                        <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
                        </el-button>
                    </template>
                    <template #icon="scope">
                        <i :class="scope.row.icon" style="font-size:14px"></i>
                    </template>
                    <template #menu="{ row, size }">
                        <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
                        <el-button v-if="row.level === 1" :size="size" text type="danger"
                            @click="deletes(row)">删除</el-button>
                        <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">选择此项人数
                            ：{{ row.number }} 详情</el-button>
                    </template>
                </avue-crud>
            </div>
        </el-dialog>

        <el-dialog title="" append-to-body :visible.sync="dialogVisiblesEdit" width="50%" :before-close="editHandleClose">
            <span slot="title" class="dialog-footer">
                编辑议题
            </span>
            <div id="">
                <avue-form @submit="handleSubmitEdit" :option="option" v-model="discussForm"></avue-form>
            </div>
        </el-dialog>

        <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
            <avue-crud :data="userData" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
        </el-dialog>

    </basicContainer>
</template>

<script>
@@ -78,15 +16,6 @@
    updatePd,
    removePd
} from "@/api/discuss/publicDiscuss"

import {
    getLists,
    getList,
    getDetail,
    add,
    update,
    remove
} from "@/api/discuss/topics"

import {
    getPage
@@ -103,31 +32,7 @@
export default {
    data () {
        return {
            option1: {
                addBtn: false,
                menu: false,
                column: [{
                    label: '姓名',
                    prop: 'name'
                }, {
                    label: '头像',
                    prop: 'avatar'
                }, {
                    label: '手机',
                    prop: 'phone'
                }, {
                    width: 220,
                    overHidden: true,
                    label: '小区名称',
                    prop: 'aoiName'
                }, {
                    label: '地址',
                    prop: 'addressName'
                }, {
                    label: '时间',
                    prop: 'createTime'
                }]
            },
        dialogVisibles: false,
            userParams: {},
            // 分页信息
            pageUser: {
@@ -140,101 +45,6 @@
            dialogVisiblesEdit: false,
            dialogVisiblesUser: false,
            editFlag: false,
            optionList: {
                headerAlign: 'center',
                align: 'center',
                border: true,
                addBtn: false,
                editBtn: false,
                delBtn: false,
                defaultExpandAll: true,
                rowKey: 'id',
                rowParentKey: 'parentId',
                column: [{
                    label: '标题',
                    prop: 'discussContent',
                },
                {
                    label: '选项内容',
                    prop: 'optionContent',
                }
                ]
            },
            optionDiscuss: {
                emptyText: '取消',
                column: [{
                    label: '议题',
                    prop: 'discussContent',
                    type: 'input',
                    row: true,
                }, {
                    label: '选项范围',
                    prop: 'optionRange',
                    type: 'radio',
                    button: true,
                    row: true,
                    dicData: [{
                        label: '多选',
                        value: 1
                    }, {
                        label: '单选',
                        value: 0
                    }]
                }, {
                    label: '排序',
                    prop: 'sort',
                    controlsPosition: '',
                    type: 'number'
                },
                {
                    label: '选项内容',
                    prop: 'children',
                    type: 'dynamic',
                    span: 24,
                    children: {
                        column: [{
                            label: '选项标题',
                            prop: 'optionContent',
                            type: 'input',
                            rules: [{
                                required: true,
                                message: '请输入选项标题',
                                trigger: 'blur'
                            }]
                        }, {
                            label: '选项说明',
                            prop: 'optionDetail',
                            type: 'input',
                        }]
                    }
                },
                ]
            },
            disCussFrom: {
                discussContent: '',
                optionRange: 0,
                sort: 1,
                optionContent: '',
                optionDetail: '',
                number: '',
                createTime: '',
                updateTime: '',
                deleteFlag: '',
                publicDiscussId: '',
                parentId: '',
                level: '',
                children: [{
                    optionContent: '',
                    optionDetail: '',
                    number: '',
                    createTime: '',
                    updateTime: '',
                    deleteFlag: '',
                    publicDiscussId: '',
                    parentId: '',
                    level: '',
                }]
            },
            ontitle: '编辑议题',
            // 弹框标题
            title: '',
@@ -255,52 +65,28 @@
                currentPage: 1,
                total: 0
            },
            // 表单数据
            form: {
                title: '',
                openFlag: 0,
                numberRestrictions: 0,
                voteRestrictions: 0,
                userRestrictions: 0,
                endTime: '',
                articleId: '',
                createTime: '',
                updateTime: '',
                deleteFlag: '',
                repeatVote: 0,
                voteNumberPublic: 0,
                appointUser: '',
                userIds: '',
                eventType: 1,
                signatureFlag: 0,
                appointUser: 0
            },

            // 选择行
            selectionList: [],
            // 表单配置
            option: {
                // selection: true,
                height: "auto",
                calcHeight: 54,
                align: 'center',
                menuAlign: 'center',
                addBtn: false,
                // editBtn: false,
                searchMenuSpan: 3,
                // searchBtn: true,
                menuWidth: 500,
                column: [{
                    label: 'ID',
                    prop: 'id',
                    searchSpan: 4,
                    // search: true,
                    display: false,
                },
                {
                    label: '标题',
                    prop: 'title',
                    searchSpan: 4,
                    // disabled: true,
                },
                {
                    label: '参与人数',
@@ -386,7 +172,9 @@
                    prop: "endTime",
                    type: "datetime",
                    format: "yyyy-MM-dd hh:mm:ss",
                    valueFormat: "timestamp",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              // format: "yyyy-MM-dd hh:mm:ss",
              // valueFormat: "yyyy-MM-dd hh:mm:ss",
                    rules: [{
                        required: true,
                        message: "请选择截止时间",
@@ -396,11 +184,9 @@
                ]
            },
            // 表单列表
            data: [],
            userData: [],
            dataTop: [],
        disCussFrom: {},
            dialogVisibles: false,
            publicDiscussId: '',
        articleId: '',
            discussion: {},
        }
    },
@@ -418,7 +204,9 @@
        }
    },
    methods: {
        rowSave (row, done, loading) {
      handleSubmit(row, done) {
        row.articleId = this.articleId
        row.eventType = 1
            addPd(row).then(
                () => {
                    this.onLoad(this.discussion)
@@ -427,266 +215,29 @@
                        message: "操作成功!",
                    })
                    done()
            this.dialogVisibles = false
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },


        init (data) {
        this.dialogVisibles = true
        this.disCussFrom = {}
            this.discussion = data
            // let row = {
            //   title: data.title
            // }
            this.form.title = data.title
            this.form.articleId = data.id
        this.articleId = data.id
            this.onLoad(data)
        },

        openUser (row, type) {
            console.table(row)
            this.dialogVisiblesUser = true
            if (type == 0) {
                this.userParams = {
                    publicDiscussId: row.id
                }
            } else {
                this.userParams = {
                    topicsId: row.id
                }
            }
            this.getUserPage(this.pageUser, this.userParams)
        },

        getUserPage (page, params = {}) {
            getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                const data = res.data.data
                this.pageUser.total = data.total
                this.userData = data.records
            })
        },

        openEdit (row) {
            this.discussForm = row
            let times = new Date(row.endTime).getTime()
            this.discussForm.endTime = times
            this.dialogVisiblesEdit = true
        },
        // 提交修改
        rowUpdate (row, index, done, loading) {
            done()
            if (!row.id) {
                addPd(row).then(() => {
                    this.dialogVisiblesEdit = false
                    this.onLoad(this.discussion)
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    })
                })
            } else {
                updatePd(row).then(() => {
                    this.dialogVisiblesEdit = false
                    this.onLoad(this.discussion)
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    })
                })
            }
        },

        deletes (row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return remove(row.id)
                })
                .then(() => {
                    // this.onLoad(this.page);
                    this.dialogVisibles = false
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    })
                })
        },

        handleClose () {
            this.editFlag = false
            this.dialogVisibles = false
            this.disCussFrom = {}
        this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()

        console.log(this.$refs, 90999)
        },

        edithandleClose () {
            this.dialogVisiblesEdit = false
        },

        edit (row) {
            this.disCussFrom = row
            this.editFlag = true
        },

        add () {
            this.editFlag = true
        },

        handleReset () {
            this.editFlag = false
        },

        openDilog (row, type) {
            this.dialogVisibles = true
            this.loading = true
            this.publicDiscussId = row.id
            let params = {
                level: 1,
                publicDiscussId: row.id
            }
            getLists(1, 100, Object.assign(params, this.query)).then(res => {
                const data = res.data.data
                this.form = data
                this.loading = false
                // this.selectionClear();
            })
        },

        handleSubmit (form, done) {
            done()
            form.publicDiscussId = this.publicDiscussId
            add(form).then(
                () => {
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    form = {}
                    this.editFlag = false
                    let params = {
                        level: 1,
                        publicDiscussId: this.publicDiscussId
                    }
                    getLists(1, 100, Object.assign(params, this.query)).then(res => {
                        const data = res.data.data
                        this.form = data
                    })
                },
                (error) => {
                    window.console.log(error)
                    // loading();
                }
            )
        },
        searchHide () {
            this.search = !this.search
        },
        searchChange () {
            this.onLoad(this.discussion)
        },
        searchReset () {
            this.query = {}
            this.page.currentPage = 1
            this.onLoad(this.discussion)
        },

        handleAdd () {
            this.title = '新增'
            this.form = {}
            this.box = true
        },
        handleEdit (row) {
            this.title = '编辑'
            this.box = true
            getDetailPd(row.id).then(res => {
                this.form = res.data.data
            })
        },
        handleView (row) {
            this.title = '查看'
            this.view = true
            this.box = true
            getDetailPd(row.id).then(res => {
                this.form = res.data.data
            })
        },
        handleDelete () {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
            }
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return removePd(this.ids)
                })
                .then(() => {
                    this.selectionClear()
                    this.onLoad(this.discussion)
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    })
                })
        },
        rowDel (row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return remove(row.id)
                })
                .then(() => {
                    this.onLoad(this.discussion)
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    })
                })
        },
        beforeOpen (done, type) {
            if (["edit", "view"].includes(type)) {
                getDetailPd(this.form.id).then((res) => {
                    let data = res.data.data
                    this.form = data
                })
            }
            if (["add"].includes(type)) {
                this.form.title = this.discussion.title
                this.form.articleId = this.discussion.id
            }
            done()
        },
        beforeClose (done) {
            done()
            this.form = {}
            this.view = false
        },
        selectionChange (list) {
            this.selectionList = list
        },
        selectionClear () {
            this.selectionList = []
            // this.$refs.table.clearSelection();
        },
        // currentChange(currentPage) {
        //   this.page.currentPage = currentPage;
        //   this.onLoad(this.page);
        // },
        // sizeChange(pageSize) {
        //   this.page.pageSize = pageSize;
        //   this.onLoad(this.page);
        // },
        onLoad (data, params = {
            eventType: 1,
            articleId: data.id
@@ -695,9 +246,8 @@
            getListPd(1, 10, Object.assign(params, this.query)).then(res => {
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
          this.disCussFrom = data.records[0]
                this.loading = false
                this.selectionClear()
            })
        }
    }

 src/views/article/discussionManage.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
@@ -12,9 +11,9 @@
            </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, 1)">
                    创建议题
                </el-button> -->
        <el-button icon="el-icon-s-tools" :size="size" :type="type" @click.stop="openDilog(row, 1)">
          设置
        </el-button>

                <el-button icon="el-icon-edit" :size="size" :type="type" @click.stop="openEditPopup(row, 1)">
                    编辑议题
@@ -24,13 +23,11 @@
                    参与用户
                </el-button>

                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>

                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -49,20 +46,8 @@
        <deitDiscussion ref="DeitDiscussion">
        </deitDiscussion>

        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="80%" :before-close="handleClose">
            <discussionManageChild ref="discussionManageChild" />
            <!-- <span slot="title" class="dialog-footer">
        {{discussForm.ontitle}}
      </span> -->
            <!--  <div id="" v-if="discussForm.eventType == 1">
        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
      </div> -->

            <!-- <div id="" v-else>
        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
        </avue-form>
      </div> -->
        </el-dialog>
    </basic-container>
</template>

@@ -121,7 +106,6 @@
                userIds: '',
                eventType: 1,
            },
            dialogVisibles: false,
            form: {},
            query: {},
            loading: true,
@@ -139,11 +123,11 @@
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,
          menuWidth: 500,
                border: false,
                //stripe:true,
                index: true,
                viewBtn: true,
          viewBtn: false,
                selection: true,
                excelBtn: true,
                dialogClickModal: false,
@@ -439,48 +423,12 @@

        openDilog (row, type) {
            var that = this
            this.dialogVisibles = true
            this.$nextTick(() => {
                that.$refs.discussionManageChild.init(row)
            })
            // this.discussForm.eventType = type
            // this.discussForm.articleId = row.id
            // this.discussForm.title = row.title
            // if (type == 0) {
            //   this.discussForm.ontitle = '公益报名'
            // } else {
            //   this.discussForm.ontitle = '创建议题'
            // }
        },

        handleSubmit (form, done) {
            done()
            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) {
            console.log(row, 9999)
            if (row.videoUrl.length == 0) {
                row.videoUrl = ""
            }

 src/views/article/publicSignUp.vue

@@ -13,6 +13,9 @@
        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
          公益报名
        </el-button>
        <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(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>
@@ -40,11 +43,11 @@
      <span slot="title" class="dialog-footer">
        {{discussForm.ontitle}}
      </span>
      <div id="" v-if="discussForm.eventType == 1">
      <!--  <div id="" v-if="discussForm.eventType == 1">
        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
      </div>
      </div> -->

      <div id="" v-else>
      <div id="">
        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
        </avue-form>
      </div>
@@ -133,7 +136,7 @@
          border: false,
          //stripe:true,
          index: true,
          viewBtn: true,
          viewBtn: false,
          selection: true,
          excelBtn: true,
          dialogClickModal: false,
@@ -165,18 +168,6 @@
              // hide: true,
              span: 24,
            },
            // {
            //   label: "资讯来源",
            //   prop: "sourceName",
            //   search: true,
            //   searchSpan: 4,
            //   span: 24,
            //   rules: [{
            //     required: true,
            //     message: "请输入资讯类型",
            //     trigger: "blur",
            //   }, ],
            // },
            {
              label: "资讯范围",
              prop: "articleList",
@@ -202,7 +193,7 @@
              prop: "type",
              searchSpan: 3,
              width: 80,
              value: 2,
              value: 3,
              slot: true,
              search: true,
              type: "select",
@@ -282,30 +273,12 @@
                }
              ],
            },

            // {
            //   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",
@@ -383,59 +356,6 @@
                message: "请选截止时间",
                trigger: "blur",
              }, ],
            },
          ]
        },
        optionDiscuss: {
          column: [{
              label: "",
              type: 'title',
              prop: "title",
              span: 24,
              row: true,
              offset: 2,
              styles: {
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '开启',
                value: 0
              }, {
                label: '不开启',
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '开启签名',
              prop: 'signatureFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '开启',
                value: 0
              }, {
                label: '不开启',
                value: 1
              }]
            },
            {
              label: "截止时间",
              row: true,
              offset: 6,
              prop: "endTime",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "timestamp",
            },
          ]
        },
@@ -525,9 +445,9 @@
        //   .catch(_ => {});
      },
      rowSave(row, done, loading) {
        if (row.videoUrl.length == 0) {
          row.videoUrl = "";
        }
        // if (row.videoUrl.length == 0) {
        //   row.videoUrl = "";
        // }
        row.userid = this.userInfo.user_id;
        row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
@@ -641,7 +561,6 @@
        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(",");
@@ -650,11 +569,10 @@
              })
              data.url = urls.join(",")
            }
            // })
            data.articleList = JSON.parse(data.articleRange)
            this.form = data;
          });
        }
        // con
        done();
      },
      currentChange(currentPage) {

 src/views/property/inviteTenders.vue

@@ -625,7 +625,7 @@
              })
              data.url = urls.join(",")
            }
            // })
            data.articleList = JSON.parse(data.articleRange)
            this.form = data;
          });
        }

 src/views/property/oiae.vue

@@ -616,7 +616,6 @@
        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(",");
@@ -625,7 +624,7 @@
              })
              data.url = urls.join(",")
            }
            // })
            data.articleList = JSON.parse(data.articleRange)
            this.form = data;
          });
        }

 src/views/property/propertyCapitalApply.vue