Skip to content

S
SuperMan
Commit b7d4eb8a authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 22fbe15a
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 36 deletions
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b7d4eb8a
...@@ -1060,7 +1060,6 @@ ...@@ -1060,7 +1060,6 @@
font-size: 12px; font-size: 12px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
} }
</style> </style>
<template> <template>
...@@ -1254,9 +1253,6 @@ ...@@ -1254,9 +1253,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay == 1"> <el-col :span="4" v-if="addMsg.TradeWay == 1">
<el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder"> <el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder">
<el-input v-model="addMsg.PlatformOrder" @input="platformOrderMethods" :disabled="isAllowUpdate == 0"> <el-input v-model="addMsg.PlatformOrder" @input="platformOrderMethods" :disabled="isAllowUpdate == 0">
...@@ -1437,7 +1433,7 @@ ...@@ -1437,7 +1433,7 @@
<el-col :span="4" v-else> <el-col :span="4" v-else>
<el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price"> <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price">
<el-input v-model="addMsg.Unit_Price" class="w210" <el-input v-model="addMsg.Unit_Price" class="w210"
@keyup.native=" checkPrice(addMsg, 'Unit_Price'); getTotalPrice();"></el-input> @keyup.native="checkPrice(addMsg, 'Unit_Price'); getTotalPrice();"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p style="line-height: 18px; color: #e95252"> <p style="line-height: 18px; color: #e95252">
...@@ -1846,7 +1842,7 @@ ...@@ -1846,7 +1842,7 @@
{{ $t("active.cl_orderType") }}：<span class="RL-redType">{{$t('leader.leader_leaderGuid')}}</span> {{ $t("active.cl_orderType") }}：<span class="RL-redType">{{$t('leader.leader_leaderGuid')}}</span>
</td> </td>
</tr> </tr>
<tbody v-for="(item, index) in OrderDataList.leadetList" :key="index"> <tbody v-for="(item, index) in OrderDataList.leadetList" :key="`o_l_`+index">
<tr> <tr>
<td rowspan="3"> <td rowspan="3">
<div class="fbold over_ellipsis" style="width: 120px; cursor: pointer" :title="item.OrderId"> <div class="fbold over_ellipsis" style="width: 120px; cursor: pointer" :title="item.OrderId">
...@@ -2058,8 +2054,8 @@ ...@@ -2058,8 +2054,8 @@
icon="iconfont icon-rizhi1"></el-button> icon="iconfont icon-rizhi1"></el-button>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" :content="$t('objFill.bianjixiaofei')" placement="top-start" <el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" :content="$t('objFill.bianjixiaofei')"
style="float: left"> placement="top-start" style="float: left">
<el-button @click="clickEditTip(item)" type="primary" <el-button @click="clickEditTip(item)" type="primary"
style="background-color: #00c6ff !important;border-color:#00c6ff !important;" style="background-color: #00c6ff !important;border-color:#00c6ff !important;"
icon="iconfont icon-bianji-smal"> icon="iconfont icon-bianji-smal">
...@@ -2130,7 +2126,9 @@ ...@@ -2130,7 +2126,9 @@
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0"> <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
<span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex" <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
@click="goToPassenger(childItem, 2)">{{ childItem.userName }} @click="goToPassenger(childItem, 2)">{{ childItem.userName }}
<span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}） </span> <span
:style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}）
</span>
<span style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span> <span style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
<span style="color:#f56c6c">{{childItem.TicketOutTypeStr}} <span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
</span> </span>
...@@ -2141,7 +2139,8 @@ ...@@ -2141,7 +2139,8 @@
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-for="(childItem,childIndex) in item.CancelGuestList" <span v-for="(childItem,childIndex) in item.CancelGuestList"
:key="childIndex">{{ childItem.userName }}<span :key="childIndex">{{ childItem.userName }}<span
style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span> &nbsp;&nbsp;</span> style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
&nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<span>{{ $t("salesModule.RoomInfo") }}：{{ <span>{{ $t("salesModule.RoomInfo") }}：{{
...@@ -2181,8 +2180,10 @@ ...@@ -2181,8 +2180,10 @@
<template v-for="(uItem,uIndex) in item.OrderGuestFlightList"> <template v-for="(uItem,uIndex) in item.OrderGuestFlightList">
<div :key="uIndex+20000"> <div :key="uIndex+20000">
{{uItem.GuestNames}} {{$t('salesModule.FlighInfo')}}： {{uItem.GuestNames}} {{$t('salesModule.FlighInfo')}}：
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【{{$t('visa.v_zanding')}}】</span> <span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)" @click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)" v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)"
@click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
style="cursor:pointer;text-decoration:underline;color:green;"> style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ {{ $t("Operation.Op_teamNotice") }}({{
SetNoticeMsg.OutNotice == 1 ? "OK" : $t('visa.v_zanding') SetNoticeMsg.OutNotice == 1 ? "OK" : $t('visa.v_zanding')
...@@ -2258,7 +2259,7 @@ ...@@ -2258,7 +2259,7 @@
}}</span> }}</span>
</td> </td>
</tr> </tr>
<tbody v-for="(childItem, childIndex) in subItem.List" :key="childIndex + 2000"> <tbody v-for="(childItem, childIndex) in subItem.List" :key="`o_s_`+subIndex+'_c_'+childIndex + 2000">
<tr> <tr>
<td rowspan="3" style="position: relative"> <td rowspan="3" style="position: relative">
<span class="TC_neibu" style="float: inherit;margin-left: 5px; margin-right: 5px;position:absolute;top:10px;left:3px; <span class="TC_neibu" style="float: inherit;margin-left: 5px; margin-right: 5px;position:absolute;top:10px;left:3px;
...@@ -2270,7 +2271,7 @@ ...@@ -2270,7 +2271,7 @@
otherPlat: childItem.StandardCurrencyName == '', otherPlat: childItem.StandardCurrencyName == '',
}">{{ childItem.StandardCurrencyName }}{{$t('objFill.jiesuan')}}</span> }">{{ childItem.StandardCurrencyName }}{{$t('objFill.jiesuan')}}</span>
<div v-if="childItem.IsApplyForCancel == 1" style="color: red"> <div v-if="childItem.IsApplyForCancel == 1" style="color: red">
{{$t('objFill.youquxiaodd')}} {{$t('objFill.youquxiaodd')}}
</div> </div>
<div class="order_union"> <div class="order_union">
<div v-if="childItem.IsReturnIntermodal == 1||childItem.IsIntermodal == 1" class="fl"> <div v-if="childItem.IsReturnIntermodal == 1||childItem.IsIntermodal == 1" class="fl">
...@@ -2677,7 +2678,9 @@ ...@@ -2677,7 +2678,9 @@
<template v-for="(fourthItem,fourthIndex) in childItem.GuestList"> <template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
<span style="color: blue !important" :key="fourthIndex" <span style="color: blue !important" :key="fourthIndex"
@click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }} @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
<span :style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}） </span> <span
:style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}）
</span>
<span style="color:#f56c6c">{{fourthItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}} <span style="color:#f56c6c">{{fourthItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}
</span> </span>
<span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}} <span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}
...@@ -2694,7 +2697,8 @@ ...@@ -2694,7 +2697,8 @@
<span class="">{{ $t("salesModule.CancelOrder") }}:</span> <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span <span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span
style="color:#f56c6c">{{subItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span> &nbsp;&nbsp;</span> style="color:#f56c6c">{{subItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
&nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<span style="display: block"> <span style="display: block">
...@@ -2726,7 +2730,8 @@ ...@@ -2726,7 +2730,8 @@
style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span> style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span>
</el-popover> </el-popover>
</span> </span>
<p v-if="childItem.IsOneDay==1&&childItem.LuggageNum">{{$t('objFill.xinglisl')}}：{{childItem.LuggageNum}}</p> <p v-if="childItem.IsOneDay==1&&childItem.LuggageNum">
{{$t('objFill.xinglisl')}}：{{childItem.LuggageNum}}</p>
<div> <div>
<span v-if=" <span v-if="
...@@ -2866,7 +2871,8 @@ ...@@ -2866,7 +2871,8 @@
</el-popover> </el-popover>
</div> </div>
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;"> <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>{{$t('objFill.gaijiashenq')}}: {{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span <span>{{$t('objFill.gaijiashenq')}}:
{{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{childItem.ChangePriceReason}}</span> style="color:red;">{{childItem.ChangePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1"> <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
{{$t('objFill.dai')}}{{childItem.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{childItem.ManagerExamineName}}{{$t('fnc.shenhe')}} {{$t('objFill.dai')}}{{childItem.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{childItem.ManagerExamineName}}{{$t('fnc.shenhe')}}
...@@ -2918,9 +2924,12 @@ ...@@ -2918,9 +2924,12 @@
<span class="font-color-blur">{{$t('objFill.weishenqing')}}</span> <span class="font-color-blur">{{$t('objFill.weishenqing')}}</span>
</template> </template>
<template v-else> <template v-else>
<span class="font-color-red" v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span> <span class="font-color-red"
<span class="font-color-org" v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span> v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-green" v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span> <span class="font-color-org"
v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template> </template>
</div> </div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0"> <div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
...@@ -3382,8 +3391,10 @@ ...@@ -3382,8 +3391,10 @@
</template> </template>
<template v-else> <template v-else>
<span class="font-color-red" v-if="item.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span> <span class="font-color-red" v-if="item.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span> <span class="font-color-org"
<span class="font-color-green" v-if="item.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span> v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="item.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template> </template>
</div> </div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0"> <div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
...@@ -3459,7 +3470,8 @@ ...@@ -3459,7 +3470,8 @@
@click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode"> @click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{ item.LeaderName }}【{{ <span class="RL_LeaderName">{{ item.LeaderName }}【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass) getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}} {{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span> }}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}}
{{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -4102,7 +4114,7 @@ ...@@ -4102,7 +4114,7 @@
orderId: 0, orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id) unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
isopOperation: true, isopOperation: true,
GuestIds:'', GuestIds: '',
}, },
employeeMsg: { employeeMsg: {
BranchId: "-1", BranchId: "-1",
...@@ -4451,7 +4463,7 @@ ...@@ -4451,7 +4463,7 @@
); );
}) })
.catch(() => { .catch(() => {
this.$message.info(this.$t('pub.cancelBtn')+'！'); this.$message.info(this.$t('pub.cancelBtn') + '！');
}); });
}, },
//上传 //上传
...@@ -4539,11 +4551,11 @@ ...@@ -4539,11 +4551,11 @@
// 20190807 新增追加团款 提交按钮 // 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan() { submitZhuiJiaTuanKuan() {
if (!this.zhuijiaMsg.ChangePrice) { if (!this.zhuijiaMsg.ChangePrice) {
this.$message.error(this.$t('objFill.qingsrzjje')+'!'); this.$message.error(this.$t('objFill.qingsrzjje') + '!');
return; return;
} }
if (!this.zhuijiaMsg.OP_Remarks) { if (!this.zhuijiaMsg.OP_Remarks) {
this.$message.error(this.$t('rule.EnterMark')+'!'); this.$message.error(this.$t('rule.EnterMark') + '!');
return; return;
} }
this.apipost( this.apipost(
...@@ -5184,13 +5196,13 @@ ...@@ -5184,13 +5196,13 @@
}, },
}); });
}, },
toTrip: function (obj, TicketUnionId,GuestIds) { toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.TCID; this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigId; this.tripObj.configId = obj.ConfigId;
this.tripObj.orderId = obj.OrderId; this.tripObj.orderId = obj.OrderId;
this.tripObj.cityId = obj.DepartureCityId; this.tripObj.cityId = obj.DepartureCityId;
this.tripObj.unionfid =0; this.tripObj.unionfid = 0;
this.tripObj.GuestIds =GuestIds; this.tripObj.GuestIds = GuestIds;
if (TicketUnionId) { if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId; this.tripObj.unionfid = TicketUnionId;
} }
...@@ -6309,7 +6321,7 @@ ...@@ -6309,7 +6321,7 @@
} }
if (item.PositionType == 2) { if (item.PositionType == 2) {
this.NowInfo.DuringHoliday = this.NowInfo.DuringHoliday =
item.StartDate + " "+this.$t('OrderList.zhi')+" " + item.EndDate; item.StartDate + " " + this.$t('OrderList.zhi') + " " + item.EndDate;
this.NowInfo.date = this.ConfigData.Config.TCNUM; this.NowInfo.date = this.ConfigData.Config.TCNUM;
} }
if (item.PositionType == 3) { if (item.PositionType == 3) {
...@@ -6484,9 +6496,9 @@ ...@@ -6484,9 +6496,9 @@
SetOutNotice() { SetOutNotice() {
var that = this; var that = this;
this.Confirm( this.Confirm(
this.$t('objFill.shifou')+"【" + this.$t('objFill.shifou') + "【" +
(that.SetNoticeMsg.OutNotice == 1 ? this.$t('visa.v_zanding') : this.$t('pub.sureBtn')) + (that.SetNoticeMsg.OutNotice == 1 ? this.$t('visa.v_zanding') : this.$t('pub.sureBtn')) +
"】"+this.$t('Operation.Op_teamNotice')+'?', "】" + this.$t('Operation.Op_teamNotice') + '?',
function () { function () {
if (that.SetNoticeMsg.OutNotice == 0) { if (that.SetNoticeMsg.OutNotice == 0) {
that.SetNoticeMsg.OutNotice = 1; that.SetNoticeMsg.OutNotice = 1;
...@@ -6976,5 +6988,4 @@ ...@@ -6976,5 +6988,4 @@
}, },
}, },
}; };
</script>
</script> \ No newline at end of file
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