From 87b7c31da08b5d93af04e672d6dff862cf2eade8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 04 Jan 2024 17:26:17 +0800
Subject: [PATCH] 议事管理更改
---
src/views/article/discussionManage.vue | 29
src/views/article/components/discussionManageChild.vue | 1292 ++++++++++++++++++++++----------------------
src/views/article/components/deitDiscussion.vue | 386 +++++++++++++
3 files changed, 1,060 insertions(+), 647 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
new file mode 100644
index 0000000..23eb4db
--- /dev/null
+++ b/src/views/article/components/deitDiscussion.vue
@@ -0,0 +1,386 @@
+<!--
+ * @Author: shuishen 1109946754@qq.com
+ * @Date: 2024-01-04 15:18:13
+ * @LastEditors: shuishen 1109946754@qq.com
+ * @LastEditTime: 2024-01-04 17:13:22
+ * @FilePath: \jczz_web\src\views\article\components\deitDiscussion.vue
+ * @Description:
+ *
+ * Copyright (c) 2024 by shuishen, All Rights Reserved.
+-->
+<template>
+ <div>
+ <el-dialog title="" append-to-body :visible.sync="popupTableShow" 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>
+ </div>
+
+ <div id="" v-if="!editFlag">
+ <avue-crud :table-loading="loading" :option="optionList" :data="data" v-model="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="popupTableUserShow" width="50%" :before-close="userHandleClose">
+ <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import {
+ getListPd,
+ getDetailPd,
+ addPd,
+ updatePd,
+ removePd
+} from "@/api/discuss/publicDiscuss"
+
+import {
+ getPage
+} from "@/api/discuss/userTopics"
+
+
+import {
+ getLists,
+ getList,
+ getDetail,
+ add,
+ update,
+ remove
+} from "@/api/discuss/topics"
+
+export default {
+ data () {
+ return {
+ popupTableShow: false,
+ popupTableUserShow: false,
+
+ loading: true,
+
+ ontitle: '编辑议题',
+ editFlag: false,
+
+ 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: '',
+ }]
+ },
+ 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',
+ }]
+ }
+ },
+ ]
+ },
+
+ // 表单数据
+ form: {},
+ data: [],
+ 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',
+ }
+ ]
+ },
+
+ publicDiscussId: '',
+
+ userData: [],
+ userOption: {
+ addBtn: false,
+ menu: false,
+ column: [{
+ label: '姓名',
+ prop: 'name'
+ }, {
+ label: '头像',
+ prop: 'avatar'
+ }, {
+ label: '手机',
+ prop: 'phone'
+ }, {
+ label: '小区',
+ prop: 'aoiName'
+ }, {
+ label: '地址',
+ prop: 'addressName'
+ }, {
+ label: '时间',
+ prop: 'createTime'
+ }]
+ },
+ // 分页信息
+ userPage: {
+ pageSize: 10,
+ pageSizes: [10, 20, 30, 50, 100],
+ currentPage: 1,
+ total: 0
+ },
+ }
+ },
+
+ watch: {
+ },
+
+ methods: {
+ initData (newData) {
+ this.editFlag = false
+ this.popupTableShow = true
+ this.publicDiscussId = newData.id
+
+ this.onLoad()
+ },
+
+ handleClose () {
+ this.popupTableShow = false
+ this.disCussFrom = {}
+ },
+
+ 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.data = data
+ })
+ },
+ (error) => {
+ window.console.log(error)
+ }
+ )
+ },
+
+ handleReset () {
+ this.editFlag = false
+ },
+
+ // 提交修改
+ rowUpdate (row, index, done, loading) {
+ done()
+ if (!row.id) {
+ addPd(row).then(() => {
+ this.onLoad()
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ } else {
+ updatePd(row).then(() => {
+ this.onLoad()
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ }
+ },
+
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad()
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+
+ add () {
+ this.editFlag = true
+ },
+
+ edit (row) {
+ this.disCussFrom = row
+ this.editFlag = true
+ },
+
+ deletes (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad()
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+
+ openUser (row, type = 0) {
+ this.popupTableUserShow = true
+
+ if (type == 0) {
+ this.userParams = {
+ publicDiscussId: row.id
+ }
+ } else {
+ this.userParams = {
+ topicsId: row.id
+ }
+ }
+ this.getUserPage(this.userPage, this.userParams)
+ },
+
+ getUserPage (page, params = {}) {
+ getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data
+ this.userPage.total = data.total
+ this.userData = data.records
+ })
+ },
+
+ onLoad () {
+ this.loading = true
+
+ let params = {
+ level: 1,
+ publicDiscussId: this.publicDiscussId
+ }
+
+ getLists(1, 100, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data
+ this.data = data
+ this.loading = false
+ })
+ }
+ },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 157e556..d9ac977 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,707 +1,709 @@
<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>
+ <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">
+ <!-- <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)">编辑
+ <template slot-scope="scope" slot="menu">
+ <!-- <el-button type="text" icon="el-icon-edit" size="small" @click.stop="openEdit(scope.row,scope.index)">编辑
</el-button> -->
- <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openDilog(scope.row,scope.index)">编辑议题
- </el-button>
- <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openUser(scope.row,0)">参与用户
- </el-button>
- </template>
- </avue-crud>
-
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="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>
- </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>
+ <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>
- <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="dialogVisibles" width="80%" :before-close="handleClose">
+ <span slot="title" class="dialog-footer">
+ {{ ontitle }}
+ </span>
- <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>
+ <div id="" v-if="editFlag">
+ <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
+ </avue-form>
+ </div>
- </basicContainer>
+ <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>
- import {
+import {
getListPd,
getDetailPd,
addPd,
updatePd,
removePd
- } from "@/api/discuss/publicDiscuss";
+} from "@/api/discuss/publicDiscuss"
- import {
+import {
getLists,
getList,
getDetail,
add,
update,
remove
- } from "@/api/discuss/topics";
+} from "@/api/discuss/topics"
- import {
+import {
getPage
- } from "@/api/discuss/userTopics";
+} from "@/api/discuss/userTopics"
- import option from "@/option/discuss/publicDiscuss";
- import {
+import option from "@/option/discuss/publicDiscuss"
+import {
mapGetters
- } from "vuex";
- import {
+} from "vuex"
+import {
getDictionary
- } from '@/api/system/dict'
+} from '@/api/system/dict'
- export default {
- data() {
- return {
- option1: {
- addBtn: false,
- menu: false,
- column: [{
- label: '姓名',
- prop: 'name'
- }, {
- label: '头像',
- prop: 'avatar'
- }, {
- label: '手机',
- prop: 'phone'
- }, {
- label: '小区',
- prop: 'aoiName'
- }, {
- label: '地址',
- prop: 'addressName'
- }, {
- label: '时间',
- prop: 'createTime'
- }]
- },
- userParams: {},
- // 分页信息
- pageUser: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- discussForm: {},
- 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: {
+export default {
+ data () {
+ return {
+ option1: {
+ addBtn: false,
+ menu: false,
column: [{
- label: '选项标题',
- prop: 'optionContent',
- type: 'input',
- rules: [{
- required: true,
- message: '请输入选项标题',
- trigger: 'blur'
- }]
+ label: '姓名',
+ prop: 'name'
}, {
- label: '选项说明',
- prop: 'optionDetail',
- type: 'input',
+ label: '头像',
+ prop: 'avatar'
+ }, {
+ label: '手机',
+ prop: 'phone'
+ }, {
+ label: '小区',
+ prop: 'aoiName'
+ }, {
+ label: '地址',
+ prop: 'addressName'
+ }, {
+ label: '时间',
+ prop: 'createTime'
}]
- }
},
- ]
- },
- disCussFrom: {
- discussContent: '',
- optionRange: 0,
- sort: 1,
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- publicDiscussId: '',
- parentId: '',
- level: '',
- children: [{
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
+ userParams: {},
+ // 分页信息
+ pageUser: {
+ pageSize: 10,
+ pageSizes: [10, 20, 30, 50, 100],
+ currentPage: 1,
+ total: 0
+ },
+ discussForm: {},
+ 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: '',
+ // 是否展示弹框
+ box: false,
+ // 是否显示查询
+ search: true,
+ // 加载中
+ loading: true,
+ // 是否为查看模式
+ view: false,
+ // 查询信息
+ query: {},
+ // 分页信息
+ page: {
+ pageSize: 10,
+ pageSizes: [10, 20, 30, 50, 100],
+ 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: '参与人数',
+ prop: 'topsCount',
+ searchSpan: 4,
+ display: false,
+ },
+ {
+ label: '开启投票',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ value: 0,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择开启状态",
+ trigger: "blur",
+ },],
+ }, {
+ label: '投票限制',
+ prop: 'voteRestrictions',
+ type: 'radio',
+ button: true,
+ dicData: [{
+ label: '一人一票',
+ value: 0
+ }, {
+ label: '一户一票',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择投票限制",
+ trigger: "blur",
+ },],
+ value: 0
+ }, {
+ label: '签名',
+ prop: 'signatureFlag',
+ type: 'radio',
+ button: true,
+ dicData: [{
+ label: '不需要',
+ value: 0
+ }, {
+ label: '需要',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择是否签名",
+ trigger: "blur",
+ },],
+ value: 0
+ }, {
+ label: '指定用户',
+ prop: 'appointUser',
+ type: 'radio',
+ button: true,
+ dicData: [{
+ label: '不限制',
+ value: 0
+ }, {
+ label: '指定用户',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择是否指定用户",
+ trigger: "blur",
+ },],
+ value: 0
+ },
+ {
+ label: "截止时间",
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ rules: [{
+ required: true,
+ message: "请选择截止时间",
+ trigger: "blur",
+ },],
+ }
+ ]
+ },
+ // 表单列表
+ data: [],
+ userData: [],
+ dataTop: [],
+ dialogVisibles: false,
publicDiscussId: '',
- parentId: '',
- level: '',
- }]
- },
- ontitle: '编辑议题',
- // 弹框标题
- title: '',
- // 是否展示弹框
- box: false,
- // 是否显示查询
- search: true,
- // 加载中
- loading: true,
- // 是否为查看模式
- view: false,
- // 查询信息
- query: {},
- // 分页信息
- page: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- // 表单数据
- form: {
- 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: '参与人数',
- prop: 'topsCount',
- searchSpan: 4,
- display: false,
- },
- {
- label: '开启投票',
- prop: 'openFlag',
- type: 'radio',
- button: true,
- value: 0,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择开启状态",
- trigger: "blur",
- }, ],
- }, {
- label: '投票限制',
- prop: 'voteRestrictions',
- type: 'radio',
- button: true,
- dicData: [{
- label: '一人一票',
- value: 0
- }, {
- label: '一户一票',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择投票限制",
- trigger: "blur",
- }, ],
- value: 0
- }, {
- label: '签名',
- prop: 'signatureFlag',
- type: 'radio',
- button: true,
- dicData: [{
- label: '不需要',
- value: 0
- }, {
- label: '需要',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否签名",
- trigger: "blur",
- }, ],
- value: 0
- }, {
- label: '指定用户',
- prop: 'appointUser',
- type: 'radio',
- button: true,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '指定用户',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否指定用户",
- trigger: "blur",
- }, ],
- value: 0
- },
- {
- label: "截止时间",
- prop: "endTime",
- type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- rules: [{
- required: true,
- message: "请选择截止时间",
- trigger: "blur",
- }, ],
- }
- ]
- },
- // 表单列表
- data: [],
- userData: [],
- dataTop: [],
- dialogVisibles: false,
- publicDiscussId: '',
- discussion: {},
- }
+ discussion: {},
+ }
},
- mounted() {
+ mounted () {
},
computed: {
- ...mapGetters(["permission"]),
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
- }
+ ...mapGetters(["permission"]),
+ ids () {
+ let ids = []
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ }
},
methods: {
- rowSave(row, done, loading) {
- addPd(row).then(
- () => {
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
+ rowSave (row, done, loading) {
+ addPd(row).then(
+ () => {
+ this.onLoad(this.discussion)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
- init(data) {
- this.discussion = data
- // let row = {
- // title: data.title
- // }
- this.form.title = data.title
- this.form.articleId = data.id;
- this.onLoad(data)
- },
+ init (data) {
+ this.discussion = data
+ // let row = {
+ // title: data.title
+ // }
+ this.form.title = data.title
+ this.form.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)
- },
+ 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;
- });
- },
+ 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: "操作成功!"
- });
- })
- }
- },
+ 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: "操作成功!"
- });
- });
- },
+ deletes (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ // this.onLoad(this.page);
+ this.dialogVisibles = false
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
- handleClose() {
- this.editFlag = false
- this.dialogVisibles = false
- this.disCussFrom = {}
- },
-
- edithandleClose() {
- this.dialogVisiblesEdit = false
- },
-
- edit(row) {
- this.disCussFrom = row
- this.editFlag = true
- },
-
- add() {
- this.editFlag = true
- },
-
- handleReset() {
- this.editFlag = false
- },
-
- openDilog(row, type) {
- this.dialogVisibles = true
- this.loading = true;
- this.publicDiscussId = row.id
- let params = {
- level: 1,
- publicDiscussId: row.id
- }
- getLists(1, 100, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.form = data;
- this.loading = false;
- // this.selectionClear();
- })
- },
-
- handleSubmit(form, done) {
- done();
- form.publicDiscussId = this.publicDiscussId
- add(form).then(
- () => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- form = {}
+ handleClose () {
this.editFlag = false
+ this.dialogVisibles = false
+ this.disCussFrom = {}
+ },
+
+ edithandleClose () {
+ this.dialogVisiblesEdit = false
+ },
+
+ edit (row) {
+ this.disCussFrom = row
+ this.editFlag = true
+ },
+
+ add () {
+ this.editFlag = true
+ },
+
+ handleReset () {
+ this.editFlag = false
+ },
+
+ openDilog (row, type) {
+ this.dialogVisibles = true
+ this.loading = true
+ this.publicDiscussId = row.id
let params = {
- level: 1,
- publicDiscussId: this.publicDiscussId
+ level: 1,
+ publicDiscussId: row.id
}
getLists(1, 100, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.form = data;
+ const data = res.data.data
+ this.form = data
+ this.loading = false
+ // this.selectionClear();
})
- },
- (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;
+ 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
+ }) {
+ this.loading = true
+ getListPd(1, 10, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
}
- 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
- }) {
- this.loading = true;
- getListPd(1, 10, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
- }
}
- };
+}
</script>
<style lang="scss" scoped>
- .el-pagination {
+.el-pagination {
margin-top: 20px;
- }
+}
</style>
\ No newline at end of file
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index d7c9492..413f365 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -12,13 +12,23 @@
</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 icon="el-icon-circle-plus-outline" :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)">
+ 编辑议题
</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>
+
<el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
@click.stop="updateFb(row)">
发布
@@ -35,6 +45,9 @@
</el-tag>
</template>
</avue-crud>
+
+ <deitDiscussion ref="DeitDiscussion">
+ </deitDiscussion>
<el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="80%" :before-close="handleClose">
<discussionManageChild ref="discussionManageChild" />
@@ -78,11 +91,15 @@
import {
mapGetters
} from "vuex"
+import deitDiscussion from "./components/deitDiscussion"
import discussionManageChild from "./components/discussionManageChild"
+
export default {
components: {
- discussionManageChild
+ deitDiscussion,
+ discussionManageChild,
},
+
data () {
return {
discussForm: {
@@ -412,6 +429,14 @@
},
},
methods: {
+ openEditPopup (row) {
+ this.$refs.DeitDiscussion.initData(row)
+ },
+
+ openUserPopup (row) {
+ this.$refs.DeitDiscussion.openUser(row)
+ },
+
openDilog (row, type) {
var that = this
this.dialogVisibles = true
--
Gitblit v1.9.3