Skip to content

C
confucius
Commit b4c08a31 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 499b22f7
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 161 deletions
src/components/activity/active-from.vue
View file @ b4c08a31
......@@ -24,7 +24,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.StartTime" mask="YYYY-MM-DD HH:mm:ss"></q-date>
<q-date v-model="addMsg.StartTime" :options="StartTimeOptions" mask="YYYY-MM-DD HH:mm:ss"></q-date>
<q-time v-model="addMsg.StartTime" format24h mask="YYYY-MM-DD HH:mm:ss" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -40,7 +40,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.EndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
<q-date v-model="addMsg.EndTimeStr" :options="EndTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
<q-time v-model="addMsg.EndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="etime" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -56,7 +56,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.SignStartTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="date" />
<q-date v-model="addMsg.SignStartTimeStr" :options="SignStartTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="date" />
<q-time v-model="addMsg.SignStartTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="time" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -72,7 +72,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.SignEndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
<q-date v-model="addMsg.SignEndTimeStr" :options="SignEndTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
<q-time v-model="addMsg.SignEndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="endTime" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -395,6 +395,22 @@
this.addMsg.StartAge = val.min
this.addMsg.EndAge = val.max
},
//限制活动开始时间小于结束时间
StartTimeOptions(date){
return Date.parse(date) <= Date.parse(this.addMsg.EndTime)
},
//限制活动结束时间大于开始时间
EndTimeOptions(date){
return Date.parse(date) >= Date.parse(this.addMsg.StartTime)
},
//限制活动报名开始时间小于报名结束时间
SignStartTimeOptions(date){
return Date.parse(date) <= Date.parse(this.addMsg.SignEndTime)
},
//限制活动报名结束时间大于报名开始时间
SignEndTimeOptions(date){
return Date.parse(date) >= Date.parse(this.addMsg.SignStartTime)
},
uploadFile(files) {
UploadSelfFile("course", files[0], res => {
if (res.Code == 1) {
......@@ -402,7 +418,7 @@
}
});
},
//保存信息
//表单验证
saveRule() {
this.$refs.Name.validate();
this.$refs.StartTime.validate();
......@@ -415,15 +431,6 @@
!this.$refs.SignStartTime.hasError &&
!this.$refs.SignEndTime.hasError) {
return true
// this.apipostDS("/api/Education/SetActivity", this.addMsg, (res) => {
// if (res.data.resultCode === 1) {
// this.Success(res.data.message);
// this.closeRuleForm();
// this.$emit('success');
// } else {
// this.Error(res.data.message);
// }
// })
} else
return false
},
......
src/pages/activity/activityList.vue
View file @ b4c08a31
......@@ -109,7 +109,8 @@
line-height: 25px;
background-color: #004d40;
}
.activeType .app-image {
.activeType .app-image {
background-position: center center;
width: 50px;
height: 50px;
......@@ -117,15 +118,16 @@
float: left;
margin-right: 8px;
}
.Sysuser_Date .el-input {
width: 100%;
.Sysuser_Date .el-input {
width: 100%;
border: none;
background-color: transparent;
}
.Sysuser_Date .el-input__inner {
width: 100%;
border: none;
width: 100%;
border: none;
background-color: transparent;
}
......@@ -133,52 +135,46 @@
padding: 0 3px;
min-height: 0 !important;
}
</style>
<template>
<div class="page-body activeType">
<div class="page-search row items-center flex">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ActivityName" label="活动名称"
@clear="resetSearch" maxlength="20" />
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ActivityName"
label="活动名称" @clear="resetSearch" maxlength="20" />
</div>
<div class="col-3 Sysuser_Date">
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker
v-model="msg.SelectStartTimeStr"
type="date"
placeholder="选择开始日期"
value-format="yyyy-MM-dd"
@change="resetSearch">
</el-date-picker>    
<el-date-picker v-model="msg.SelectStartTimeStr" type="date" placeholder="选择开始日期"
value-format="yyyy-MM-dd" @change="resetSearch">
</el-date-picker>    
</template>
</q-field>
</div>
<div class="col-3 Sysuser_Date">
</div>
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker
v-model="msg.SelectEndTimeStr"
type="date"
placeholder="选择结束日期"
value-format="yyyy-MM-dd"
@change="resetSearch"
>
</el-date-picker>    
<el-date-picker v-model="msg.SelectEndTimeStr" type="date" placeholder="选择结束日期" value-format="yyyy-MM-dd"
@change="resetSearch">
</el-date-picker>    
</template>
</q-field>
</div>
<div class="col-3 ">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.SelectIsEnd" class="col-6 q-pr-lg q-pr-lg" :options="statusOpts"
emit-value map-options label="状态" @change="resetSearch"/>
</div>
</div>
<div class="col-3 ">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.SelectIsEnd"
class="col-6 q-pr-lg q-pr-lg" :options="statusOpts" emit-value map-options label="状态"
@change="resetSearch" />
</div>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">活动列表</div>
<q-space />
......@@ -188,53 +184,54 @@
</template>
<template v-slot:body-cell-activeName="props">
<q-td :props="props">
<div style="display:flex;align-items:center">
<div class="app-image"
<div style="display:flex;align-items:center">
<div class="app-image"
:style="{backgroundImage:'url(' + props.row.CoverImg + ')',backgroundSize:'cover'}">
</div>
{{props.row.ActivityName}}
</div>
{{props.row.ActivityName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-ActivityTime="props">
<q-td :props="props">
<div>
<div>活动时间：</div>
<div>{{props.row.StartTimeStr}}~{{props.row.EndTimeStr}}</div>
<div>报名时间：</div>
<div>{{props.row.SignStartTimeStr}}</div>
<div>{{props.row.SignEndTimeStr}}</div>
</div>
<div>
<div>活动时间：</div>
<div>{{props.row.StartTimeStr}}~{{props.row.EndTimeStr}}</div>
<div>报名时间：</div>
<div>{{props.row.SignStartTimeStr}}</div>
<div>{{props.row.SignEndTimeStr}}</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-AgeAndPeopleNum="props">
<q-td :props="props">
<div>
<div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
<div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>
<div>报名人数</div>
<div v-if="props.row.Distinguish ==1">总人数:{{props.row.ManNum}}人</div>
<div v-if="props.row.Distinguish ==0">男性:{{props.row.ManNum}}人 <span style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div>
</div>
<div>
<div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
<div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>
<div>报名人数</div>
<div v-if="props.row.Distinguish ==1">总人数:{{props.row.ManNum}}人</div>
<div v-if="props.row.Distinguish ==0">男性:{{props.row.ManNum}}人 <span
style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div>
</div>
</q-td>
</template>
<template v-slot:body-cell-activePrice="props">
<q-td :props="props">
<div>
<div v-if="props.row.IsFree==1" style="color:green;">免费</div>
<div v-if="props.row.IsFree==2" style="color:red;">现金价格:{{props.row.Price}}元</div>
<!-- <div v-if="props.row.IsFree==2" style="color:red;">现金点数:{{props.row.PointNum}}点</div> -->
<div>报名取消确认:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
<div>内部限制:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
</div>
<div>
<div v-if="props.row.IsFree==1" style="color:green;">免费</div>
<div v-if="props.row.IsFree==2" style="color:red;">现金价格:{{props.row.Price}}元</div>
<!-- <div v-if="props.row.IsFree==2" style="color:red;">现金点数:{{props.row.PointNum}}点</div> -->
<div>报名取消确认:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
<div>内部限制:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-LocationName="props">
<q-td :props="props">
<div style="width:200px;white-space: pre-line;">
{{props.row.LocationName}}
</div>
<div style="width:200px;white-space: pre-line;">
{{props.row.LocationName}}
</div>
</q-td>
</template>
<!-- <template v-slot:body-cell-JoinNum="props">
......@@ -247,18 +244,18 @@
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<div>
<!-- <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="编辑" @click="editQuotation(props.row)" /> -->
<q-btn flat size="xs" color="accent" style="font-weight:400" label="复制"
@click="goUrl('/activity/copyActive',props.row)" />
<!-- <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="删除" @click="delActive(props.row)" /> -->
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup @click="delActive(props.row)">
<q-item clickable v-close-popup @click="delActive(props.row)">
<q-item-section>
<q-item-label>删除</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/activeSignUpList',props.row)">
<q-item clickable v-close-popup @click="goUrl('/activity/activeSignUpList',props.row)">
<q-item-section>
<q-item-label>报名列表</q-item-label>
</q-item-section>
......@@ -273,17 +270,19 @@
<q-item-label>活动详情</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)" v-if="props.row.ActivityStatus==2">
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)"
v-if="props.row.ActivityStatus==2">
<q-item-section>
<q-item-label>活动总结</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)" v-if="props.row.ActivityStatus==2">
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)"
v-if="props.row.ActivityStatus==2">
<q-item-section>
<q-item-label>活动图片与视频</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
......@@ -296,19 +295,19 @@
</q-table>
</div>
<!-- 新增修改活动类型 -->
<!-- <ActiveForm v-if="showForm" @close="closeruleset" :save-obj="typeObj" :activeTypeOptions="activityTypeList" @success="resetSearch">
<!-- <ActiveForm v-if="showForm" @close="closeruleset" :save-obj="typeObj" :activeTypeOptions="activityTypeList" @success="resetSearch">
</ActiveForm> -->
</div>
</template>
<script>
import ActiveForm from '../../components/activity/active-from'
import ActiveForm from '../../components/activity/active-from'
export default {
meta: {
title: "活动列表"
},
components: {
ActiveForm
ActiveForm
},
data() {
return {
......@@ -318,14 +317,13 @@ import ActiveForm from '../../components/activity/active-from'
pageIndex: 1,
pageSize: 10,
ActivityName: '',
SelectStartTimeStr:"",
SelectEndTimeStr:"",
SelectIsEnd:-1,
rowsPerPage:10
SelectStartTimeStr: "",
SelectEndTimeStr: "",
SelectIsEnd: -1,
rowsPerPage: 10
},
pageCount: 0,
statusOpts:[
{
statusOpts: [{
label: "全部",
value: -1
},
......@@ -341,26 +339,26 @@ import ActiveForm from '../../components/activity/active-from'
label: "进行中",
value: 2
},
],
],
columns: [{
name: "Id",
label: "编号",
field: "Id",
align: "left",
required:true,
required: true,
},
{
name: "activeName",
label: "活动名称",
align: "left",
required:true,
required: true,
},
{
name: "ActivityTypeName",
label: "活动类型",
align: "left",
field:"ActivityTypeName"
field: "ActivityTypeName"
},
{
name: "ActivityTime",
......@@ -380,14 +378,14 @@ import ActiveForm from '../../components/activity/active-from'
{
name: "LocationName",
label: "位置",
field:"LocationName",
field: "LocationName",
align: "left",
style:"width:100px"
style: "width:100px"
},
{
name: "activeStutes",
label: "活动状态",
field:"ActivityStatusStr",
field: "ActivityStatusStr",
align: "left"
},
// {
......@@ -399,7 +397,7 @@ import ActiveForm from '../../components/activity/active-from'
{
name: 'optioned',
label: '操作',
required:true,
required: true,
align: "left"
}
],
......@@ -411,9 +409,9 @@ import ActiveForm from '../../components/activity/active-from'
// EnrollState: 1,
// ActivityId: 0
// },
showForm:false,
typeObj:{}
showForm: false,
typeObj: {}
}
},
......@@ -421,42 +419,42 @@ import ActiveForm from '../../components/activity/active-from'
this.getList();
},
methods: {
// getItem(item) {
// this.joinMsg.ActivityId = item.Id;
// this.getJoinData();
// },
getList(){
this.loading = true;
this.apipostDS("/api/Education/GetActivityPage",this.msg,(res)=>{
this.loading = false
if(res.data.resultCode===1){
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
})
},
delActive(item){
let that = this;
that.Confirm("是否删除?", function () {
that.apipostDS(
"/api/Education/RemoveActivity", {
Id: item.Id,
Status: 1
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
);
})
},
// getItem(item) {
// this.joinMsg.ActivityId = item.Id;
// this.getJoinData();
// },
getList() {
this.loading = true;
this.apipostDS("/api/Education/GetActivityPage", this.msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
})
},
delActive(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipostDS(
"/api/Education/RemoveActivity", {
Id: item.Id,
Status: 1
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
);
})
},
//刷新页面
refreshPage() {
this.showForm = false;
......@@ -464,11 +462,11 @@ import ActiveForm from '../../components/activity/active-from'
},
//显示修改
editQuotation(item) {
this.showForm = true;
this.showForm = true;
if (item) {
this.typeObj = item;
}else{
this.typeObj = {};
} else {
this.typeObj = {};
}
},
//重新查询
......@@ -485,23 +483,13 @@ import ActiveForm from '../../components/activity/active-from'
closeruleset() {
this.showForm = false;
},
goUrl(url,item,type=0){
if(type===1){
this.$router.push({
path:url,
query:{
name:item.ActivityName
goUrl(url, item) {
this.$router.push({
path: url,
query: {
Id: item.Id
}
})
}else{
this.$router.push({
path:url,
query:{
Id:item.Id
}
})
}
}
}
}
......
src/pages/activity/copyActive.vue
View file @ b4c08a31
......@@ -190,7 +190,6 @@
if (res.data.resultCode === 1) {
this.ActivityTitle = res.data.data.ActivityTitleList
this.activedata = res.data.data
console.log(192, this.activedata)
this.activedata.StartTime=""
this.activedata.StartTimeStr=""
this.activedata.EndTime=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment