|
|
@@ -5,9 +5,6 @@
|
|
|
<div class="filter-container">
|
|
|
<el-input clearable class="filter-item" style="width: 200px;" placeholder="标题"
|
|
|
v-model="listQuery.title"></el-input>
|
|
|
-
|
|
|
- <!-- <el-date-picker class="filter-item" v-model="listQuery.createTime" type="datetime" placeholder="创建时间">
|
|
|
- </el-date-picker> -->
|
|
|
<el-date-picker
|
|
|
class="filter-item"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
@@ -25,27 +22,23 @@
|
|
|
highlight-current-row>
|
|
|
<el-table-column type="index" label="序号" header-align="center" align="center">
|
|
|
</el-table-column>
|
|
|
-
|
|
|
<el-table-column align="center" min-width="100px" label="标题" prop="title">
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column align="center" min-width="100px" label="活动开始结束时间">
|
|
|
- <template slot-scope="props">
|
|
|
- {{ props.row.startTimeStr }}~{{ props.row.endTimeStr }}
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
|
|
|
+ <el-table-column align="center" min-width="100px" label="简介" prop="subTitle">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" min-width="80px" label="创建人" prop="sender">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="150px" label="创建时间" prop="createTime">
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column align="center" min-width="80px" label="活动状态" prop="statusName">
|
|
|
- </el-table-column> -->
|
|
|
+ <el-table-column align="center" min-width="80px" label="状态" prop="statusName">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
|
|
|
- <!-- <el-button v-if="scope.row.status == 0" type="success" size="small"
|
|
|
- @click="changeState(scope.row.welfareId, 1)">开启</el-button>
|
|
|
+ <el-button v-if="scope.row.status == 0" type="success" size="small"
|
|
|
+ @click="changeState(scope.row.msgId, 1)">开启</el-button>
|
|
|
<el-button v-if="scope.row.status == 1" type="warning" size="small"
|
|
|
- @click="changeState(scope.row.welfareId, 0)">关闭</el-button> -->
|
|
|
+ @click="changeState(scope.row.msgId, 0)">关闭</el-button>
|
|
|
<el-button type="danger" size="mini" @click="handleDelete(scope.row.welfareId, -1)">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -64,32 +57,9 @@
|
|
|
<el-form-item label="标题" prop="title">
|
|
|
<el-input v-model="dataForm.title" style="width: 350px"></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="活动连接">
|
|
|
- <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
- <!-- <el-form-item style="width: 800px" label="活动图片" prop="imgUrl">
|
|
|
- <el-tooltip content="建议图片宽高比260*200" placement="top-start">
|
|
|
- <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images" :limit="1"
|
|
|
- :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
|
|
|
- :on-remove="handleRemove">
|
|
|
- <i class="el-icon-plus"></i>
|
|
|
- </el-upload>
|
|
|
- </el-tooltip>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="开始日期" prop="startTimeStr">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTimeStr" type="date" placeholder="请选择开始时间" style="width: 350px">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="结束日期" prop="endTimeStr">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTimeStr" type="date" placeholder="请选择结束时间" style="width: 350px">
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item label="简介">
|
|
|
+ <el-input v-model="dataForm.subTitle" style="width: 350px"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="参与人">
|
|
|
- <el-select v-model="dataForm.participants" multiple filterable placeholder="请选择" style="width: 350px">
|
|
|
- <el-option :key="item.loginId" v-for="item in participantsList" :label="item.userName" :value="item.loginId">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item> -->
|
|
|
<el-form-item style="width: 800px" label="内容" prop="content">
|
|
|
<tinymce v-model="dataForm.content" ref="tinymce"></tinymce>
|
|
|
</el-form-item>
|
|
|
@@ -121,8 +91,7 @@
|
|
|
</style>
|
|
|
|
|
|
<script>
|
|
|
-import { createItem, updateItem, activityList, activityState } from "@/api/noticeList";
|
|
|
-import { allUserList } from "@/api/public";
|
|
|
+import { createItem, updateItem, list, state } from "@/api/noticeList";
|
|
|
import waves from "@/directive/waves"; // 水波纹指令
|
|
|
import Tinymce from '@/components/Tinymce'
|
|
|
|
|
|
@@ -131,15 +100,6 @@ export default {
|
|
|
directives: { waves },
|
|
|
data() {
|
|
|
return {
|
|
|
- setDisabled: {
|
|
|
- disabledDate(time) {
|
|
|
- // return time.getTime() > Date.now(); // 可选历史天、可选当前天、不可选未来天
|
|
|
- // return time.getTime() > Date.now() - 8.64e7; // 可选历史天、不可选当前天、不可选未来天
|
|
|
- // return time.getTime() < Date.now() - 8.64e7; // 不可选历史天、可选当前天、可选未来天
|
|
|
- return time.getTime() < Date.now(); // 不可选历史天、不可选当前天、可选未来天
|
|
|
- },
|
|
|
- },
|
|
|
- participantsList: [],
|
|
|
list: [],
|
|
|
total: 0,
|
|
|
listLoading: false,
|
|
|
@@ -151,13 +111,8 @@ export default {
|
|
|
},
|
|
|
dataForm: {
|
|
|
title: '',
|
|
|
- imgUrl: '',
|
|
|
- activityUrl: '',
|
|
|
- startTimeStr: '',
|
|
|
- endTimeStr: '',
|
|
|
- participants: [],
|
|
|
- content: '',
|
|
|
- images: [],
|
|
|
+ subTitle:'',
|
|
|
+ content: ''
|
|
|
},
|
|
|
dialogFormVisible: false,
|
|
|
dialogStatus: '',
|
|
|
@@ -167,102 +122,19 @@ export default {
|
|
|
},
|
|
|
rules: {
|
|
|
title: [{ required: true, message: "请填写活动名称", trigger: "blur" }],
|
|
|
- imgUrl: [{ required: true, message: "图片不能为空", trigger: "blur" }],
|
|
|
- startTimeStr: [
|
|
|
- { required: true, message: "请选择活动开始时间", trigger: "change" },
|
|
|
- { validator: this.checkStartTime, trigger: 'change' }
|
|
|
- ],
|
|
|
- endTimeStr: [
|
|
|
- { required: true, message: "请选择活动结束时间", trigger: "change" },
|
|
|
- { validator: this.checkEndTime, trigger: 'change' }
|
|
|
- ],
|
|
|
content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
|
|
|
},
|
|
|
- fileImgUrl: this.upLoadUrl,
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- // this.getAllUserList();
|
|
|
- // this.getList();
|
|
|
+ this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
- //校验开始时间
|
|
|
- checkStartTime(rule, value, callback) {
|
|
|
- if (!value) {
|
|
|
- callback(new Error("请选择活动开始时间！"));
|
|
|
- } else {
|
|
|
- if (this.dataForm.endTimeStr && Date.parse(value) > Date.parse(this.dataForm.endTimeStr)) {
|
|
|
- callback(new Error("活动开始时间必须小于等于活动结束时间！"))
|
|
|
- this.dataForm.startTimeStr = '';
|
|
|
- } else {
|
|
|
- callback();
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- //校验结束时间
|
|
|
- checkEndTime(rule, value, callback) {
|
|
|
- if (!value) {
|
|
|
- callback(new Error("请选择活动结束时间！"));
|
|
|
- } else {
|
|
|
- if (!this.dataForm.startTimeStr) {
|
|
|
- callback(new Error("请选择活动开始时间！"))
|
|
|
- this.dataForm.endTimeStr = '';
|
|
|
- } else if (Date.parse(this.dataForm.startTimeStr) > Date.parse(value)) {
|
|
|
- callback(new Error("活动结束时间必须大于等于活动开始时间！"))
|
|
|
- this.dataForm.endTimeStr = '';
|
|
|
- } else {
|
|
|
- callback();
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- handleRemove(file, fileList) {
|
|
|
- console.log(file, fileList);
|
|
|
- let images = [];
|
|
|
- for (let i in fileList) {
|
|
|
- let response = fileList[i].response;
|
|
|
- let url = response.data.url;
|
|
|
- images.push(url);
|
|
|
- this.dataForm.imgUrl = images.join(",");
|
|
|
- }
|
|
|
- },
|
|
|
- uploadBannerImg(file) {
|
|
|
- const isJPGs = file.type === "image/jpeg";
|
|
|
- console.log(isJPGs);
|
|
|
- },
|
|
|
- handleExceed(files, fileList) {
|
|
|
- this.$message.warning(
|
|
|
- `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件！，共选择了 ${files.length + fileList.length
|
|
|
- } 个文件`
|
|
|
- );
|
|
|
- },
|
|
|
- handleGallerySucess(res, file, fileList) {
|
|
|
- this.dataForm.imgUrl = ""; // 清空画廊图片数组
|
|
|
-
|
|
|
- let images = [];
|
|
|
- for (let i in fileList) {
|
|
|
- let response = fileList[i].response;
|
|
|
- if (response.errno && response.errno != "0") {
|
|
|
- this.$message.error("该图片上传失败,已被移除,请重新上传!");
|
|
|
- // 上传失败移除该 file 对象
|
|
|
- fileList.splice(i, 1);
|
|
|
- } else {
|
|
|
- let url = response.data.url;
|
|
|
- images.push(url);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- this.dataForm.imgUrl = images.join(",");
|
|
|
- },
|
|
|
resetForm() {
|
|
|
this.dataForm = {
|
|
|
title: '',
|
|
|
- imgUrl: '',
|
|
|
- activityUrl: '',
|
|
|
- startTimeStr: '',
|
|
|
- endTimeStr: '',
|
|
|
- participants: [],
|
|
|
- content: '',
|
|
|
- images: [],
|
|
|
+ subTitle:'',
|
|
|
+ content: ''
|
|
|
};
|
|
|
},
|
|
|
handleCreate() {
|
|
|
@@ -298,20 +170,6 @@ export default {
|
|
|
handleUpdate(row) {
|
|
|
this.dataForm = Object.assign({}, row);
|
|
|
let content = this.dataForm.content;
|
|
|
- if (this.dataForm.imgUrl) {
|
|
|
- let images = this.dataForm.imgUrl.split(",");
|
|
|
- this.dataForm.images = [];
|
|
|
- for (let i in images) {
|
|
|
- let url = images[i];
|
|
|
- let name = "image_" + i;
|
|
|
-
|
|
|
- this.dataForm.images.push({
|
|
|
- name: name,
|
|
|
- url: url,
|
|
|
- response: { error: "0", data: { url: url } },
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
this.dialogStatus = 'update'
|
|
|
this.dialogFormVisible = true
|
|
|
this.$nextTick(() => {
|
|
|
@@ -337,8 +195,8 @@ export default {
|
|
|
|
|
|
})
|
|
|
},
|
|
|
- changeState(welfareId, index) {
|
|
|
- activityState({ welfareId: welfareId, status: index }).then(response => {
|
|
|
+ changeState(msgId, index) {
|
|
|
+ state({ msgId: msgId, status: index }).then(response => {
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
message: '活动状态修改成功',
|
|
|
@@ -354,7 +212,7 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- activityState({ welfareId: welfareId, status: index }).then(response => {
|
|
|
+ state({ welfareId: welfareId, status: index }).then(response => {
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
message: '删除成功',
|
|
|
@@ -366,14 +224,9 @@ export default {
|
|
|
}).catch(() => {})
|
|
|
|
|
|
},
|
|
|
- getAllUserList() {
|
|
|
- allUserList().then(response => {
|
|
|
- this.participantsList = response.data.data;
|
|
|
- }).catch(() => {});
|
|
|
- },
|
|
|
getList() {
|
|
|
this.listLoading = true
|
|
|
- activityList(this.listQuery).then(response => {
|
|
|
+ list(this.listQuery).then(response => {
|
|
|
this.list = response.data.data.items
|
|
|
this.total = response.data.data.total
|
|
|
this.listLoading = false
|
