Skip to content

A
Athena
Commit 57b48df1 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent 36a1f833
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 56 deletions
src/components/Ticket/FillItinerary.vue
View file @ 57b48df1
...@@ -162,14 +162,18 @@ ...@@ -162,14 +162,18 @@
<el-form-item label="中文名" :prop="'GuestList.'+index+'.Name'" :rules="[{required: true, message: '名不能为空', trigger: 'blur'}]"> <el-form-item label="中文名" :prop="'GuestList.'+index+'.Name'" :rules="[{required: true, message: '名不能为空', trigger: 'blur'}]">
<el-input size="small" v-model="item.Name"></el-input> <el-input size="small" v-model="item.Name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="护照信息" :prop="'GuestList.'+index+'.PassportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]"> <el-form-item label="手机号" :prop="'GuestList.'+index+'.MobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'},{ required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/ ,message: '请填写正确的手机号'}]">
<el-input size="small" v-model="item.PassportNo"></el-input> <el-input size="small" v-model="item.MobilePhone"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出生日期" :prop="'GuestList.'+index+'.Birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]"> <el-form-item label="出生日期" :prop="'GuestList.'+index+'.Birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.Birthday" style="width: 100%;"></el-date-picker> <el-date-picker size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.Birthday" style="width: 100%;"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="手机号" :prop="'GuestList.'+index+'.MobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'},{ required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8][0-9]\d{8}$/ ,message: '请填写正确的手机号'}]"> <el-form-item label="护照信息" :prop="'GuestList.'+index+'.PassportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]">
<el-input size="small" v-model="item.MobilePhone"></el-input> <el-input size="small" v-model="item.PassportNo"></el-input>
</el-form-item>
<el-form-item label="护照过期时间" :prop="'GuestList.'+index+'.PassportExpiry'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.PassportExpiry" style="width: 100%;"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="国籍"> <el-form-item label="国籍">
<el-select style="width:100%" size="small" v-model="item.Nationality" filterable placeholder="请选择国籍"> <el-select style="width:100%" size="small" v-model="item.Nationality" filterable placeholder="请选择国籍">
...@@ -182,9 +186,7 @@ ...@@ -182,9 +186,7 @@
<el-radio label="2" value="2">女</el-radio> <el-radio label="2" value="2">女</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="护照过期时间" :prop="'GuestList.'+index+'.PassportExpiry'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.PassportExpiry" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col> </el-col>
</div> </div>
</el-form> </el-form>
...@@ -198,7 +200,7 @@ ...@@ -198,7 +200,7 @@
<el-form-item label="联系人" prop="ContactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }"> <el-form-item label="联系人" prop="ContactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input size="small" v-model="personNum.ContactName"></el-input> <el-input size="small" v-model="personNum.ContactName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="ContactMobile" :rules="[{ required: true, message: '请输入联系电话', trigger: 'blur' },{ required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8][0-9]\d{8}$/ ,message: '请填写正确的手机号'}]"> <el-form-item label="手机号" prop="ContactMobile" :rules="[{ required: true, message: '请输入联系电话', trigger: 'blur' },{ required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/ ,message: '请填写正确的手机号'}]">
<el-input size="small" v-model="personNum.ContactMobile"></el-input> <el-input size="small" v-model="personNum.ContactMobile"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮箱" prop="ContactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]"> <el-form-item label="邮箱" prop="ContactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
...@@ -219,7 +221,7 @@ ...@@ -219,7 +221,7 @@
<p class="total" style="margin-top:12px"> <p class="total" style="margin-top:12px">
<span>总价</span> <span>总价</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.PreferPrice| priceFormat}}</span> <span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.PreferPrice| priceFormat}}</span>
<span @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">同意以上协议条款，提交订单</span> <span :loading="submitLoad" @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">同意以上协议条款，提交订单</span>
</p> </p>
</div> </div>
...@@ -235,6 +237,7 @@ export default { ...@@ -235,6 +237,7 @@ export default {
}, },
data () { data () {
return { return {
submitLoad:false,
personnums:true, personnums:true,
personNum:{ personNum:{
ManNum:0, ManNum:0,
...@@ -287,7 +290,6 @@ export default { ...@@ -287,7 +290,6 @@ export default {
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{ this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getlistSigel=res.data.data; this.getlistSigel=res.data.data;
console.log("this.getlistSigel",this.getlistSigel)
this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum; this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
this.flightList=this.getlistSigel.flightList; this.flightList=this.getlistSigel.flightList;
...@@ -427,11 +429,14 @@ export default { ...@@ -427,11 +429,14 @@ export default {
} }
}); });
if(status1&&status2){ if(status1&&status2){
this.submitLoad=true;
this.personNum.CustomerId=this.userInfo.customerId; this.personNum.CustomerId=this.userInfo.customerId;
this.personNum.PlaceOrderFrom=1; this.personNum.PlaceOrderFrom=1;
this.apipost( this.apipost(
"sellorder_post_SetOrderInfoForAirTicket", this.personNum, "sellorder_post_SetOrderInfoForAirTicket", this.personNum,
res => { res => {
this.submitLoad=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.personNum={}; this.personNum={};
this.$router.push({ this.$router.push({
......
src/components/Ticket/Pay.vue
View file @ 57b48df1
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<div style="margin-left:50px"> <div style="margin-left:50px">
<p style="font-size:14px;font-weight:600"> <p style="font-size:14px;font-weight:600">
订单提交成功！剩余支付时间 订单提交成功！
<span style="color:#FF680B;font-size:18px">{{time_15}}</span> <!-- <span style="color:#FF680B;font-size:18px">剩余支付时间{{time_15}}</span> -->
</p> </p>
<p style="font-size:12px">请您在 <p style="font-size:12px">请您在
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<p style="font-size:24px;color:#333;font-weight:700">订单支付成功！</p> <p style="font-size:24px;color:#333;font-weight:700">订单支付成功！</p>
<!-- <p v-if="!payok" style="font-size:24px;color:#333;font-weight:700">订单支付失败！</p> --> <!-- <p v-if="!payok" style="font-size:24px;color:#333;font-weight:700">订单支付失败！</p> -->
<p style="font-size:12px;color:#333">如有疑问 可致电028-565464646，点击 <p style="font-size:12px;color:#333">如有疑问 可致电028-565464646，点击
<router-link to="/AirlineTicketOrder" style="color:#ee4454;text-decoration:underline">查看订单>></router-link> <router-link to="/newPersonalCenter?key=8-1" style="color:#ee4454;text-decoration:underline">查看订单>></router-link>
</p> </p>
</div> </div>
</div> </div>
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
this.code.total_fee=this.Commoditydetails.preferPrice+''; this.code.total_fee=this.Commoditydetails.preferPrice+'';
this.code.body=this.Commoditydetails.description; this.code.body=this.Commoditydetails.description;
this.code.attach=`${this.Commoditydetails.costType}|${this.Commoditydetails.customerName}|${this.AirOrderId}|${this.Commoditydetails.customerId}|${this.Commoditydetails.outBranchId}` this.code.attach=`${this.Commoditydetails.costType}|${this.Commoditydetails.customerName}|${this.AirOrderId}|${this.Commoditydetails.customerId}|${this.Commoditydetails.outBranchId}`
this.Time15(); // this.Time15();
this.Code('3'); this.Code('3');
}else if (res.data.resultCode == 0){ }else if (res.data.resultCode == 0){
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
.pay_vue .head { .pay_vue .head {
padding: 4px 0; padding: 4px 0;
position: relative; position: relative;
overflow: auto; height: 40px;
} }
.payvue_content { .payvue_content {
min-height:479px; min-height:479px;
......
src/components/Ticket/TicketHome.vue
View file @ 57b48df1
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
<!-- <img src="../../assets/img/ticket/banner.png" alt=""> --> <!-- <img src="../../assets/img/ticket/banner.png" alt=""> -->
</div> </div>
<div class="yh" style="background:#fff"> <div class="yh" style="background:#fff">
<div @click="GoUrl(item)" v-for="(item,key) in yhList" :key="key" style="cursor:pointer"> <div v-if="key<8" @click="GoUrl(item)" v-for="(item,key) in yhList" :key="key" style="cursor:pointer">
<img :src="item.airlineUrl" alt=""> <img :src="item.airlineUrl" alt="">
<div class="list_content"> <div class="list_content">
<p class="des" style="padding-top:26px;"> <p class="des" style="padding-top:26px;">
......
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @ 57b48df1
<template> <template>
<div class="CustomizedList"> <div class="CustomizedList">
<el-form class="form" ref="form" :model="form" label-width="75px"> <!-- <el-form class="form" ref="form" :model="form" label-width="75px">
<el-form-item label="订单号"> <el-form-item label="订单号">
<el-input size="small" v-model="form.id" placeholder="请输入订单号"></el-input> <el-input size="small" v-model="form.id" placeholder="请输入订单号"></el-input>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<el-button @click="List" style="background:#EE4454;color:#fff" size="mini">查询</el-button> <el-button @click="List" style="background:#EE4454;color:#fff" size="mini">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form> -->
<el-row> <el-row>
<ul class="clearfix"> <ul class="clearfix">
<template v-for="item in TitList"> <template v-for="item in TitList">
...@@ -29,6 +29,17 @@ ...@@ -29,6 +29,17 @@
:class="{_active: activeName === item.ID}" :class="{_active: activeName === item.ID}"
>{{item.Type}}</li> >{{item.Type}}</li>
</template> </template>
<el-dropdown trigger="click" @command="handleCommandTwo">
<span class="el-dropdown-link">
{{dropTitTwo}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in dayList">
<el-dropdown-item :command="item" :key="item.Day">{{item.Day}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</ul> </ul>
<!-- <div class="changestatus"> <!-- <div class="changestatus">
<span :class="{'span_active':form.status==0}" @click="ChangeStatus(0)">全部订单</span> <span :class="{'span_active':form.status==0}" @click="ChangeStatus(0)">全部订单</span>
...@@ -38,26 +49,26 @@ ...@@ -38,26 +49,26 @@
</div> --> </div> -->
</el-row> </el-row>
<el-table :header-cell-style="getRowClass" <el-table :header-cell-style="getRowClass"
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
stripe stripe
style="width: 100%;box-sizing:border-box"> style="width: 100%;box-sizing:border-box">
<el-table-column <el-table-column
prop="id" prop="orderId"
label="订单ID"> label="订单ID">
</el-table-column> </el-table-column>
<el-table-column min-width="150px" <el-table-column min-width="150px"
label="机票信息"> label="机票信息">
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
<span v-if="scope.row.airModel.ticketType==2" class="ticket_num">往</span> <span v-if="scope.row.airticket.ticketType==2" class="ticket_num">往</span>
<span>{{scope.row.airModel.goStartCityName}}-{{scope.row.airModel.goEndCityName}}</span> <span>{{scope.row.airticket.goStartCityName}}-{{scope.row.airticket.goEndCityName}}</span>
<!-- --> <!-- -->
</p> </p>
<p v-if="scope.row.airModel.ticketType==2"> <p v-if="scope.row.airticket.ticketType==2">
<span class="ticket_num">返</span> <span class="ticket_num">返</span>
<span>{{scope.row.airModel.backStartCityName}}-{{scope.row.airModel.backEndCityName}}</span> <span>{{scope.row.airticket.backStartCityName}}-{{scope.row.airticket.backEndCityName}}</span>
<!-- --> <!-- -->
</p> </p>
</template> </template>
...@@ -66,9 +77,9 @@ ...@@ -66,9 +77,9 @@
label="旅客"> label="旅客">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" placement="bottom-start"> <el-tooltip class="item" effect="dark" placement="bottom-start">
<span slot="content" v-for="(guest,index) in scope.row.guestList" :key="guest.name">{{guest.name}}<span v-if="index<scope.row.guestList.length-1">、</span></span> <span slot="content" v-if="index<2" v-for="(guest,index) in scope.row.guestList" :key="index">{{guest.name}}<span v-if="index<scope.row.guestList.length-1">、</span></span>
<p style="cursor:pointer"> <p style="cursor:pointer">
<span v-for="(guest,index) in scope.row.guestList" :key="guest.name" > <span v-for="(guest,index) in scope.row.guestList" :key="index+100" >
<span v-if="index<3">{{guest.name}}<span v-if="index<scope.row.guestList.length-1">、</span> </span></span> <span v-if="index<3">{{guest.name}}<span v-if="index<scope.row.guestList.length-1">、</span> </span></span>
<span v-if="scope.row.guestList.length>2">等<span style="text-decoration:underline">{{scope.row.guestList.length}}人</span></span> <span v-if="scope.row.guestList.length>2">等<span style="text-decoration:underline">{{scope.row.guestList.length}}人</span></span>
</p> </p>
...@@ -80,7 +91,7 @@ ...@@ -80,7 +91,7 @@
label="行程信息"> label="行程信息">
<template slot-scope="scope"> <template slot-scope="scope">
<p> <p>
行程有效期：{{scope.row.airModel.goFlightTime}} {{scope.row.airModel.goStartHouseTime}} 行程有效期：{{scope.row.airticket.goFlightTime}} {{scope.row.airticket.goStartHouseTime}}
</p> </p>
<p> <p>
下单时间：{{scope.row.createTime}} 下单时间：{{scope.row.createTime}}
...@@ -92,7 +103,8 @@ ...@@ -92,7 +103,8 @@
label="付款信息"> label="付款信息">
<template slot-scope="scope"> <template slot-scope="scope">
<p>实付金额：￥{{scope.row.preferPrice | priceFormat}}</p> <p>总金额：￥{{scope.row.preferPrice | priceFormat}}</p>
<p>实付金额：￥{{scope.row.customerPayMoney | priceFormat}}</p>
<p>退款金额：￥{{scope.row.refund | priceFormat}}</p> <p>退款金额：￥{{scope.row.refund | priceFormat}}</p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -102,14 +114,14 @@ ...@@ -102,14 +114,14 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div style="cursor:pointer"> <div style="cursor:pointer">
<p v-if="scope.row.refundStatus!=1"> <!-- <p v-if="scope.row.refundStatus!=1">
<span v-if="scope.row.refundStatus==2">退款中</span> <span v-if="scope.row.refundStatus==2">退款中</span>
<span v-if="scope.row.refundStatus==3">已退款</span> <span v-if="scope.row.refundStatus==3">已退款</span>
</p> </p> -->
<p v-else> <p>
<span v-if="scope.row.status==1">正常</span> <span v-if="scope.row.orderState==1">待付款</span>
<span v-if="scope.row.status==2">取消</span> <span v-if="scope.row.orderState==2">正常</span>
<span v-if="scope.row.status==3">待付款</span> <span v-if="scope.row.orderState==3">取消</span>
</p> </p>
</div> </div>
<!-- <p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p> --> <!-- <p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p> -->
...@@ -119,11 +131,11 @@ ...@@ -119,11 +131,11 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-show="scope.row.status==3" <el-button v-show="scope.row.orderState==1"
size="mini" style="border:1px solid #EE4454;color:#EE4454" size="mini" style="border:1px solid #EE4454;color:#EE4454"
@click="handlePay(scope.$index, scope.row)">去付款</el-button> @click="handlePay(scope.$index, scope.row)">去付款</el-button>
<el-button v-show="scope.row.status==1 && scope.row.refundStatus==1" <!-- <el-button v-show="scope.row.status==1 && scope.row.refundStatus==1"
size="mini" @click="TuiKuan(scope.$index, scope.row)" type="primary">退款</el-button> size="mini" @click="TuiKuan(scope.$index, scope.row)" type="primary">退款</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -148,15 +160,15 @@ export default { ...@@ -148,15 +160,15 @@ export default {
ID: 0 ID: 0
}, },
{ {
Type: "正常", Type: "待付款",
ID: 1 ID: 1
}, },
{ {
Type: "取消", Type: "正常",
ID: 2 ID: 2
}, },
{ {
Type: "待付款", Type: "取消",
ID: 3 ID: 3
} }
], ],
...@@ -164,25 +176,55 @@ export default { ...@@ -164,25 +176,55 @@ export default {
provideItem:[], provideItem:[],
tableData:[], tableData:[],
form:{ form:{
id:'', // id:'',
status:0, // status:0,
startTime:'', // startTime:'',
endTime:'', // endTime:'',
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
time:[], // time:[],
queryDays:10,
orderState:0,
customerId:0,
}, },
loading:false, loading:false,
dropTitTwo: "10天内",
dayList: [
{
Day: "10天",
Number: 10,
ID: 1
},
{
Day: "30天",
Number: 30,
ID: 1
},
{
Day: "60天",
Number: 60,
ID: 1
}
],
} }
}, },
created(){
let userInfo=this.getLocalStorage()
this.form.customerId=userInfo.customerId;
},
mounted() { mounted() {
this.List(); this.List();
}, },
methods: { methods: {
handleCommandTwo(command) {
this.dropTitTwo = command.Day;
this.form.queryDays = command.Number;
this.List();
},
handleClick(item) { handleClick(item) {
this.activeName = item.ID; this.activeName = item.ID;
this.form.status = item.ID; this.form.orderState = item.ID;
this.List(); this.List();
}, },
handleCurrentChange(val){ handleCurrentChange(val){
...@@ -242,10 +284,11 @@ export default { ...@@ -242,10 +284,11 @@ export default {
this.List(); this.List();
}, },
handlePay(index,row){ handlePay(index,row){
this.$router.push({ this.$router.push({
name: "Pay", name: "Pay",
query: { query: {
id: row.id, id: row.orderId,
} }
}); });
}, },
...@@ -260,18 +303,19 @@ export default { ...@@ -260,18 +303,19 @@ export default {
}, },
List(){ List(){
this.loading=true; this.loading=true;
if(this.form.time){ // if(this.form.time){
this.form.startTime=this.form.time[0]; // this.form.startTime=this.form.time[0];
this.form.endTime=this.form.time[1]; // this.form.endTime=this.form.time[1];
}else{ // }else{
this.form.time=[]; // this.form.time=[];
this.form.startTime=""; // this.form.startTime="";
this.form.endTime=""; // this.form.endTime="";
} // }
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{ this.apiJavaPost('/api/b2b/user/getAirTicketOrder',this.form,res=>{
this.loading=false; this.loading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
console.log("this.tableData",this.tableData)
this.totalCount=res.data.data.count; this.totalCount=res.data.data.count;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
......
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