Merge remote-tracking branch 'origin/master'

lin

2024-03-01 b026ec37b15e64f5305c1d3f20d5c04f6a74ad37

 src/views/article/components/deitDiscussion.vue

@@ -22,7 +22,8 @@
          </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>
@@ -93,7 +94,7 @@

        ontitle: '编辑议题',
        editFlag: false,

            disCussFromListClone: {},
        disCussFrom: {
          discussContent: '',
          optionRange: 0,
@@ -210,7 +211,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: true,
                menu: false,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
@@ -379,7 +380,17 @@
      handleSubmit(form, done) {
        done()
        form.articleId = this.articleId

            if (this.disCussFromListClone.length > 0) {
                this.disCussFromListClone.forEach(item => {
                    if (form.children.length > 0) {
                        let same = form.children.find(array => array.id === item.id)
                        if (!same) {
                            item.deleteFlag = 1
                            form.children.push(item)
                        }
                    }
                })
            }
        add(form).then(
          () => {
            this.$message({
@@ -456,6 +467,7 @@

      edit(row) {
        this.disCussFrom = row
            this.disCussFromListClone = [].concat(row.children)
        this.editFlag = true
      },