Skip to content

S
SuperMan
Commit 570ad2e9 authored by 王悦's avatar 王悦
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 9af5d8c3 8508ac43
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 147 deletions
src/assets/common/lang/zh.js
View file @ 570ad2e9
......@@ -615,6 +615,7 @@ export const visa = {
v_weibangding:'未绑定',
v_chulizhong:'处理中',
v_lvkebianma:'旅客编码',
v_chaifenzhuangtai:'拆分状态',
}
export const advmanager = {
v_all:'全部',
......
src/components/SalesVisa/OrderSplitting.vue
View file @ 570ad2e9
......@@ -16,7 +16,7 @@
<template>
<div class="wrapper">
<div class="_vad_top clearfix">
<!-- <el-button @click="OrderSplit" style="float:right;background:#E95252;color:#fff" size="mini">拆分</el-button> -->
<el-button @click="OrderSplit" style="float:right;background:#E95252;color:#fff" size="mini">拆分</el-button>
<!-- <span class="_num PingFangSC">{{$t('visa.v_tuan')}}：{{num}}</span>
<div class="fr">
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
......@@ -41,6 +41,7 @@
<th>{{$t('visa.v_ziliaowanshan')}}</th>
<th>{{$t('visa.v_visaType')}}</th>
<th>{{$t('visa.v_qianzhengst')}}</th>
<th>{{$t('visa.v_chaifenzhuangtai')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<!-- <th>{{$t('hotel.table_operat')}}</th> -->
</tr>
......@@ -64,6 +65,10 @@
<img v-if="item.ApplyStatus==1" src="../../assets/img/pass@2x.png" alt="">
<img v-if="item.ApplyStatus==2" src="../../assets/img/fail@2x.png" alt="">
</td>
<td>
<span v-if="item.IsSplit==1">未拆分</span>
<span v-else>已拆分</span>
</td>
<td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td>
<!-- <td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i></td> -->
</tr>
......@@ -79,7 +84,7 @@ export default {
return {
id:0,
num:0,
VisaManagementList:[],
// VisaManagementList:[],
dataList:[],
checkList:[],
checkListAll:[],
......@@ -101,6 +106,10 @@ export default {
Name:'拒签'
},
],
orderSplitInfo:{
OrderId:0,
GuestIdStr:[],
},
}
},
watch:{},
......@@ -108,6 +117,17 @@ export default {
methods:{
// 订单拆分
OrderSplit(){
this.orderSplitInfo.GuestIdStr=this.checkList;
this.apipost('dmc_post_SetGuestSplitVisaInfo',this.orderSplitInfo,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
this.getData()
this.checkList=[];
this.checkd = false;
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
......@@ -117,6 +137,7 @@ export default {
return
}
this.checkd = false
},
checkAll(){ //全选
if(this.checkList.length==this.checkListAll.length){
......@@ -125,25 +146,24 @@ export default {
}
this.checkList = this.checkListAll
},
getVisaManagementList(){ // 获取签证管理
this.apipost('dmc_get_visa_GetVisaManagementList',{Status:0,BranchId:-1,SignStatus:0},res=>{
if(res.data.resultCode==1){
this.VisaManagementList = res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
// getVisaManagementList(){ // 获取签证管理
// this.apipost('dmc_get_visa_GetVisaManagementList',{Status:0,BranchId:-1,SignStatus:0},res=>{
// if(res.data.resultCode==1){
// this.VisaManagementList = res.data.data
// }else{
// this.$message.error(res.data.message)
// }
// },err=>{})
// },
getData(){ //获取数据
this.loading = true
this.checkListAll=[]
this.apipost('dmc_get_GetTCGuestSplitList',{OrderId:this.id},res=>{
console.log("res",res);
// console.log("res",res);
if(res.data.resultCode==1){
this.dataList = res.data.data
this.dataList.forEach(x=>{
if(x.IsSplit==
1){
if(x.IsSplit==1){
this.checkListAll.push(x.Id)
}
})
......@@ -158,7 +178,8 @@ export default {
mounted(){
this.id = this.$route.query.id
this.num = this.$route.query.num
this.getVisaManagementList()
this.orderSplitInfo.OrderId=this.$route.query.id;
// this.getVisaManagementList()
this.getData()
}
}
......
src/components/SalesVisa/TravelpassengerList.vue
View file @ 570ad2e9
......@@ -77,7 +77,7 @@ export default {
return {
//请求数据
msg: {
VisaPlanId: 0
OrderId: 0
},
dataList: [],
loading: true
......@@ -98,7 +98,7 @@ export default {
getList() {
this.loading = true;
this.apipost(
"dmc_get_visa_GetVisaOrderGuestList",
"dmc_get_visa_GetVisaOrderGuestListForOrder",
this.msg,
res => {
this.loading = false;
......@@ -111,7 +111,7 @@ export default {
}
},
mounted() {
this.msg.VisaPlanId = this.$route.query.id;
this.msg.OrderId = this.$route.query.id;
this.getList();
}
};
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 570ad2e9
......@@ -83,7 +83,7 @@
</style>
<template>
<div class="page_MyCustomer">
<div v-show="nameShow" style="width:220px; color: #333; margin-top: 20px; text-align: center; line-height: 34px;font-size: 14px; font-weight: bold; height:34px;background:rgba(212,212,212,1);border:1px solid rgba(210,210,210,1);border-radius:4px;">{{visaProduct}}</div>
<div v-show="nameShow" style="display:inline-block;padding:0 6px;color: #333; margin-top: 20px; text-align: center; line-height: 34px;font-size: 14px; font-weight: bold; height:34px;background:rgba(212,212,212,1);border:1px solid rgba(210,210,210,1);border-radius:4px;">{{visaProduct}}</div>
<div class="query-box" style="border:none">
<ul>
<li v-if="isShow==0">
......@@ -189,7 +189,7 @@
<td colspan="12" class="RL_Order" style="height:40px;">
<span class="VO-remarkTitle">名单:</span>
<span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0">
<span v-for="(childItem) in item.GuestList" style="margin-right:10px;" @click="goUrl2('VisapassengerList',item.VisaPlanId,'旅客名单')">{{childItem.userName}}</span>
<span v-for="(childItem) in item.GuestList" style="margin-right:10px;" @click="goUrl2('VisapassengerList',item.Id,'旅客名单')">{{childItem.userName}}</span>
</span>
<span class="VO-redType VO-remarkCon" v-else>
<span>暂无名单</span>
......@@ -261,7 +261,13 @@ export default {
}
},methods:{
goUrlVisaList(obj){
this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} })
if(obj.VisaPlanIdStr=="" || obj.VisaPlanIdStr==null){
this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} })
}else{
this.$router.push({ name: 'visaList2',query:{"VisaPlanIdStr":obj.VisaPlanIdStr,blank:'y',tab:'签证详情'} })
}
},
goUrl2(path, id, name) {
this.$router.push({
......
src/components/Ticketing/flightChild.vue
View file @ 570ad2e9
This diff is collapsed.
src/components/VisaCenter/visaList2.vue
View file @ 570ad2e9
......@@ -263,7 +263,8 @@ export default {
// }
},
}
},methods:{
},
methods:{
downLoadAllInfo(id){ // 下载全部资料
this.loading2 = true
this.apipost('dmc_get_VisaMergingDownload',{VisaPlanId:id},res=>{
......@@ -495,7 +496,9 @@ export default {
},mounted(){
this.msg.VisaProductId = this.$route.query.id===undefined?'0':this.$route.query.id
this.msg.TCID = this.$route.query.tcid===undefined?'0':this.$route.query.tcid
this.msg.VisaPlanId = this.$route.query.visaPlanId===undefined?'0':this.$route.query.visaPlanId
this.msg.VisaPlanId = this.$route.query.visaPlanId===undefined?'0':this.$route.query.visaPlanId;
this.msg.VisaPlanIdStr = this.$route.query.VisaPlanIdStr===undefined?'0':this.$route.query.VisaPlanIdStr;
this.getList()
this.getVisaManagementList()
}
......
src/components/confirmationOrderDownLoad.vue
View file @ 570ad2e9
......@@ -161,7 +161,7 @@
<td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="100">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].OutNotice==1)?"正常":"暂定"}})</td>
<td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
</tr>
</tbody>
<tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0">
......@@ -173,7 +173,7 @@
<td>{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="100">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].OutNotice==1)?"正常":"暂定"}})</td>
<td width="110">{{flight.flightNumber}}({{(priceList.length>0&&priceList[0].outNotice==1)?"OK":"暂定"}})</td>
</tr>
</tbody>
<tbody v-else>
......
src/router/config.js
View file @ 570ad2e9
......@@ -2526,7 +2526,7 @@ export default {
title: '签证产品下单'
},
},
{ // 销售 签证产品下单
{ // 签证 签证产品下单
path: '/VisaProductOrder',
name: 'VisaProductOrder',
component: resolve => require(['@/components/SalesVisa/VisaProductOrder'], resolve),
......
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