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/property/oiae.vue | 398 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 227 insertions(+), 171 deletions(-)
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index ec81199..9fcba31 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -5,7 +5,8 @@
@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>
<!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
</el-button>
@@ -28,26 +29,21 @@
</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>
+ <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>
-
-
<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>
@@ -58,9 +54,6 @@
</avue-form>
</div>
</el-dialog>
-
-
-
</basic-container>
</template>
@@ -73,7 +66,7 @@
add,
getNotice,
upcomment
- } from "@/api/article/article";
+ } from "@/api/article/article"
import {
getListPd,
@@ -82,18 +75,18 @@
addPd,
getNoticePd,
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"
export default {
data() {
@@ -128,14 +121,17 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+ dialogMenuPosition: 'center',
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 450,
- border: false,
+ border: true,
//stripe:true,
index: true,
viewBtn: true,
@@ -143,23 +139,25 @@
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: "资讯封面",
+ width: 110,
+ label: "缩略图",
prop: "url",
// align:'center',
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -170,50 +168,51 @@
// hide: true,
span: 24,
},
+
// {
- // label: "资讯来源",
+ // label: "收支来源",
// prop: "sourceName",
// search: true,
// searchSpan: 4,
// span: 24,
// rules: [{
// required: true,
- // message: "请输入资讯类型",
+ // message: "请输入收支类型",
// trigger: "blur",
// }, ],
// },
+
{
- label: "资讯范围",
+ hide: true,
+ parent: false,
+ label: "收支范围",
prop: "articleList",
- span: 12,
- minRows: 2,
- type: "cascader",
- multiple: true,
- tags: true,
+ type: 'tree',
dicData: [],
- rules: [{
- required: true,
- message: "请选择资讯范围",
- trigger: "blur",
- }, ],
props: {
label: "name",
value: 'id'
},
- hide: true,
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请选择收支范围",
+ trigger: "blur",
+ }, ],
+
},
{
- label: "资讯类型",
+ label: "收支类型",
prop: "type",
- searchSpan: 3,
width: 80,
value: 1,
slot: true,
+ searchSpan: 4,
search: true,
type: "select",
rules: [{
required: true,
- message: "请选择资讯类型",
+ message: "请选择收支类型",
trigger: "blur",
}, ],
dicData: [{
@@ -221,13 +220,14 @@
value: 1,
}],
},
+
{
label: "发布时间",
prop: "dateTime",
- type: "datetime",
+ type: "daterange",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- searchSpan: 5,
+ searchSpan: 6,
searchRange: true,
hide: true,
addDisplay: false,
@@ -240,7 +240,9 @@
trigger: "blur",
}, ],
},
+
{
+ width: 100,
label: "发布时间",
prop: "createTime",
type: "date",
@@ -248,13 +250,36 @@
valueFormat: "yyyy-MM-dd HH:mm:ss",
},
{
+ width: 110,
+ label: "所属街道",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "streetName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "communityName",
+ search: true,
+ searchSpan: 4
+ },
+ {
+ width: 100,
label: "发布状态",
prop: "publish",
- searchSpan: 3,
- width: 80,
value: "0",
slot: true,
+ searchSpan: 4,
search: true,
+ searchLabelWidth: 76,
type: "select",
rules: [{
required: true,
@@ -272,11 +297,14 @@
],
},
{
+ width: 100,
label: "评论区",
prop: "iscomment",
- width: 80,
slot: true,
- type: "select",
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
dicData: [{
label: "关闭",
value: "0",
@@ -302,7 +330,7 @@
},
},
{
- label: "资讯内容",
+ label: "收支内容",
prop: "content",
component: "AvueUeditor",
options: {
@@ -334,7 +362,6 @@
fontSize: '24px'
}
}, {
- labelWidth: 100,
label: '开启',
prop: 'openFlag',
type: 'radio',
@@ -373,7 +400,6 @@
fontSize: '24px'
}
}, {
- labelWidth: 100,
label: '开启投票',
prop: 'openFlag',
type: 'radio',
@@ -388,7 +414,6 @@
value: 1
}]
}, {
- labelWidth: 100,
label: '开启签名',
prop: 'signatureFlag',
type: 'radio',
@@ -415,26 +440,26 @@
]
},
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 = ""
}
}
},
@@ -449,17 +474,40 @@
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: "操作成功!",
+ })
+ })
+ },
openDilog(row, type) {
this.dialogVisibles = true
@@ -474,25 +522,25 @@
},
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();
@@ -501,60 +549,67 @@
},
rowSave(row, done, loading) {
if (row.videoUrl.length == 0) {
- row.videoUrl = "";
+ row.videoUrl = ""
}
- row.userid = this.userInfo.user_id;
+ row.userid = this.userInfo.user_id
+ console.log(row)
row.articleRange = JSON.stringify(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(
+ add({
+ ...row,
+ districtId: row.articleList
+ }).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)
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(
+ update({
+ ...row,
+ district_id: row.articleList
+ }).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("确定将选择数据删除?", {
@@ -563,37 +618,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: "确定",
@@ -601,163 +656,164 @@
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 = JSON.parse(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],
+ startTime: dateTime[0] + ' 00:00:01',
+ endTime: dateTime[1] + ' 23:59:59',
...this.query,
- };
- values.dateTime = null;
+ }
+ values.dateTime = null
}
values.type = 1
- this.loading = true;
+ this.loading = true
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 => {
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({
+ 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