From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/discussionManage.vue | 127 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 32 deletions(-)
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 34f0bed..0d961b0 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -19,8 +19,14 @@
编辑议题
</el-button>
- <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
+ <el-button icon="el-icon-user" :size="size" v-if="row.articleType != 4" :type="type"
+ @click.stop="openUserPopup(row, 0)">
参与用户
+ </el-button>
+
+ <el-button icon="el-icon-user" v-if="row.articleType == 4" :size="size" :type="type"
+ @click.stop="handleExport(row)">
+ 导出投票结果
</el-button>
<el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
@@ -79,6 +85,21 @@
} from "vuex"
import deitDiscussion from "./components/deitDiscussion"
import discussionManageChild from "./components/discussionManageChild"
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import Qs from "qs"
+ import {
+ exportBlob
+ } from "@/api/common"
+ import {
+ getToken
+ } from '@/util/auth'
+ import {
+ downloadXls
+ } from "@/util/util"
+ import {
+ dateNow
+ } from "@/util/date"
export default {
components: {
@@ -157,6 +178,7 @@
minRows: 2,
tags: true,
type: "tree",
+ dataType: "string",
multiple: true,
dicData: [],
rules: [{
@@ -168,7 +190,7 @@
label: "name",
value: 'id'
},
- hide: true,
+ // hide: true,
},
{
width: 110,
@@ -187,7 +209,7 @@
},
{
width: 110,
- label: "文章类型",
+ label: "议事类型",
prop: "articleType",
addDisplay: true,
editDisplay: true,
@@ -203,29 +225,29 @@
type: "tree",
rules: [{
required: true,
- message: "请选择文章类型",
+ message: "请选择议事类型",
trigger: "blur",
}, ],
},
- {
- label: "发布时间",
- prop: "dateTime",
- type: "daterange",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 6,
- searchRange: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [{
- required: true,
- message: "请选择发布时间",
- trigger: "blur",
- }, ],
- },
+ // {
+ // 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: "发布时间",
@@ -233,6 +255,10 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd HH:mm:ss",
+ search: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
},
{
width: 100,
@@ -484,6 +510,29 @@
}
},
methods: {
+ handleExport(row) {
+ this.$confirm("是否导出投票结果数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ this.query = {}
+ this.query.articleId = row.id
+ this.query.districtId = row.articleRange
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data)
+ .then(
+ res => {
+ downloadXls(res.data, `投票结果${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ })
+ },
iscommentInput(e, data) {
upcomment(data.id, e).then(() => {
this.$message({
@@ -494,11 +543,23 @@
},
openEditPopup(row) {
- this.$refs.DeitDiscussion.initData(row)
+ getListPd(1, 10, {
+ eventType: 1,
+ articleId: row.id
+ }).then(res => {
+ if (res.data.data.records.length == 0) {
+ this.$message.warning('请先设置议事规则!')
+ setTimeout(() => {
+ this.openDilog(row, 1)
+ }, 200)
+ } else {
+ this.$refs.DeitDiscussion.initData(row)
+ }
+ })
},
- openUserPopup(row) {
- this.$refs.DeitDiscussion.openUser(row)
+ openUserPopup(row, type) {
+ this.$refs.DeitDiscussion.openUser(row, type)
},
openDilog(row, type) {
@@ -513,7 +574,7 @@
row.videoUrl = ""
}
row.userid = this.userInfo.user_id
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -525,7 +586,7 @@
}
// 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
row.type = 4
- row.publish = 1
+ // row.publish = 1
add(row).then(
() => {
@@ -543,7 +604,7 @@
)
},
rowUpdate(row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -641,7 +702,7 @@
// })
this.form = {
...data,
- articleList: JSON.parse(data.articleRange)
+ articleList: data.articleRange
}
})
}
@@ -681,7 +742,7 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- // item.articleRange = JSON.parse(item.articleRange)
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
var names = item.url.split(",")
@@ -694,7 +755,9 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree(params = {}).then((res) => {
+ getDistrictTree(params = {
+ filterFlag: 1
+ }).then((res) => {
const data = res.data.data
this.districtTree = data
const column = this.findObject(this.option.column, "articleList")
--
Gitblit v1.9.3