Skip to content

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

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

parents 3854459e 8c8ad3f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1698 additions and 20 deletions
src/components/TravelContractDetail.vue
View file @ b6de60b5
......@@ -648,9 +648,29 @@
</p>
<h3>第二十一条 旅游费用及支付（以人民币为计算单位）</h3>
<p>
成人：<span>{{dataList.adultPrice}}</span>元/人，儿童（不满14岁）：<span>{{dataList.childPrice}}</span>元/人；其中，导游服务费<span>{{dataList.servicePrice}}</span>元/人；
成人：<span>{{dataList.adultPrice}}</span><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人，儿童（不满14岁）：<span>{{dataList.childPrice}}</span><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人；其中，导游服务费<span>{{dataList.servicePrice}}</span><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人；
</p>
<p>旅游费用合计：<span>{{dataList.orderPrice}}</span>元。</p>
<p>旅游费用合计：<span>{{dataList.orderPrice}}</span><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>。</p>
<p>旅游费用支付方式：
<span v-if="dataList.payType==1">现金</span>
<span v-if="dataList.payType==2">转账</span>
......@@ -918,7 +938,12 @@
<td width="10%">具体时间</td>
<td width="15%">地点</td>
<td width="15%">项目名称和内容</td>
<td width="15%">费用（元）</td>
<td width="15%">费用（<template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>）</td>
<td width="15%">项目时长（分钟）</td>
<td width="15%">其他说明</td>
<td width="10%">旅游者签名同意</td>
......
src/components/TravelContractNew.vue
View file @ b6de60b5
......@@ -568,21 +568,38 @@
<tr>
<td>
<el-form-item label="成人价" prop="adultPrice">
<el-input type="text" class="w300" v-model="CtObj.adultPrice"></el-input> 元/人
<el-input type="text" class="w300" v-model="CtObj.adultPrice"></el-input>
<template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>
/人
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="儿童(不满14岁的)">
<el-input type="text" class="w300" v-model="CtObj.childPrice"></el-input> 元/人
<el-input type="text" class="w300" v-model="CtObj.childPrice"></el-input> <template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>/人
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="导游服务费" prop="servicePrice">
<el-input type="text" class="w300" v-model="CtObj.servicePrice"></el-input> 元/人
<el-input type="text" class="w300" v-model="CtObj.servicePrice"></el-input> <template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>/人
</el-form-item>
</td>
</tr>
......@@ -1082,7 +1099,12 @@
<th width="10%">具体时间</th>
<th width="15%">地点</th>
<th width="12%">项目名称和内容</th>
<th width="12%">费用（元）</th>
<th width="12%">费用（ <template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>）</th>
<th width="12%">项目时长（分钟）</th>
<th width="12%">其他说明</th>
<th width="12%">旅游者签名同意</th>
......
src/components/clientConfirm.vue
View file @ b6de60b5
......@@ -846,8 +846,28 @@
<p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p>
</h3>
<p>
成人<font>{{dataList.adultPrice}}</font>元/人，儿童（不满14岁）<font>{{dataList.childPrice}}</font>元/人；其中，导游服务费
<font>{{dataList.servicePrice}}</font>元/人；旅游费用合计：<font>{{dataList.orderPrice}}</font>元。
成人<font>{{dataList.adultPrice}}</font><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人，儿童（不满14岁）<font>{{dataList.childPrice}}</font><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人；其中，导游服务费
<font>{{dataList.servicePrice}}</font><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>/人；旅游费用合计：<font>{{dataList.orderPrice}}</font><template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>。
</p>
<p>旅游费用支付方式：
<font v-if="dataList.payType==1">现金</font>
......@@ -1175,7 +1195,12 @@
<th>具体时间</th>
<th>地点</th>
<th>项目名称和内容</th>
<th>费用（元）</th>
<th>费用（<template v-if="dataList.signType==0">
元
</template>
<template v-else>
円
</template>）</th>
<th>项目时长（分钟）</th>
<th>其他说明</th>
<th>旅游者签名同意</th>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ b6de60b5
......@@ -299,7 +299,6 @@
this.dialogPptistVisible = false
},
handleMessage(event,targetOrigin) {
console.log(event.data,'-----------event.data')
if(event.data&&event.data.data&&!event.data.data) return
if(this.isPostMessage) return
// if(event.data&&event.data=='行程数据保存成功'){
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ b6de60b5
......@@ -269,6 +269,7 @@
DayList: [],
isFileUpload: false, //是否是一键上传行程
IsUpdateTrip: 0, //是否联动行程特色
FeaturePageType: 1, //1横版 2竖版
},
PostPrice: "", //报价信息
//线路
......@@ -456,6 +457,7 @@
basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId;
this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据
var TripFeature = {};
......@@ -683,10 +685,15 @@
this.journeyList.isFileUpload = true;
this.journeyList.DayNum = configData.Days.length;
this.journeyList.NightNum = this.journeyList.DayNum - 1;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
x.zoom = 0.44
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
x.zoom = 0.285
}
})
}
arrDayList(dayList)
......@@ -942,14 +949,20 @@
//默认不联动行程特色
this.journeyList.IsUpdateTrip = 0;
this.journeyList.FeaturePageType = 2;
this.journeyList.DayNum = tempData.DayNum;
this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
this.journeyList.StartCityId = tempData.StartCityId;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
x.zoom = 0.44
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
x.zoom = 0.285
}
})
}
arrDayList(tempData.DayList)
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @ b6de60b5
......@@ -327,7 +327,7 @@
}
},
created() {
},
computed: {
//获取行程天数
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ b6de60b5
......@@ -152,7 +152,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('sm.jhcfchengshi')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="StartCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" filterable>
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
</el-option>
......@@ -162,7 +162,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
......@@ -173,12 +173,25 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span>
<template v-if="false">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType"
style="width: 80px;">
<el-option label="横版" :value="1"></el-option>
<el-option label="竖版" :value="2"></el-option>
</el-select>
</el-form-item>
</span>
</template>
</div>
<div class="newTravelDayContent TravelDayContentThree clearfix" style="padding-left: 0;">
<div class="vertical-line" style="left: 23px;"></div>
......@@ -193,10 +206,14 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span>
</el-tooltip>
<travelDays :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDays :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
@click="clickBlowUpTravelDays(item)"></span>
......@@ -223,6 +240,7 @@
<script>
import travelDaysTrip from "../travelLineTrip/travelDaysTripThree";
import travelDays from './components/travelDays'
import travelDaysHV from './components/travelDaysHV'
export default {
props: [
......@@ -248,7 +266,8 @@
},
components: {
travelDaysTrip: travelDaysTrip,
travelDays
travelDays,
travelDaysHV
},
methods: {
clickBlowUpTravelDays(item){
......
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