Skip to content

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

1

parent 07a3694b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 348 deletions
src/components/activity/active-from.vue
View file @ efcb8f71
This diff is collapsed.
src/pages/activity/activeDetail.vue
View file @ efcb8f71
<style scoped> <style scoped>
.header-box{ .header-box {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 40px; margin-bottom: 40px;
} }
.p_title { .p_title {
color: #000000; color: #000000;
font-size: 20px; font-size: 20px;
/* height: 30px !important; */ /* height: 30px !important; */
display: flex; display: flex;
align-items: center; align-items: center;
} }
.activeDetail{
.activeDetail {
overflow-y: scroll; overflow-y: scroll;
} }
.conbox{
height: calc(100vh - 220px);
overflow-y: scroll;
}
.conbox::-webkit-scrollbar {
/*滚动条整体样式*/
width : 5px; /*宽度竖滚动条的尺寸*/
height: 10px; /*高度横滚动条的尺寸*/
}
.conbox::-webkit-scrollbar-thumb {
/*滚动条里面的条*/
border-radius: 10px;
box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
background : #eee;
}
.conbox::-webkit-scrollbar-track {
/*滚动条里面轨道*/
border-radius: 5px;
background : #ffffff;
}
.listTitle{
font-size: 18px
}
</style> </style>
<template> <template>
<div class="page-body activeDetail"> <div class="page-body activeDetail">
<div class="header-box"> <div class="header-box">
<div class="flex"> <div class="flex">
<q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" /> <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
<span class="p_title">活动详情</span> <span class="p_title">活动详情</span>
</div> </div>
<div> <div>
<q-btn color="accent" size="sm" class="q-mr-md" label="新增活动" @click="addActiveList" /> <q-btn color="accent" size="sm" class="q-mr-sm" label="新增活动" @click="addActiveList" />
<q-btn color="accent" size="sm" label="保存" @click="save" /> <q-btn color="accent" size="sm" label="保存" @click="save" />
</div> </div>
</div> </div>
<div class="">
<div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex " >
<DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)" ref="child"/>
<el-tooltip class="item" effect="dark" content="删除当前活动" placement="top" v-if="index>0"> <div class="conbox">
<i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i> <ActiveForm :save-obj="activedata" :activeTypeOptions="activityTypeList" ref="childForm"
</el-tooltip> @success="getactivedata" />
<div class="">
<div class="q-mt-lg q-mb-lg listTitle">
活动列表
</div>
<div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex ">
<DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)" ref="child" />
<el-tooltip class="item" effect="dark" content="删除当前活动" placement="top" v-if="index>0">
<i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i>
</el-tooltip>
</div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import DetailItem from "../../components/activity/activeDetail-item" import DetailItem from "../../components/activity/activeDetail-item"
import ActiveForm from '../../components/activity/active-from'
export default { export default {
meta: { meta: {
title: "活动详情" title: "活动详情"
}, },
components: { components: {
DetailItem DetailItem,
ActiveForm
}, },
data() { data() {
return { return {
msg:{ msg: {
Id:0, Id: 0,
ActivityTitle:[] ActivityTitle: []
}, },
ActivityTitle:[ activeBaseData: {
{
Title:"",//活动大标题 },
TripSort:0,//活动排序 ActivityTitle: [{
ActivityPlanList:[//活动安排 Title: "", //活动大标题
{ TripSort: 0, //活动排序
TripSort:0,//排序 ActivityPlanList: [ //活动安排
StartTime:"",//开始时间 {
ActivityDuration:"",//活动时长（单位：分钟） TripSort: 0, //排序
LonLat:"",//活动地址经纬度 StartTime: "", //开始时间
LocationName:"",//活动地址 ActivityDuration: "", //活动时长（单位：分钟）
TripTitle:"",//安排标题 LonLat: "", //活动地址经纬度
TripContent:"",//内容 LocationName: "", //活动地址
TripPicList:[]//图片 TripTitle: "", //安排标题
} TripContent: "", //内容
] TripPicList: [] //图片
} }
], ]
item:{ }],
activedata: {
}
},
activityTypeList: [],
} }
}, },
mounted(){ mounted() {
if(this.$route.query.Id){ this.getActiveTypeList();
this.msg.Id=this.$route.query.Id if (this.$route.query.Id) {
this.getDetail() this.msg.Id = this.$route.query.Id
} this.getDetail()
}, }
},
methods: { methods: {
goBack(){ goBack() {
this.$router.go(-1) this.$router.go(-1)
}, },
addActiveList(){ addActiveList() {
let obj={ let obj = {
Title:"",//活动大标题 Title: "", //活动大标题
TripSort:this.ActivityTitle.length,//活动排序 TripSort: this.ActivityTitle.length, //活动排序
ActivityPlanList:[//活动安排 ActivityPlanList: [ //活动安排
{ {
TripSort:0,//排序 TripSort: 0, //排序
StartTime:"",//开始时间 StartTime: "", //开始时间
ActivityDuration:"",//活动时长（单位：分钟） ActivityDuration: "", //活动时长（单位：分钟）
LonLat:"",//活动地址经纬度 LonLat: "", //活动地址经纬度
LocationName:"",//活动地址 LocationName: "", //活动地址
TripTitle:"",//安排标题 TripTitle: "", //安排标题
TripContent:"",//内容 TripContent: "", //内容
TripPicList:[]//图片 TripPicList: [] //图片
} }
] ]
} }
this.ActivityTitle.push(obj) this.ActivityTitle.push(obj)
}, },
delActiveList(index){ delActiveList(index) {
this.ActivityTitle.splice(index,1) this.ActivityTitle.splice(index, 1)
}, },
getItemData(val,index){ //活动详情列表数据
this.msg.ActivityTitle[index]=val getItemData(val, index) {
this.msg.ActivityTitle[index] = val
}, },
//保存信息 //保存信息
save() { save() {
this.msg.ActivityTitle=this.ActivityTitle this.msg.ActivityTitle = this.ActivityTitle
this.$refs.child.map(x=>{ this.$refs.child.map(x => {
x.ruleVerification(); x.ruleVerification();
}) })
let res= this.$refs.child.every(x=>{ let res = this.$refs.child.every(x => {
return x.ruleVerification(); return x.ruleVerification();
}) })
if(res){ let res2 = this.$refs.childForm.saveRule()
this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => { if (res && res2) {
let msg = {
...this.msg,
...this.activeBaseData
}
console.log(144, msg)
this.apipostDS("/api/Education/SetActivity", msg, (res) => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getDetail()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}) })
} }
},
getDetail() {
this.apipostDS("/api/Education/GetActivity", {
Id: this.msg.Id
}, (res) => {
if (res.data.resultCode === 1) {
this.ActivityTitle = res.data.data.ActivityTitleList
this.activedata = res.data.data
}
})
}, },
  getDetail(){ //获取活动类型下拉
        this.apipostDS("/api/Education/GetActivity", {Id:this.msg.Id}, (res) => { getActiveTypeList() {
            if (res.data.resultCode === 1) { this.apipostDS("/api/Education/GetCommerceActivityTypeList", {}, (res) => {
              this.ActivityTitle=res.data.data.ActivityTitleList if (res.data.resultCode === 1) {
            }  this.activityTypeList = res.data.data;
          }) this.activityTypeList.unshift({
      } Id: -1,
TypeName: "不限"
})
}
})
},
//活动基础数据
getactivedata(val) {
this.activeBaseData = val
}
} }
} }
......
src/pages/activity/activityList.vue
View file @ efcb8f71
...@@ -175,12 +175,6 @@ ...@@ -175,12 +175,6 @@
emit-value map-options label="状态" @change="resetSearch"/> emit-value map-options label="状态" @change="resetSearch"/>
</div> </div>
</div> </div>
<!-- <div class="col row wrap q-mr-lg q-col-gutter-md">
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md">
</div> -->
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
...@@ -253,8 +247,8 @@ ...@@ -253,8 +247,8 @@
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<div> <div>
<q-btn flat size="xs" icon="edit" <!-- <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="编辑" @click="editQuotation(props.row)" /> color="accent" style="font-weight:400" label="编辑" @click="editQuotation(props.row)" /> -->
<!-- <q-btn flat size="xs" icon="edit" <!-- <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="删除" @click="delActive(props.row)" /> --> 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;">
...@@ -302,33 +296,8 @@ ...@@ -302,33 +296,8 @@
</q-table> </q-table>
</div> </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> </ActiveForm> -->
<!-- 报名信息 -->
<!-- <el-dialog title="报名信息" :visible.sync="dialogTableVisible" width="1100px">
<el-table :data="joinData" style="width:100%;">
<el-table-column property="LinkMan" label="联系人" width="100"></el-table-column>
<el-table-column property="LinkTel" label="联系电话" width="120"></el-table-column>
<el-table-column property="PeopleNum" label="人数" width="60"></el-table-column>
<el-table-column property="Money" label="付款方式" width="180">
<template slot-scope="scope">
<span v-if="scope.row.PaymentWay==6">星星支付:{{scope.row.TotalPoint}}点</span>
<span v-if="scope.row.PaymentWay==1">现金支付:{{scope.row.Money}}元</span>
</template>
</el-table-column>
<el-table-column property="Remark" label="备注" width="150"></el-table-column>
<el-table-column property="PaymentTime" label="报名时间" width="200"></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<template v-if="scope.row.IsApplyForCancel==1">
<el-button size="mini" type="primary" @click="agreeApply(scope.row)">同意</el-button>
<el-button size="mini" type="danger" @click="jujueMsg(scope.row)">拒绝</el-button>
</template>
</template>
</el-table-column>
</el-table>
</el-dialog> -->
</div> </div>
</template> </template>
...@@ -355,7 +324,6 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -355,7 +324,6 @@ import ActiveForm from '../../components/activity/active-from'
rowsPerPage:10 rowsPerPage:10
}, },
pageCount: 0, pageCount: 0,
activityTypeList:[],
statusOpts:[ statusOpts:[
{ {
label: "全部", label: "全部",
...@@ -451,7 +419,6 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -451,7 +419,6 @@ import ActiveForm from '../../components/activity/active-from'
mounted() { mounted() {
this.getList(); this.getList();
this.getActiveTypeList();
}, },
methods: { methods: {
// getItem(item) { // getItem(item) {
...@@ -460,18 +427,7 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -460,18 +427,7 @@ import ActiveForm from '../../components/activity/active-from'
// }, // },
//获取活动类型下拉
getActiveTypeList(){
this.apipostDS("/api/Education/GetCommerceActivityTypeList",{},(res)=>{
if(res.data.resultCode===1){
this.activityTypeList = res.data.data;
this.activityTypeList.unshift({
Id:-1,
TypeName:"不限"
})
}
})
},
getList(){ getList(){
this.loading = true; this.loading = true;
this.apipostDS("/api/Education/GetActivityPage",this.msg,(res)=>{ this.apipostDS("/api/Education/GetActivityPage",this.msg,(res)=>{
......
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