Skip to content

A
Athena
Commit 69b79802 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent f3348843
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 114 deletions
src/components/Ticket/FillItinerary.vue
View file @ 69b79802
......@@ -75,19 +75,19 @@
</p>
<p style="font-size:12px;padding-top:20px">
<span>票价</span>
<span style="float:right;color:#FF680B;font-size:20px">￥{{personNum.preferPrice | priceFormat }}</span>
<span style="float:right;color:#FF680B;font-size:20px">￥{{personNum.PreferPrice | priceFormat }}</span>
</p>
<P style="font-size:12px;margin-top:12px">
成人票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.manNum}}</span>
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.ManNum}}</span>
</P>
<P style="font-size:12px;">
儿童票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.chirdNum}}</span>
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.ChirdNum}}</span>
</P>
<P style="font-size:12px;">
老人票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.oldPeopleNum}}</span>
<span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.OldPeopleNum}}</span>
</P>
</div>
......@@ -102,26 +102,26 @@
乘机人信息
</div>
<div v-show="!personnums" class="person_num">
<span style="margin-left:25px">成人：{{personNum.manNum}}人</span>
<span>儿童：{{personNum.chirdNum}}人</span>
<span>婴儿：{{personNum.babyNum}}人</span>
<span>老人：{{personNum.oldPeopleNum}}人</span>
<span style="margin-left:25px">成人：{{personNum.ManNum}}人</span>
<span>儿童：{{personNum.ChirdNum}}人</span>
<span>婴儿：{{personNum.BabyNum}}人</span>
<span>老人：{{personNum.OldPeopleNum}}人</span>
<el-button @click="personnums=true" size="mini" style="background:#EE4454;color:#fff;">修改人数</el-button>
</div>
<div class="personnum" v-show="personnums">
<el-form class="personnum_form" :model="personNum" label-width="60px">
<el-form-item label="成人：">
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.ManNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="儿童：">
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.ChirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="婴儿：">
<el-input-number size="mini" v-model="personNum.babyNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number size="mini" v-model="personNum.BabyNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="老人：">
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number @change="PersonNumChange" size="mini" v-model="personNum.OldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item>
<el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button>
......@@ -134,15 +134,15 @@
</div>
<div style="position:absolute;right:5px;top:8px">
<span>专员：</span>
<el-select size="mini" style="width:100px" v-model="personNum.enterID" filterable placeholder="请选择专员">
<el-select size="mini" style="width:100px" v-model="personNum.EnterID" filterable placeholder="请选择专员">
<el-option v-for="item in SellInfoList" :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId"></el-option>
</el-select>
</div>
</div>
<el-form :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index">
<el-form :model="personNum" ref="personNumList" label-width="110px" class="demo-ruleForm">
<div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.GuestList" :key="index">
<el-col :span="4">
<div class="index">
<p>第<span style="font-weight:700;font-size:18px">{{index+1}}</span>位</p>
......@@ -156,38 +156,35 @@
</div>
</el-col>
<el-col class="formList" :span="20">
<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-form-item label="中文姓" :prop="'GuestList.'+index+'.SurName'" :rules="[{required: true, message: '姓不能为空', trigger: 'blur'}]">
<el-input size="small" v-model="item.SurName"></el-input>
</el-form-item>
<el-form-item label="护照信息" :prop="'guestList.'+index+'.passportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]">
<el-input size="small" v-model="item.passportNo"></el-input>
<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-form-item>
<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-form-item label="护照信息" :prop="'GuestList.'+index+'.PassportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]">
<el-input size="small" v-model="item.PassportNo"></el-input>
</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-input size="small" v-model="item.mobilePhone"></el-input>
<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-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-input size="small" v-model="item.MobilePhone"></el-input>
</el-form-item>
<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="请选择国籍">
<el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item>
<el-form-item label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group v-model="item.sex">
<el-form-item label="性别" :prop="'GuestList.'+index+'.Sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group v-model="item.Sex">
<el-radio label="1" value="1">男</el-radio>
<el-radio label="2" value="2">女</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="签证有效期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择签证有效期日期', trigger: 'change' }]">
<el-date-picker size="small"
v-model="item.value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</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>
</div>
</el-form>
......@@ -198,17 +195,17 @@
<div v-show="!personnums" class="lxr_info" style="margin-top:20px;background:#fff;">
<p class="lxr">联系人信息</p>
<el-form style="width:90%;margin:5px auto" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input size="small" v-model="personNum.contactName"></el-input>
<el-form-item label="联系人" prop="ContactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input size="small" v-model="personNum.ContactName"></el-input>
</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-input size="small" v-model="personNum.contactMobile"></el-input>
<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-input size="small" v-model="personNum.ContactMobile"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="contactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input size="small" v-model="personNum.contactEmail"></el-input>
<el-form-item label="邮箱" prop="ContactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input size="small" v-model="personNum.ContactEmail"></el-input>
</el-form-item>
<el-form-item style="width:99%" label="备注">
<el-input size="small" v-model="personNum.remarks"></el-input>
<el-input size="small" v-model="personNum.Remarks"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -221,7 +218,7 @@
<p class="total" style="margin-top:12px">
<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>
</p>
</div>
......@@ -240,16 +237,16 @@ export default {
return {
personnums:true,
personNum:{
manNum:0,
chirdNum:0,
babyNum:0,
oldPeopleNum:0,
guestList:[],
preferPrice:0,//应收总金额,
contactMobile:'',
contactEmail:'',
contactName:'',
enterID:0,
ManNum:0,
ChirdNum:0,
BabyNum:0,
OldPeopleNum:0,
GuestList:[],
PreferPrice:0,//应收总金额,
ContactMobile:'',
ContactEmail:'',
ContactName:'',
EnterID:0,
},
AirTicketId:this.$route.params.id,
ruleForm:{},
......@@ -268,7 +265,7 @@ export default {
},
methods: {
PersonNumChange(){
if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.residue){
if(this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum>this.getlistSigel.residue){
this.Error("票数不够！");
}
},
......@@ -306,101 +303,123 @@ export default {
},
// 确认订单人数
ConfirmedPersonNum(){
if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.residue){
if(this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum>this.getlistSigel.residue){
this.Error("票数不够！");
return;
}
if(this.personNum.manNum==0 && this.personNum.chirdNum==0 && this.personNum.oldPeopleNum==0){
if(this.personNum.ManNum==0 && this.personNum.ChirdNum==0 && this.personNum.OldPeopleNum==0){
this.$message.error("乘机人数至少1人！")
return;
}
this.$refs.personNum.resetFields();
this.personNum.guestNum=this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum+this.personNum.babyNum;
this.personNum.seatNum=this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum;
this.personNum.preferPrice=this.personNum.seatNum*this.getlistSigel.scatterB2BPrice;
this.personNum.guestList=[];
this.personNum.GuestNum=this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum+this.personNum.BabyNum;
this.personNum.seatNum=this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum;
this.personNum.PreferPrice=this.personNum.seatNum*this.getlistSigel.scatterB2BPrice;
this.personNum.GuestList=[];
// 成年
for(let i=0;i<this.personNum.manNum;i++){
for(let i=0;i<this.personNum.ManNum;i++){
let info={
ageType:'1',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
birthday:'',//出生日期
mobilePhone:'',
eName:'',
name:"",
nationality:2,
passportNo:"",//护照号码
sex:'',
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
Name:"",
Nationality:2,
PassportNo:"",//护照号码
Sex:'',
PassportExpiry:"",
}
this.personNum.guestList.push(info);
this.personNum.GuestList.push(info);
}
// 小孩
for(let i=0;i<this.personNum.chirdNum;i++){
for(let i=0;i<this.personNum.ChirdNum;i++){
let info={
ageType:'2',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
birthday:'',//出生日期
mobilePhone:'',
name:"",
nationality:2,
passportNo:"",//护照号码
sex:'',
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
Name:"",
Nationality:2,
PassportNo:"",//护照号码
Sex:'',
PassportExpiry:"",
}
this.personNum.guestList.push(info);
this.personNum.GuestList.push(info);
}
// 3婴儿
for(let i=0;i<this.personNum.babyNum;i++){
for(let i=0;i<this.personNum.BabyNum;i++){
let info={
ageType:'3',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
airProductId:'',//机票产品id
birthday:'',//出生日期
mobilePhone:'',
name:"",
nationality:2,
passportNo:"",//护照号码
sex:'',
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
Name:"",
Nationality:2,
PassportNo:"",//护照号码
Sex:'',
PassportExpiry:"",
}
this.personNum.guestList.push(info);
this.personNum.GuestList.push(info);
}
// 4老人
for(let i=0;i<this.personNum.oldPeopleNum;i++){
for(let i=0;i<this.personNum.OldPeopleNum;i++){
let info={
ageType:'4',//1 成年 2小孩 3婴儿 4老人
airOrderId:this.personNum.airTicketId,//机票订单id
airProductId:this.personNum.airProductId,//机票产品id
airProductId:'',//机票产品id
birthday:'',//出生日期
mobilePhone:'',
name:"",
nationality:2,
passportNo:"",//护照号码
sex:'',
Birthday:'',//出生日期
MobilePhone:'',
SurName:'',
Name:"",
Nationality:2,
PassportNo:"",//护照号码
Sex:'',
PassportExpiry:"",
}
this.personNum.guestList.push(info);
this.personNum.GuestList.push(info);
}
this.personnums=false;
},
submitForm(addMsg) {
this.$refs[addMsg].validate((valid) => {
let status1=false;
let status2=false;
this.$refs.personNumList.validate((valid) => {
if(valid) {
status1=true;
} else {
return;
}
});
this.$refs.personNumList.validate((valid) => {
if(valid) {
this.personNum.customerId=this.userInfo.accountId;
this.apiJavaPost('/api/dmc/airticket/SetB2BAirticketOrder',this.personNum,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
status2=true;
} else {
return;
}
});
if(status1&&status2){
this.personNum.CustomerId=this.userInfo.accountId;
this.personNum.PlaceOrderFrom=1;
this.apipost(
"sellorder_post_SetOrderInfoForAirTicket", this.personNum,
res => {
if (res.data.resultCode == 1) {
this.personNum={};
this.$router.push({
name: "Pay",
......@@ -408,18 +427,31 @@ export default {
id: res.data.data,
}
});
// this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
}else{
this.$message.error(res.data.message)
}else{
this.$message.error(res.data.message)
}
},
err => {
}
);
// this.apiJavaPost('sellorder_post_SetOrderInfoForAirTicket',res=>{
// if(res.data.resultCode==1){
// this.$message.success(res.data.message);
// this.personNum={};
// this.$router.push({
// name: "Pay",
// query: {
// id: res.data.data,
// }
// });
// // this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
// }else{
// this.$message.error(res.data.message)
// }
},null)
} else {
return false;
}
});
// },null)
}
},
// 服务专员
......@@ -429,7 +461,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.SellInfoList = res.data.data;
this.personNum.enterID=this.SellInfoList[0].EmployeeId;
this.personNum.EnterID=this.SellInfoList[0].EmployeeId;
}
else if (res.data.resultCode == 10000 || res.data.resultCode==10001){
this.Error(res.data.message);
......
src/components/global/newHead.vue
View file @ 69b79802
......@@ -78,7 +78,7 @@
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '9-1')">定制游</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('integral')">我的积分</el-dropdown-item>
<!-- <el-dropdown-item @click.native="goUrl('integral')">我的积分</el-dropdown-item> -->
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '5')">我的优惠券</el-dropdown-item>
<!-- <el-dropdown-item @click.native="">我的奖品</el-dropdown-item>
<el-dropdown-item @click.native="">活动中心</el-dropdown-item> -->
......
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @ 69b79802
......@@ -103,7 +103,7 @@
<span v-if="scope.row.status==3">待付款</span>
</p>
</div>
<p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p>
<!-- <p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p> -->
</template>
</el-table-column>
......
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 69b79802
......@@ -82,7 +82,7 @@
<el-menu-item index="3-3" @click="clickMenu('3-3')">实名认证</el-menu-item>
<el-menu-item index="3-4" @click="clickMenu('3-4')">收货地址管理</el-menu-item>
</el-submenu>
<el-submenu index="4">
<!-- <el-submenu index="4">
<template slot="title">
<i class="iconfont icon-gerenxinxiicon"></i>
<span>我的积分</span>
......@@ -90,7 +90,7 @@
<el-menu-item index="4-1" @click="goUrl('integral')">积分首页</el-menu-item>
<el-menu-item index="4-2" @click="goUrl('IntegralDetail')">积分明细</el-menu-item>
<el-menu-item index="4-3" @click="clickMenu('4-3')">我的兑换</el-menu-item>
</el-submenu>
</el-submenu> -->
<el-menu-item index="5" @click="clickMenu('5')">
<i class="iconfont icon-youhuiquanicon"></i>
<span>我的优惠券</span>
......
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