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/publicSignUp.vue | 643 ++++++++++++++++++++++++---------------------------------
1 files changed, 274 insertions(+), 369 deletions(-)
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index 2017d5a..15e49a3 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -5,54 +5,46 @@
@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 size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+ 除
</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)">
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row)">
公益报名
</el-button>
- <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+ <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row)">
+ 参与用户
+ </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> -->
+ <!-- <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
发布
- </el-button>
+ </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" ? "关闭" : "关闭"
- }}
- </el-tag>
+ <template slot-scope="{ row, size }" slot="iscomment">
+ <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
+ :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
+ </el-switch>
</template>
</avue-crud>
+ <publicSignUpChild ref="publicSignUpChild"></publicSignUpChild>
+
<el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
<span slot="title" class="dialog-footer">
- {{discussForm.ontitle}}
+ {{ 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>
+ <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm"></avue-form>
</el-dialog>
-
-
-
-
</basic-container>
</template>
@@ -64,27 +56,26 @@
add,
getNotice,
upcomment
- } from "@/api/article/article";
+ } from "@/api/article/article"
import {
getListPd,
removePd,
updatePd,
addPd,
- getNoticePd,
+ getDetailPd,
upcommentPd
- } from "@/api/discuss/publicDiscuss";
+ } from "@/api/discuss/publicDiscuss"
- import website from '@/config/website';
-
+ import website from '@/config/website'
import {
getDistrictTree
- } from "@/api/district/index";
+ } from "@/api/district/index"
import {
mapGetters
- } from "vuex";
+ } from "vuex"
import publicSignUpChild from "./components/publicSignUpChild"
export default {
@@ -109,7 +100,7 @@
voteNumberPublic: 0,
appointUser: '',
userIds: '',
- eventType: 1,
+ eventType: 0,
},
dialogVisibles: false,
form: {},
@@ -123,38 +114,63 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 500,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 450,
- border: false,
+ border: true,
//stripe:true,
index: true,
- viewBtn: true,
+ viewBtn: false,
selection: true,
excelBtn: true,
dialogClickModal: false,
column: [{
- label: "资讯标题",
+ label: "文章标题",
prop: "title",
span: 24,
row: true,
searchSpan: 4,
search: true,
+ searchLabelWidth: 76,
rules: [{
required: true,
- message: "请输入资讯标题",
+ message: "请输入文章标题",
trigger: "blur",
}, ],
},
{
- label: "资讯封面",
+ label: "文章范围",
+ prop: "articleList",
+ span: 12,
+ minRows: 2,
+ type: "tree",
+ multiple: true,
+ dataType: "string",
+ tags: true,
+ dicData: [],
+ rules: [{
+ required: true,
+ message: "请选择文章范围",
+ trigger: "blur",
+ }, ],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ // hide: true,
+ },
+ {
+ width: 110,
+ label: "文章封面",
prop: "url",
// align:'center',
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -165,50 +181,19 @@
// 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: "资讯类型",
+ width: 110,
+ label: "文章类型",
prop: "type",
- searchSpan: 3,
- width: 80,
- value: 2,
+ searchSpan: 4,
+ value: 3,
slot: true,
- search: true,
+ // search: true,
type: "select",
rules: [{
required: true,
- message: "请选择资讯类型",
+ message: "请选择文章类型",
trigger: "blur",
}, ],
dicData: [{
@@ -216,40 +201,43 @@
value: 3, // // 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
}],
},
+ // {
+ // 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: "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",
- }, ],
- },
- {
+ width: 100,
label: "发布时间",
prop: "createTime",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd HH:mm:ss",
+ editDisplay: false,
},
{
+ width: 100,
label: "发布状态",
prop: "publish",
- searchSpan: 3,
- width: 80,
- value: "0",
+ searchSpan: 4,
+ value: "1",
slot: true,
- search: true,
+ hide: true,
+ // search: true,
type: "select",
rules: [{
required: true,
@@ -267,11 +255,14 @@
],
},
{
+ width: 80,
label: "评论区",
prop: "iscomment",
- width: 80,
slot: true,
- type: "select",
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
dicData: [{
label: "关闭",
value: "0",
@@ -283,83 +274,11 @@
],
},
{
- // labelWidth: 100,
- label: '开启投票',
- prop: 'openFlag',
- type: 'radio',
- button: true,
- // row: true,
- // offset: 6,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选开启状态",
- trigger: "blur",
- }, ],
- }, {
- // labelWidth: 100,
- label: '投票限制',
- prop: 'voteRestrictions',
- type: 'radio',
- button: true,
- // row: true,
- // offset: 6,
- dicData: [{
- label: '一人一票',
- value: 0
- }, {
- label: '一户一票',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选投票限制",
- trigger: "blur",
- }, ],
- },
- {
- label: "投票截止时间",
- // row: true,
- // offset: 6,
- prop: "endTime",
- type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- rules: [{
- required: true,
- message: "请选截止时间",
- trigger: "blur",
- }, ],
- },
- // {
- // 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: "资讯内容",
+ 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",
@@ -373,17 +292,19 @@
},
data: [],
optionEnroll: {
- column: [{
- label: "",
- type: 'title',
- prop: "title",
- span: 24,
- row: true,
- offset: 2,
- styles: {
- fontSize: '24px'
- }
- }, {
+ column: [
+ // {
+ // label: "",
+ // type: 'title',
+ // prop: "title",
+ // span: 24,
+ // row: true,
+ // offset: 2,
+ // styles: {
+ // fontSize: '24px'
+ // }
+ // },
+ {
labelWidth: 100,
label: '开启',
prop: 'openFlag',
@@ -430,8 +351,8 @@
offset: 6,
prop: "endTime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [{
required: true,
message: "请选截止时间",
@@ -440,80 +361,27 @@
},
]
},
- 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",
- },
- ]
- },
districtTree: [],
- };
+ }
},
watch: {
"form.articleType": {
handler(val) {
if (val) {
- var videoUrl = this.findObject(this.option.column, "videoUrl");
- var content = this.findObject(this.option.column, "content");
+ 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.display = true
+ content.display = false
videoUrl.rules = [{
required: false,
message: "请选择视频",
trigger: "blur",
- }, ];
+ }, ]
} else {
- videoUrl.display = false;
- content.display = true;
- videoUrl.rules = "";
+ videoUrl.display = false
+ content.display = true
+ videoUrl.rules = ""
}
}
},
@@ -528,50 +396,86 @@
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 = [];
+ let ids = []
this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
+ 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: {
+ iscommentInput(e, data) {
+ upcomment(data.id, e).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+
+ openUserPopup(row) {
+ this.$refs.publicSignUpChild.openUser(row)
+ },
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 = '创建议题'
- }
+ this.discussForm.ontitle = '公益报名'
+ this.getpunlicDiscussDetail(row)
+ },
+
+ getpunlicDiscussDetail(row) {
+ getDetailPd({
+ articleId: row.id
+ }).then((res) => {
+ if (res.data.data) {
+ let data = res.data.data
+ this.discussForm = data
+ }
+ })
},
handleSubmit(form, done) {
- done();
+ done()
addPd(form).then(
() => {
this.$message({
type: "success",
message: "操作成功!",
- });
+ })
this.dialogVisibles = false
- done();
+ done()
},
(error) => {
- window.console.log(error);
+ window.console.log(error)
// loading();
}
- );
+ )
},
handleClose(done) {
- done();
+ done()
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
@@ -579,42 +483,42 @@
// .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.videoUrl.length == 0) {
+ // row.videoUrl = "";
+ // }
+ row.userid = this.userInfo.user_id
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
- var split = row.url.split(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
}
add(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
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(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
@@ -622,18 +526,18 @@
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
@@ -642,37 +546,37 @@
type: "warning",
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- });
+ })
+ })
},
searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ this.query = {}
+ this.onLoad(this.page)
},
searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
selectionChange(list) {
- this.selectionList = list;
+ this.selectionList = list
},
selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
handleDelete() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -680,164 +584,165 @@
type: "warning",
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ 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(",");
+ var names = data.url.split(",")
names.forEach(name => {
urls.push(website.minioUrl + name)
})
data.url = urls.join(",")
}
- // })
- this.form = data;
- });
+ data.articleList = data.articleRange
+ this.form = data
+ })
}
- // con
- done();
+ done()
},
currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ this.page.currentPage = currentPage
},
sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ this.page.pageSize = pageSize
},
refreshChange() {
- this.onLoad(this.page, this.query);
+ this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
const {
dateTime
- } = this.query;
+ } = this.query
let values = {
...params,
- };
+ }
if (dateTime) {
values = {
...params,
startTime: dateTime[0],
endTime: dateTime[1],
...this.query,
- };
- values.dateTime = null;
+ }
+ values.dateTime = null
}
values.type = 3
- this.loading = true;
+ 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;
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
this.data.forEach(item => {
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
- var names = item.url.split(",");
+ 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;
- });
+ this.loading = false
+ this.selectionClear()
+ })
+ getDistrictTree(params = {
+ filterFlag: 1
+ }).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";
+ row.publish = "1"
} else {
- row.publish = "0";
+ row.publish = "0"
}
if (row.url.length > 0) {
var urls = []
- var split = row.url.split(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
}
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
kqcomment() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据开启评论?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- return upcomment(this.ids, "1");
+ return upcomment(this.ids, "1")
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
gbcomment() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据开启评论?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- return upcomment(this.ids, "0");
+ return upcomment(this.ids, "0")
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
}
},
- };
+ }
</script>
<style>
--
Gitblit v1.9.3