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

Merge branch 'V4.3.3_XiaoWang' into dev

feature
是小王呀\24601 1 year ago
parent
a82b1227e9 7347204112
commit
778c8c5093
6 changed files with 69 additions and 83 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. 16
      src/views/modules/communityParty/activity/eventDetails.vue
  2. 13
      src/views/modules/communityParty/activity/index.vue
  3. 23
      src/views/modules/communityParty/activity/initiateActivity.vue
  4. 21
      src/views/modules/communityParty/comPromotion/add.vue
  5. 4
      src/views/modules/communityParty/comPromotion/event.vue
  6. 11
      src/views/modules/communityParty/comPromotion/index.vue

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

@ -68,22 +68,23 @@
<span>{{ formData.points || "--" }}</span> <span>{{ formData.points || "--" }}</span>
</div> </div>
</div> </div>
<!-- 总结 -->
<div class="m-info-prop"> <div class="m-info-prop" v-if="formData.status!==0&&formData.status!==1&&formData.status!==3">
<span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span> <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
<span style="margin-right: 10px;">&nbsp;</span> <span style="margin-right: 10px;">&nbsp;</span>
<!-- <span>{{ formData.sumUp || "--" }}</span> --> <!-- <span>{{ formData.sumUp || "--" }}</span> -->
<p class="text_p" v-html="formData.sumUp"></p> <p class="text_p" v-html="formData.sumUp"></p>
</div> </div>
<div class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;"> <!-- 活动图片 -->
<div v-if="formData.status!==0&&formData.status!==1&&formData.status!==3" class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
<span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span> <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
<div v-for="(image, index) in formData.activityImgs" :key="index"> <div v-for="(image, index) in formData.activityImgs" :key="index">
<img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;" <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
:src="image" alt="Image" /> :src="image" alt="Image" />
</div> </div>
</div> </div>
<!-- 报名名单 -->
<div style="margin-top: 20px;"> <div v-if="formData.status!==0&&formData.online == 1" style="margin-top: 20px;">
<div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;"> <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
报名名单 报名名单
</div> </div>
@ -112,8 +113,8 @@
</el-table> </el-table>
</div> </div>
<!-- 活动实况 -->
<div style="margin-top: 20px;"> <div style="margin-top: 20px;" v-if="formData.status!==0&&formData.online==1">
<div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;"> <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
活动实况 活动实况
</div> </div>
@ -229,7 +230,6 @@ export default {
}, },
async initForm(row) { async initForm(row) {
this.startLoading(); this.startLoading();
this.formData = JSON.parse(JSON.stringify(row)); this.formData = JSON.parse(JSON.stringify(row));
console.log(this.formData,"this.formData"); console.log(this.formData,"this.formData");

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

@ -105,7 +105,7 @@
<el-button type="text" style="color:#1C6AFD;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;" <el-button type="text" v-if="scope.row.status == 0||scope.row.status == 1" style="color:#1C6AFD;"
size="small" @click="handleEdit(scope.row)">编辑</el-button> size="small" @click="handleEdit(scope.row)">编辑</el-button>
<!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;" <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
@ -114,7 +114,7 @@
<el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;" <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;"
size="small" @click="handleSumm(scope.row)">活动总结</el-button> size="small" @click="handleSumm(scope.row)">活动总结</el-button>
<el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="text" <el-button type="text"
style="color:rgb(28, 106, 253);" size="small" style="color:rgb(28, 106, 253);" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -311,17 +311,16 @@
let currentTime1 = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; let currentTime1 = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
if (item.startTime > currentTime1) { if (item.startTime > currentTime1) {
if( item.status === 0 ){ if( item.status === 0 ){
console.log(item.startTime > currentTime1,item.startTime,currentTime1);
return return
}else{
// item.status = 0
// this.formData = item;
// this.updatetow()
} }
} else if (item.startTime < currentTime1 && item.endTime > currentTime1) { } else if (item.startTime < currentTime1 && item.endTime > currentTime1) {
if( item.status === 1 ){ if( item.status === 1 ){
console.log(item.startTime > currentTime1,item.startTime,currentTime1);
return return
}else{ }else{
// item.status = 1 return item.status = 1
// this.formData = item; // this.formData = item;
// this.updatetow() // this.updatetow()
} }

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

@ -20,9 +20,12 @@
</el-form-item> </el-form-item>
<el-form-item label="活动时间" prop="startTime" label-width="130px"> <el-form-item label="活动时间" prop="startTime" label-width="130px">
<el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange" <!-- <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
start-placeholder="开始时间" end-placeholder="结束时间"> start-placeholder="开始时间" end-placeholder="结束时间">
</el-date-picker> -->
<el-date-picker v-model.trim="timeRange" type="datetimerange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -42,8 +45,8 @@
<el-form-item label="活动封面图" label-width="140px" prop="coverPic"> <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
<template> <template>
<upload-image :defaultFileList="fileList" :limit="1" <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
@change="onChangeFileList" @file-removed="removedImg"></upload-image> @file-removed="removedImg"></upload-image>
</template> </template>
</el-form-item> </el-form-item>
@ -71,13 +74,17 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="线上报名" style="display: block" prop="peopleCount" label-width="150px"> <el-form-item v-if="formType!=='records'" label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
<el-switch v-model="online" @change="handleOnlineRegistration"></el-switch> <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
</el-form-item> </el-form-item>
</div> </div>
<div v-if="records"> <div v-if="records">
<div v-if="!online"> <div v-if="!online">
<el-form-item label="活动人数" label-width="140px">
<el-input-number v-model="formData.participants" @change="handleChange" :min="1" :max="10"
label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block"> <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
<div class="item_width_1"> <div class="item_width_1">
<!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp"> <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
@ -402,9 +409,11 @@ export default {
}, },
handleTimeChange(time) { handleTimeChange(time) {
if (time) { if (time) {
const startTimeArray = util.dateFormatter(time[0], 'date').split('-') console.log(time);
const endTimeArray = util.dateFormatter(time[1], 'date').split('-') const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
console.log(startTimeArray);
const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
console.log(endTimeArray);
this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00' this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59' this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
// this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日' // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'

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

@ -10,7 +10,7 @@
</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 HH:mm:ss" <el-date-picker v-model.trim="formData.releaseTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" 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>
@ -160,26 +160,13 @@ export default {
advertisingTag(){ advertisingTag(){
}, },
async initForm(typeid,row) { async initForm(typeid,row) {
console.log(row,typeid,'row');
this.startLoading(); this.startLoading();
if(row!=null){
this.formData = JSON.parse(JSON.stringify(row)); this.formData = JSON.parse(JSON.stringify(row));
}
this.formType=typeid this.formType=typeid
console.log(this.formData); 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(); this.endLoading();
}, },
async advertisingTag () { async advertisingTag () {

4
src/views/modules/communityParty/comPromotion/event.vue
View File

@ -21,7 +21,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.releaseTime || "--" }}至<span>{{ formData.endTime || "--" }}</span></span> <span>{{ formData.releaseTime || "--" }}</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>
@ -41,7 +41,7 @@
<div class="m-info-prop"> <div class="m-info-prop">
<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>
<el-switch :value="formData.top === 1 ? true : false" :disabled="true"></el-switch> <el-switch :value="formData.top === 0 ? true : false" :disabled="true"></el-switch>
</div> </div>
<div class="m-info-prop"> <div class="m-info-prop">

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

@ -202,14 +202,6 @@
} }
this.tableLoading = false this.tableLoading = false
}, },
handleAdd () {
this.formTitle = '新增'
this.formShow = true
this.$nextTick(() => {
// this.$refs.ref_form.initForm('add', null)
})
},
diaClose () { diaClose () {
// this.$refs.ref_form.resetData() // this.$refs.ref_form.resetData()
@ -234,10 +226,9 @@
handleAdd () { handleAdd () {
this.formTitle = '新增' this.formTitle = '新增'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
// this.$refs.ref_form.initForm('add', null) this.$refs.ref_form.initForm('add',null)
}) })
}, },
handleEdit (row) { handleEdit (row) {

Write Preview
Loading…
Cancel
Save