Skip to content

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

11

parent 5ac0d233
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 33 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 62e6458b
...@@ -851,20 +851,37 @@ ...@@ -851,20 +851,37 @@
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</p> </p>
<p v-if=" <p v-if="(item.LineID == 14 || item.LineID == 118)
(item.LineID == 14 || item.LineID == 118) &&
item.BusOrderList &&
item.BusOrderList.length > 0
"> ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <template v-if=" item.BusOrderList &&
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum" item.BusOrderList.length > 0">
:TCNUM="item.TCNUM"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
</commonBusInfo> <commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
<div slot="reference"> :TCNUM="item.TCNUM">
<span class="price" </commonBusInfo>
style="cursor: pointer; text-decoration: underline">{{ $t("objFill.v101.dingcheqk") }}</span> <div slot="reference">
</div> <span class="price" style="cursor: pointer; text-decoration: underline;color:blue;">
</el-popover> <template v-if="item.BusOrderList[0].BookType==1">
永乐预定
</template>
<template v-else-if="item.BusOrderList[0].BookType==2">
公社预定
</template>
<template v-else-if="item.BusOrderList[0].BookType==3">
自理
</template>
<template v-else>
{{ $t("objFill.v101.dingcheqk") }}
</template>
</span>
</div>
</el-popover>
</template>
<template v-else>
<span class="price" style="color:red;">
{{ $t("objFill.v101.dingcheqk") }}(未预定)
</span>
</template>
</p> </p>
<p class="travelnowrap" v-if=" <p class="travelnowrap" v-if="
(item.LineID == 14 || (item.LineID == 14 ||
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 62e6458b
...@@ -584,16 +584,37 @@ ...@@ -584,16 +584,37 @@
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</p> </p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 "> <p v-if="(item.LineID == 14 || item.LineID == 118)
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> ">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum" <template v-if=" item.BusOrderList &&
:TCNUM="item.TCNUM"> item.BusOrderList.length > 0">
</commonBusInfo> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<div slot="reference"> <commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
<span class="price" :TCNUM="item.TCNUM">
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.dingcheqk')}}</span> </commonBusInfo>
</div> <div slot="reference">
</el-popover> <span class="price" style="cursor: pointer; text-decoration: underline;color:blue;">
<template v-if="item.BusOrderList[0].BookType==1">
永乐预定
</template>
<template v-else-if="item.BusOrderList[0].BookType==2">
公社预定
</template>
<template v-else-if="item.BusOrderList[0].BookType==3">
自理
</template>
<template v-else>
{{ $t("objFill.v101.dingcheqk") }}
</template>
</span>
</div>
</el-popover>
</template>
<template v-else>
<span class="price" style="color:red;">
{{ $t("objFill.v101.dingcheqk") }}(未预定)
</span>
</template>
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.IsOpenHotel==1"> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.IsOpenHotel==1">
......
src/components/busManagement/JourneyTripPlan.vue
View file @ 62e6458b
...@@ -130,7 +130,15 @@ ...@@ -130,7 +130,15 @@
<template v-if="subItem.MainId>0"> <template v-if="subItem.MainId>0">
<br /> <br />
<font style="color:red"> <font style="color:red">
永乐预定 <template v-if="subItem.BookType==1">
永乐预定
</template>
<template v-else-if="subItem.BookType==2">
公社预定
</template>
<template v-else-if="subItem.BookType==3">
自理
</template>
</font> </font>
<template v-if="subItem.CarName&&subItem.CarName!=''"> <template v-if="subItem.CarName&&subItem.CarName!=''">
{{subItem.CarName}}({{subItem.CarNo}}) {{subItem.CarName}}({{subItem.CarNo}})
......
src/components/commonPage/commonBusInfo.vue
View file @ 62e6458b
...@@ -26,6 +26,28 @@ ...@@ -26,6 +26,28 @@
<div> <div>
<div> <div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<td>
预定方式:
</td>
<td style="color:red;text-align:left;" colspan="2">
<template v-if="busData[0].BookType==1">
永乐预定
</template>
<template v-else-if="busData[0].BookType==2">
公社预定
</template>
<template v-else-if="busData[0].BookType==3">
自理
</template>
</td>
<td>
司机住宿:
</td>
<td colspan="2" style="text-align:left;color:red">
{{busData[0].DriverRemark}}
</td>
</tr>
<tr> <tr>
<td> <td>
{{$t('salesModule.CompanyNum')}} {{$t('salesModule.CompanyNum')}}
...@@ -47,7 +69,7 @@ ...@@ -47,7 +69,7 @@
<td style="text-align:left;" colspan="2"> <td style="text-align:left;" colspan="2">
<span style="padding-left:5px;"> <span style="padding-left:5px;">
<template v-if="busData&&busData.length>0&&busData[0].CarName"> <template v-if="busData&&busData.length>0&&busData[0].CarName">
{{busData[0].CarName}} {{busData[0].CarName}}({{busData[0].CarNo}})
</template> </template>
</span> </span>
</td> </td>
...@@ -57,7 +79,7 @@ ...@@ -57,7 +79,7 @@
<td style="text-align:left;" colspan="2"> <td style="text-align:left;" colspan="2">
<span style="padding-left:5px;"> <span style="padding-left:5px;">
<template v-if="busData&&busData.length>0&&busData[0].DriverName"> <template v-if="busData&&busData.length>0&&busData[0].DriverName">
{{busData[0].DriverName}} {{busData[0].DriverName}}({{busData[0].CarNo}})
</template> </template>
</span> </span>
</td> </td>
...@@ -65,9 +87,9 @@ ...@@ -65,9 +87,9 @@
<tr> <tr>
<th width="100">{{$t('pub.date')}}</th> <th width="100">{{$t('pub.date')}}</th>
<th width="80">{{$t('objFill.yongcheleix')}}</th> <th width="80">{{$t('objFill.yongcheleix')}}</th>
<th width="180" colspan="2">{{$t('Airticket.Air_Trip')}}</th> <th width="180" colspan="3">{{$t('Airticket.Air_Trip')}}</th>
<th width="95">{{$t('admin.admin_czPerson')}}</th> <th width="95">{{$t('admin.admin_czPerson')}}</th>
<th width="125">{{$t('admin.admin_status')}}</th> <!-- <th width="125">{{$t('admin.admin_status')}}</th> -->
</tr> </tr>
<template v-for="(busItem,bIndex) in busData"> <template v-for="(busItem,bIndex) in busData">
<tr v-for="(dItem,dIndex) in busItem.OrderDetailList" :key="bIndex+dIndex"> <tr v-for="(dItem,dIndex) in busItem.OrderDetailList" :key="bIndex+dIndex">
...@@ -77,20 +99,20 @@ ...@@ -77,20 +99,20 @@
<td style="padding-left:3px;"> <td style="padding-left:3px;">
{{dItem.UseTypeName}} {{dItem.UseTypeName}}
</td> </td>
<td style="text-align:left;padding-left:3px;" colspan="2"> <td style="text-align:left;padding-left:3px;" colspan="3">
{{dItem.BusContent}} {{dItem.BusContent}}
</td> </td>
<td style="padding-left:3px;"> <td style="padding-left:3px;">
{{dItem.UpdateName}} {{dItem.UpdateName}}
</td> </td>
<td> <!-- <td>
<template v-if="dItem.UseState==0"> <template v-if="dItem.UseState==0">
<a style="color:red">{{$t('salesModule.DJZK')}}</a> <a style="color:red">{{$t('salesModule.DJZK')}}</a>
</template> </template>
<template v-else> <template v-else>
<a style="color:green">{{$t('salesModule.DJOK')}}<br />{{dItem.SureDate}}</a> <a style="color:green">{{$t('salesModule.DJOK')}}<br />{{dItem.SureDate}}</a>
</template> </template>
</td> </td> -->
</tr> </tr>
</template> </template>
</table> </table>
...@@ -111,7 +133,8 @@ ...@@ -111,7 +133,8 @@
let qMsg = { let qMsg = {
TCID: this.TCID TCID: this.TCID
}; };
let fileName = this.$t('objFilll.shoupeishu')+"【" + this.DMCNum + "】" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('objFilll.shoupeishu') + "【" + this.DMCNum + "】" + this.$commonUtils.getCurrentDate() +
".xls";
this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName, this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
...@@ -120,7 +143,8 @@ ...@@ -120,7 +143,8 @@
//子组件调用父组件方法 //子组件调用父组件方法
subSetShouPeiShu(ShouPeiStatus) { subSetShouPeiShu(ShouPeiStatus) {
var that = this; var that = this;
var str = this.$t('objFilll.shifoujspssz') + (ShouPeiStatus == 0 ? "【"+this.$t('pub.sureBtn') +"】" : "【"+this.$t('visa.v_zanding')+"】") + "?"; var str = this.$t('objFilll.shifoujspssz') + (ShouPeiStatus == 0 ? "【" + this.$t('pub.sureBtn') + "】" : "【" +
this.$t('visa.v_zanding') + "】") + "?";
this.Confirm(str, function () { this.Confirm(str, function () {
that.$emit('SetShouPeiShu'); that.$emit('SetShouPeiShu');
}); });
......
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