Skip to content

S
SuperMan
Commit c5b647e3 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

行程订单

parent 445500f3
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 35 deletions
src/components/TravelManager/TravelList/SalesTravelCoupomList.vue
View file @ c5b647e3
...@@ -25,23 +25,32 @@ ...@@ -25,23 +25,32 @@
<input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/> <input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/>
</div> </div>
<el-form class="choose_form" ref="form" :model="form" label-width="80px"> <el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="处理状态"> <el-form-item label="订单信息">
<el-select v-model="form.dealStatus" placeholder="请选择平台"> <el-select v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="未分配" :value="1"></el-option> <el-option label="已提交" :value="1"></el-option>
<el-option label="处理中" :value="2"></el-option> <el-option label="方案设计" :value="2"></el-option>
<el-option label="处理完成" :value="3"></el-option> <el-option label="合同签订" :value="3"></el-option>
<el-option label="处理失败" :value="4"></el-option> <el-option label="下单" :value="4"></el-option>
<el-option label="已成团" :value="5"></el-option>
<el-option label="已关团" :value="6"></el-option>
<el-option label="已取消" :value="7"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="开始时间"> <el-form-item label="创建日期">
<el-date-picker class="w150" type="date" v-model="form.searchStartDate" <el-date-picker class="w150" type="date" v-model="form.searchStartDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item> <span> - </span>
<el-form-item label="结束时间">
<el-date-picker class="w150" type="date" v-model="form.searchEndDate" <el-date-picker class="w150" type="date" v-model="form.searchEndDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="出发日期">
<el-date-picker class="w150" type="date" v-model="form.startDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="返回日期">
<el-date-picker class="w150" type="date" v-model="form.backDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="需要提供"> <el-form-item label="需要提供">
<el-input <el-input
...@@ -63,39 +72,45 @@ ...@@ -63,39 +72,45 @@
<tr> <tr>
<th>出发地</th> <th>出发地</th>
<th>目的地</th> <th>目的地</th>
<th>出发日期</th>
<th>人数</th> <th>人数</th>
<th>人均估算</th> <th>人均估算</th>
<th>需要提供</th> <th>需要提供</th>
<th>分配销售</th> <th>订单状态</th>
<th>处理状态</th> <th>出发日期</th>
<th>处理日期</th> <th>返回日期</th>
<th>创建日期</th> <th>销售数量</th>
<th>方案数量</th>
<th>创建日期</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'> <tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
<td>{{item.departureName}}</td> <td>{{item.departureName}}</td>
<td>{{item.destinationNames}}</td> <td>{{item.destinationNames}}</td>
<td>{{item.startDate | YearMD}}</td>
<td> <td>
<span v-if="item.audltNumber>0">成人：{{item.audltNumber}}</span> <span v-if="item.audltNumber>0">成人：{{item.audltNumber}}</span>
<span v-if="item.childrenNumber>0">儿童：{{item.childrenNumber}}</span> <span v-if="item.childrenNumber>0">儿童：{{item.childrenNumber}}</span>
</td> </td>
<td>{{item.budget}}</td> <td>{{item.budget}}</td>
<td>{{item.provideItem}}</td> <td>{{item.provideItem}}</td>
<td>{{item.salesName}}</td>
<td> <td>
<span v-if="item.dealStatus==1">未分配</span> <span v-if="item.orderStatus==1">已提交</span>
<span v-if="item.dealStatus==2">处理中</span> <span v-if="item.orderStatus==2">方案设计</span>
<span v-if="item.dealStatus==3">处理完成</span> <span v-if="item.orderStatus==3">合同签订</span>
<span v-if="item.dealStatus==4">处理失败</span> <span v-if="item.orderStatus==4">下单</span>
</td> <span v-if="item.orderStatus==5">已成团</span>
<td>{{item.dealDate | YearMD}}</td> <span v-if="item.orderStatus==6">已关团</span>
<td>{{item.createDate | YearMD}}</td> <span v-if="item.orderStatus==7">已取消</span>
</td>
<td>{{item.startDate | YearMD}}</td>
<td>{{item.backDate | YearMD}}</td>
<td>{{item.salesCount}}</td>
<td>{{item.planCount}}</td>
<td>{{item.createDate | YearMD}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="处理信息" placement="top"> <el-tooltip class="item" effect="dark" content="查看行程方案" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="Visible=true,Deal(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="Gourl('SalesTravelCoupomPlanList',item)"></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -137,11 +152,14 @@ import moment from "moment" ...@@ -137,11 +152,14 @@ import moment from "moment"
data() { data() {
return { return {
form:{ form:{
dealStatus:-1, orderStatus:-1,
searchStartDate:"", searchStartDate:"",
searchEndDate:"", searchEndDate:"",
pageIndex:1, pageIndex:1,
pageSize:15 pageSize:15,
startDate:"",
backDate:"",
provideItem:"",
}, },
Visible:false, Visible:false,
total:0, total:0,
...@@ -187,6 +205,18 @@ import moment from "moment" ...@@ -187,6 +205,18 @@ import moment from "moment"
}, },
methods: { methods: {
Gourl(path,item){
console.log(item);
this.$router.push({
name: path,
query: {
customId: item.customId,
blank: "y",
tab: "行程定制方案"
}
});
},
Deal(item){ Deal(item){
this.pwdMsg.customId=item.customId; this.pwdMsg.customId=item.customId;
...@@ -209,6 +239,7 @@ import moment from "moment" ...@@ -209,6 +239,7 @@ import moment from "moment"
getList() { //获取数据 getList() { //获取数据
this.loading=true, this.loading=true,
this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomList",this.form, res => { this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomList",this.form, res => {
console.log("res",res);
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
......
src/components/activity/TravelInfoList.vue
View file @ c5b647e3
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
.TravelInfoList .info_details p{ .TravelInfoList .info_details p{
padding:4px 0; padding:4px 0;
} }
.TravelInfoList .icon_td .iconfont{
font-size: 14px;
}
</style> </style>
<template> <template>
<div class="TravelInfoList flexOne"> <div class="TravelInfoList flexOne">
...@@ -106,12 +109,15 @@ ...@@ -106,12 +109,15 @@
<td>{{item.salesCount}}</td> <td>{{item.salesCount}}</td>
<td>{{item.planCount}}</td> <td>{{item.planCount}}</td>
<td>{{item.createDate | YearMD}}</td> <td>{{item.createDate | YearMD}}</td>
<td> <td class="icon_td">
<el-tooltip class="item" effect="dark" content="查看详情" placement="top"> <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<el-button type="success" icon="el-icon-star-off" circle @click="travel=true,GetDes(item)"></el-button> <el-button type="success" icon="el-icon-star-off" circle @click="travel=true,GetDes(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="查看方案" placement="top">
<el-button type="primary" icon="iconfont icon-nav-xiaoshou" circle @click="Gourl('TravelCoupomPlanList',item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="分配销售" placement="top"> <el-tooltip class="item" effect="dark" content="分配销售" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="Gourl(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="Gourl('TravelInfoSalesList',item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button> <el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
...@@ -249,13 +255,12 @@ import moment from "moment" ...@@ -249,13 +255,12 @@ import moment from "moment"
}, },
methods: { methods: {
Gourl(item){ Gourl(path,item){
this.$router.push({ this.$router.push({
name: 'TravelInfoSalesList', name:path,
query: { query: {
customId: item.customId, customId: item.customId,
blank: "y", blank: "y"
tab: "行程定制分配销售"
} }
}); });
......
src/router/config.js
View file @ c5b647e3
...@@ -1514,6 +1514,14 @@ export default { ...@@ -1514,6 +1514,14 @@ export default {
title: '行程定制信息' title: '行程定制信息'
}, },
}, },
{
path: '/SalesTravelCoupomPlanList',
name: 'SalesTravelCoupomPlanList',
component: resolve => require(['@/components/TravelManager/TravelList/SalesTravelCoupomPlanList'], resolve),
meta: {
title: '行程定制方案'
},
},
{ {
path: '/priceIncomeConfirmInfo', ///priceIncomeConfirmInfo path: '/priceIncomeConfirmInfo', ///priceIncomeConfirmInfo
...@@ -3102,6 +3110,14 @@ export default { ...@@ -3102,6 +3110,14 @@ export default {
title: '行程定制分配销售' title: '行程定制分配销售'
} }
}, },
{
path: '/TravelCoupomPlanList',
name: 'TravelCoupomPlanList',
component: resolve => require(['@/components/activity/TravelCoupomPlanList'], resolve),
meta: {
title: '定制方案'
}
},
{ {
path: '/RegimentLabel', path: '/RegimentLabel',
name: 'RegimentLabel', name: 'RegimentLabel',
......
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