elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

活动列表

feature
是小王呀\24601 1 year ago
parent
38103e966f
commit
773a395b9c
5 changed files with 94 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/views/modules/communityParty/activity/eventDetails.vue
  2. 43
      src/views/modules/communityParty/activity/index.vue
  3. 5
      src/views/modules/communityParty/activity/initiateActivity.vue
  4. 74
      src/views/modules/communityParty/comPromotion/add.vue
  5. 10
      src/views/modules/communityParty/comPromotion/index.vue

3
src/views/modules/communityParty/activity/eventDetails.vue
View File

@ -8,7 +8,7 @@
<div class="m-info-prop" style="flex: 0 0 50%;"> <div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">活动类型: </span> <span class="u-info-title-2">活动类型: </span>
<span style="margin-right: 10px;">&nbsp;</span> <span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.typeId || "--" }}</span> <span>{{ formData.typeName || "--" }}</span>
</div> </div>
<div class="m-info-prop" style="flex: 0 0 50%;"> <div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">活动名称: </span> <span class="u-info-title-2">活动名称: </span>
@ -206,6 +206,7 @@ export default {
}, },
async initForm(row) { async initForm(row) {
console.log("df ");
this.startLoading(); this.startLoading();
this.formData = JSON.parse(JSON.stringify(row)); this.formData = JSON.parse(JSON.stringify(row));
this.initLoading = true; this.initLoading = true;

43
src/views/modules/communityParty/activity/index.vue
View File

@ -277,7 +277,6 @@
let { data, code, msg } = await requestPost(url, params); let { data, code, msg } = await requestPost(url, params);
if (code == 0) { if (code == 0) {
this.corganizerList = data; this.corganizerList = data;
// console.log("corganizerList",this.corganizerList)
} else if (code >= 8000) { } else if (code >= 8000) {
this.$message.error(msg); this.$message.error(msg);
} }
@ -286,8 +285,8 @@
const url = "/actual/base/communityActivity/page"; const url = "/actual/base/communityActivity/page";
let params = { let params = {
pageSize: this.pageSize, // pageSize: this.pageSize,
pageNo: this.pageNo, //pageNo: this.pageNo,
agencyId: this.agencyId, agencyId: this.agencyId,
...this.formData, ...this.formData,
}; };
@ -295,50 +294,52 @@
if (code === 0) { if (code === 0) {
this.total = data.total this.total = data.total
this.tableData = data.list this.tableData = data.list
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
this.typeList.forEach((itemuse)=>{ this.typeList.forEach((itemuse)=>{
if(item.typeId==itemuse.id) if(item.typeId==itemuse.id)
{ {
item.typeName=itemuse.typeName item.typeName=itemuse.typeName
} }
}) })
const currentTime = new Date(); const currentTime = new Date();
if (item.startTime > currentTime) { const year = currentTime.getFullYear();
const month = String(currentTime.getMonth() + 1).padStart(2, '0');
const day = String(currentTime.getDate()).padStart(2, '0');
const hours = String(currentTime.getHours()).padStart(2, '0');
const minutes = String(currentTime.getMinutes()).padStart(2, '0');
const seconds = String(currentTime.getSeconds()).padStart(2, '0');
let currentTime1 = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
if (item.startTime > currentTime1) {
if( item.status === 0 ){ if( item.status === 0 ){
return return
}else{ }else{
item.status = 0 // item.status = 0
this.formData = item; // this.formData = item;
this.updatetow() // this.updatetow()
} }
} else if (item.startTime < currentTime && item.endTime > currentTime) { } else if (item.startTime < currentTime1 && item.endTime > currentTime1) {
if( item.status === 1 ){ if( item.status === 1 ){
return return
}else{ }else{
item.status = 1 // item.status = 1
this.formData = item; // this.formData = item;
this.updatetow() // this.updatetow()
} }
} else { } else {
if (item.status = 2) { if (item.status = 2) {
return return
} else { } else {
item.status = 2 // item.status = 2
this.formData = item; // this.formData = item;
this.updatetow() // this.updatetow()
} }
} }
}); });
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
console.log(this.tableData);
}, },
async getDemandOptions() { async getDemandOptions() {
this.$http this.$http
@ -530,9 +531,11 @@
}, },
async update(row) { async update(row) {
console.log(row);
let url = '/actual/base/communityActivity/update' let url = '/actual/base/communityActivity/update'
this.formData = row this.formData = row
this.formData.status = 3 this.formData.status = 3
console.log(this.formData,"this.formData");
const { data, code, msg, internalMsg } = await requestPost(url, this.formData) const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -553,7 +556,7 @@
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
type: 'success', type: 'success',
// message: '操作成功' message: '操作成功111'
}) })
} else if (internalMsg !== '') { } else if (internalMsg !== '') {
this.$message.error(internalMsg) this.$message.error(internalMsg)

5
src/views/modules/communityParty/activity/initiateActivity.vue
View File

@ -104,7 +104,7 @@
list-type="picture-card" :limit="3"> list-type="picture-card" :limit="3">
<i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload> <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
</div> </div>
<div> <!-- <div>
<div v-if="formData.activityImgs && formData.activityImgs.length > 0"> <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
<img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片" <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
style="width: 150px; margin-right: 10px;"> style="width: 150px; margin-right: 10px;">
@ -112,7 +112,7 @@
<div v-else> <div v-else>
暂无照片 暂无照片
</div> </div>
</div> </div> -->
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -553,6 +553,7 @@ export default {
// console.log("data/actual/base/communityActivity/save",this.formData) // console.log("data/actual/base/communityActivity/save",this.formData)
this.$refs['ref_form'].validate((valid, messageObj) => { this.$refs['ref_form'].validate((valid, messageObj) => {
this.formData.sendMessage = this.formData.sendMessage ? 1 : 0; this.formData.sendMessage = this.formData.sendMessage ? 1 : 0;
console.log(this.formData,"2234323424")
const dateObj = this.formData.startTime.split(' '); const dateObj = this.formData.startTime.split(' ');
const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22' const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
if(this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime){ if(this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime){

74
src/views/modules/communityParty/comPromotion/add.vue
View File

@ -10,12 +10,12 @@
</el-form-item> </el-form-item>
<el-form-item label="发布时间" label-width="140px" prop="releaseTime"> <el-form-item label="发布时间" label-width="140px" prop="releaseTime">
<el-date-picker v-model.trim="formData.releaseTime" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model.trim="formData.releaseTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd" placeholder="选择发布时间" style="width:280px"> format="yyyy-MM-dd HH:mm:ss" placeholder="选择发布时间" style="width:280px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="文章标签" prop="tagId" label-width="150px"> <el-form-item label="文章标签" prop="tagId" label-width="150px" >
<el-select class="u-item-width-normal" v-model.trim="formData.tagId" placeholder="请选择" clearable> <el-select class="u-item-width-normal" v-model.trim="formData.tagId" placeholder="请选择" clearable>
<el-option v-for="item in adverTagList" :key="item.id" :label="item.tagName" :value="item.id" <el-option v-for="item in adverTagList" :key="item.id" :label="item.tagName" :value="item.id"
class="u-item-width-normal"> class="u-item-width-normal">
@ -42,7 +42,7 @@
<el-form-item label="消息推送" label-width="140px"> <el-form-item label="消息推送" label-width="140px">
<el-checkbox-group v-model="formData.sendMsg"> <el-checkbox-group v-model="formData.sendMsg">
<el-checkbox true-label="1" false-label="0" label="是否通过公众号推送给社区居民"></el-checkbox> <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
@ -135,6 +135,43 @@ export default {
}, },
methods: { methods: {
// 获取广告标签
advertisingTag(){
requestPost('/advertisingTag/list',{customerId:this.customerId}).then(res=>{
console.log(res,'res');
if(res.code==0){
this.adverTagList=res.data
}
})
},
// 获取广告标签
advertisingTag(){
},
async initForm(typeid,row) {
console.log(row,typeid,'row');
this.startLoading();
this.formData = JSON.parse(JSON.stringify(row));
this.formType=typeid
console.log(this.formData);
// console.log(this.formData,'this.formData');
// // this.initLoading = true;
// // // console.log('this.formData,',this.formData);
// // let { latitude, longitude } = this.$store.state.user;
// // console.log("lat" + latitude + ",lon" + longitude);
// // if (this.formData.latitude && this.formData.longitude) {
// // latitude = this.formData.latitude;
// // longitude = this.formData.longitude;
// // }
// // if (!latitude || latitude == "" || latitude == "0") {
// // latitude = 39.9088810666821;
// // longitude = 116.39743841556731;
// // }
this.endLoading();
},
async advertisingTag () { async advertisingTag () {
const url = "/actual/base/advertisingTag/page" const url = "/actual/base/advertisingTag/page"
let params = { let params = {
@ -152,23 +189,21 @@ export default {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
/////
handleOnlineRegistration(value) { handleOnlineRegistration(value) {
// console.log(value) // console.log(value)
if (value) { if (value) {
this.formData.top = 1;
} else {
this.formData.top = 0; this.formData.top = 0;
} else {
this.formData.top = 1;
} }
}, },
onChangeFileList(e) { onChangeFileList(e) {
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
})) : []; // 当e为空时清空fileList
console.log(e,'e');
if (e.length > 0) { if (e.length > 0) {
let item = e[0]; let item = e[0];
let ob = { let ob = {
@ -177,7 +212,10 @@ export default {
}; };
this.fileList = [ob]; this.fileList = [ob];
this.formData.coverPic = ob.fileUrl; this.formData.coverPic = ob.fileUrl;
} }else {
this.formData.coverPic = '';
}
}, },
// async initForm(type, activityId) { // async initForm(type, activityId) {
@ -224,8 +262,8 @@ export default {
}, },
async addActivity() { async addActivity() {
if (this.formType === 'edit') { if (this.formType === 'edit') {
let url = '/actual/base/communityPublicity/update' let url = '/actual/base/communityPublicity/update'
this.formData.sendMsg= this.formData.sendMsg? 1:0
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -240,9 +278,11 @@ export default {
this.$message.error(msg) this.$message.error(msg)
} }
}else{ }else{
console.log("this.formData",this.formData) console.log("this.formData",this.formData)
let url = '/actual/base/communityPublicity/save' let url = '/actual/base/communityPublicity/save'
console.log(url); console.log(this.formData,"formData");
this.formData.sendMsg= this.formData.sendMsg? 1:0
console.log(this.formData);
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({

10
src/views/modules/communityParty/comPromotion/index.vue
View File

@ -42,7 +42,7 @@
<el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
<el-table-column prop="title" header-align="center" align="center" label="文章标题" width="200"> <el-table-column prop="title" header-align="center" align="center" label="文章标题" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="tagId" header-align="center" align="center" label="标签" width="150"> <el-table-column prop="tagName" header-align="center" align="center" label="标签" width="150">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span> <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> --> </template> -->
@ -190,6 +190,13 @@
this.total = data.total this.total = data.total
this.tableData = data.list this.tableData = data.list
// console.log( "啊大苏打撒旦",this.tableData ) // console.log( "啊大苏打撒旦",this.tableData )
this.tableData.forEach((item=>{
this.adverTagList.forEach((item1)=>{
if(item.tagId==item1.id){
item.tagName=item1.tagName
}
})
}))
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -234,6 +241,7 @@
}) })
}, },
handleEdit (row) { handleEdit (row) {
console.log(row);
this.formTitle = '修改' this.formTitle = '修改'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {

Write Preview
Loading…
Cancel
Save