Skip to content

S
SuperMan
Commit 4d7b9f8b authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 2c0ce9c5 15936454
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 22 deletions
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 4d7b9f8b
...@@ -454,14 +454,13 @@ ...@@ -454,14 +454,13 @@
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}} :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsNeedAirportShuttle" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">是否需要送团
</el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2"> <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) " /> v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) " />
</template> </template>
<!-- <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template> -->
<template v-else> <template v-else>
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
...@@ -524,7 +523,6 @@ ...@@ -524,7 +523,6 @@
<template slot="prepend">{{$t('op.RTXF')}}</template> <template slot="prepend">{{$t('op.RTXF')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
...@@ -731,14 +729,12 @@ ...@@ -731,14 +729,12 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w260" <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.AirportService">
v-model="priceData.AirportService">
<template slot="prepend">{{$t('op.AirSupplier')}}</template> <template slot="prepend">{{$t('op.AirSupplier')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="EmergencyContact"> <el-form-item prop="EmergencyContact">
<el-input :placeholder="$t('pub.pleaseImport')" class="w260" <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.EmergencyContact">
v-model="priceData.EmergencyContact">
<template slot="prepend">紧急联系人</template> <template slot="prepend">紧急联系人</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -864,8 +860,6 @@ ...@@ -864,8 +860,6 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
...@@ -1369,6 +1363,7 @@ ...@@ -1369,6 +1363,7 @@
IsUseCompanyBus: 0, //是否使用公司车辆 IsUseCompanyBus: 0, //是否使用公司车辆
BusPriceId: 0, //公司车辆编号 BusPriceId: 0, //公司车辆编号
EmergencyContact: "", //紧急联系人 EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 4d7b9f8b
...@@ -454,14 +454,13 @@ ...@@ -454,14 +454,13 @@
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}} :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsNeedAirportShuttle" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">是否需要送团
</el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2"> <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) " /> v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) " />
</template> </template>
<!-- <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template> -->
<template v-else> <template v-else>
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
...@@ -524,7 +523,6 @@ ...@@ -524,7 +523,6 @@
<template slot="prepend">{{$t('op.RTXF')}}</template> <template slot="prepend">{{$t('op.RTXF')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
...@@ -731,14 +729,12 @@ ...@@ -731,14 +729,12 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w260" <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.AirportService">
v-model="priceData.AirportService">
<template slot="prepend">{{$t('op.AirSupplier')}}</template> <template slot="prepend">{{$t('op.AirSupplier')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="EmergencyContact"> <el-form-item prop="EmergencyContact">
<el-input :placeholder="$t('pub.pleaseImport')" class="w260" <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.EmergencyContact">
v-model="priceData.EmergencyContact">
<template slot="prepend">紧急联系人</template> <template slot="prepend">紧急联系人</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -864,8 +860,6 @@ ...@@ -864,8 +860,6 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
...@@ -1369,6 +1363,7 @@ ...@@ -1369,6 +1363,7 @@
IsUseCompanyBus: 0, //是否使用公司车辆 IsUseCompanyBus: 0, //是否使用公司车辆
BusPriceId: 0, //公司车辆编号 BusPriceId: 0, //公司车辆编号
EmergencyContact: "", //紧急联系人 EmergencyContact: "", //紧急联系人
IsNeedAirportShuttle: 0, //是否需要接送服务
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
......
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