Skip to content

S
SuperMan
Commit f14eefb6 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 034b22c2
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 12 deletions
src/components/DomesticTravelcontract.vue
View file @ f14eefb6
...@@ -999,7 +999,8 @@ ...@@ -999,7 +999,8 @@
<span v-if=" <span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}小时</span> ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
{{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
...@@ -1008,7 +1009,7 @@ ...@@ -1008,7 +1009,7 @@
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
...@@ -1041,8 +1042,12 @@ ...@@ -1041,8 +1042,12 @@
{{ item.TrifficType }} {{ item.TrifficType }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">旅游酒店</span> <template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-else>无</span> <span v-else>无</span>
</template>
</template>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span> <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
...@@ -2172,6 +2177,9 @@ ...@@ -2172,6 +2177,9 @@
} }
} }
this.trifficList.forEach((x, index) => { this.trifficList.forEach((x, index) => {
if(x.busTip!=null && x.busTip!=''){
this.tripDays[index].TrifficType = x.busTip;
}else{
if (x.airportPickUp == 1 || x.airportPickUp == 2) { if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) { if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴"; this.tripDays[index].TrifficType = "飞机+大巴";
...@@ -2190,6 +2198,7 @@ ...@@ -2190,6 +2198,7 @@
this.tripDays[index].TrifficType = this.$t('fnc.no') this.tripDays[index].TrifficType = this.$t('fnc.no')
} }
} }
}
}); });
}, },
changeDmcCompany(item){ changeDmcCompany(item){
......
src/components/TravelContractNew.vue
View file @ f14eefb6
...@@ -1103,7 +1103,8 @@ ...@@ -1103,7 +1103,8 @@
<span v-if=" <span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}{{$t('objFill.xiaoshi')}}</span> ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
{{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
...@@ -1112,7 +1113,7 @@ ...@@ -1112,7 +1113,7 @@
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
...@@ -1145,8 +1146,12 @@ ...@@ -1145,8 +1146,12 @@
{{ item.TrifficType }} {{ item.TrifficType }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">旅游酒店</span> <template v-for="subItem in item.dayArray">
<span v-else>{{$t('fnc.no')}}</span> <template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-else>无</span>
</template>
</template>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span> <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
...@@ -2667,6 +2672,9 @@ ...@@ -2667,6 +2672,9 @@
} }
} }
this.trifficList.forEach((x, index) => { this.trifficList.forEach((x, index) => {
if(x.busTip!=null && x.busTip!=''){
this.tripDays[index].TrifficType = x.busTip;
}else{
if (x.airportPickUp == 1 || x.airportPickUp == 2) { if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) { if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴"; this.tripDays[index].TrifficType = "飞机+大巴";
...@@ -2685,6 +2693,7 @@ ...@@ -2685,6 +2693,7 @@
this.tripDays[index].TrifficType = this.$t('fnc.no') this.tripDays[index].TrifficType = this.$t('fnc.no')
} }
} }
}
}); });
}, },
changeDmcCompany(item){ changeDmcCompany(item){
......
src/components/onedayTripContract.vue
View file @ f14eefb6
...@@ -985,10 +985,12 @@ ...@@ -985,10 +985,12 @@
<div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex"> <div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
<span v-if="subItem.type == 2"> <span v-if="subItem.type == 2">
{{ subItem.childItem.couponsName }} {{ subItem.childItem.couponsName }}
<span v-if=" <span v-if="
subItem.childItem.playTimeHour != null && subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}小时</span> ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
{{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
<span v-if=" <span v-if="
subItem.childItem.playTimeMinutes != null && subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != '' subItem.childItem.playTimeMinutes != ''
...@@ -997,7 +999,7 @@ ...@@ -997,7 +999,7 @@
subItem.childItem.playTimeHour == null && subItem.childItem.playTimeHour == null &&
subItem.childItem.playTimeHour != '' subItem.childItem.playTimeHour != ''
">（</template> ">（</template>
{{ subItem.childItem.playTimeMinutes }}分钟）</span> {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
</span> </span>
<span v-if=" <span v-if="
subItem.type == 7 && subItem.type == 7 &&
...@@ -1031,8 +1033,12 @@ ...@@ -1031,8 +1033,12 @@
{{ item.TrifficType }} {{ item.TrifficType }}
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">旅游酒店</span> <template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-else>无</span> <span v-else>无</span>
</template>
</template>
</td> </td>
<td contenteditable="true"> <td contenteditable="true">
<span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span> <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
...@@ -1998,6 +2004,9 @@ ...@@ -1998,6 +2004,9 @@
} }
} }
this.trifficList.forEach((x, index) => { this.trifficList.forEach((x, index) => {
if(x.busTip!=null && x.busTip!=''){
this.tripDays[index].TrifficType = x.busTip;
}else{
if (x.airportPickUp == 1 || x.airportPickUp == 2) { if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) { if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴"; this.tripDays[index].TrifficType = "飞机+大巴";
...@@ -2016,6 +2025,7 @@ ...@@ -2016,6 +2025,7 @@
this.tripDays[index].TrifficType = this.$t('fnc.no') this.tripDays[index].TrifficType = this.$t('fnc.no')
} }
} }
}
}); });
}, },
}, },
......
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