Skip to content

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

新增团队修改，是否拆分团队

parent 4147fe27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 556 additions and 50 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a91d656f
...@@ -685,7 +685,8 @@ ...@@ -685,7 +685,8 @@
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{ $t("Airticket.Air_StartTime") }}</span> <span>{{ $t("Airticket.Air_StartTime") }}</span>
<span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;"> <span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;">
{{item.StartDateWeekStr}}</font>)</span> {{item.StartDateWeekStr}}</font>)
</span>
<template v-if="item.RelationPriceList && item.RelationPriceList.length > 0"> <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')"> <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop"> <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
...@@ -712,6 +713,32 @@ ...@@ -712,6 +713,32 @@
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</template> </template>
<!-- <template v-if="item.TeamPriceList && item.TeamPriceList.length > 0">
<el-tooltip class="item" effect="dark" content="合并列表">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width: 100px">
{{ $t("Airticket.Air_StartTime") }}
</td>
<td style="width: 250px">{{ $t("visa.v_tuanhao") }}</td>
</tr>
<tr v-for="(rItem, rIndex) in item.TeamPriceList" :key="`d_`+index+`_t_`+rIndex">
<td>
{{ rItem.StartDate }}
</td>
<td>
({{ rItem.TCID }}){{ rItem.TCNUM }}[{{ rItem.TCState }}]
</td>
</tr>
</table>
<el-button slot="reference" circle size="mini" type="primary"
style="width: 20px; height: 20px; padding: 4px" style="">
{{ item.TeamPriceList.length }}
</el-button>
</el-popover>
</el-tooltip>
</template> -->
</p> </p>
<p class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0"> <p class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0">
<span>{{ $t("objFill.handpartscharge") }}</span> <span>{{ $t("objFill.handpartscharge") }}</span>
...@@ -1895,7 +1922,8 @@ ...@@ -1895,7 +1922,8 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('objFill.tuanduilx')" prop="Remark"> <el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
<el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice"> <el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
<el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name"
:value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
src/components/commonPage/comChooseTrip.vue 0 → 100644
View file @ a91d656f
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ a91d656f
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
@click="submitForm(2)"> @click="submitForm(2)">
{{$t('fnc.tijiao')}}</div> {{$t('fnc.tijiao')}}</div>
<div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" :loading="saveLoading" <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" :loading="saveLoading"
@click="submitForm(3)" :title="$t('objFill.v101.myOrdersAllType.lingcwxmb')">{{$t('pub.saveBtn')}} @click="submitForm(3)" >{{$t('pub.saveBtn')}}
</div> </div>
<div style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()"> <div style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">
{{$t('sm.yulan')}} {{$t('sm.yulan')}}
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
NotQueryCityList: [], //使用系统中的经纬度城市 NotQueryCityList: [], //使用系统中的经纬度城市
FeaturePageType: 0, //1横版 2竖版 FeaturePageType: 0, //1横版 2竖版
TeamType: 0, TeamType: 0,
IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -565,7 +566,8 @@ ...@@ -565,7 +566,8 @@
} }
basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel; basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
basicData.MapUrl = this.PostConfig.MapUrl basicData.MapUrl = this.PostConfig.MapUrl;
basicData.IsSplitTeam=this.PostConfig.IsSplitTeam;
console.log("travel_post_SetTravelConfigInfo", basicData); console.log("travel_post_SetTravelConfigInfo", basicData);
this.isSubmit = false; this.isSubmit = false;
this.apipost( this.apipost(
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ a91d656f
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
.TP_rightDate { .TP_rightDate {
margin-left: 50px; margin-left: 50px;
padding-bottom: 10px;
} }
.TPDateContent .currentInput { .TPDateContent .currentInput {
...@@ -419,21 +420,39 @@ ...@@ -419,21 +420,39 @@
</div> </div>
<div class="TP_rightDate"> <div class="TP_rightDate">
<div class="TP_dateContent"> <div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove"> <el-row v-if="modifyTcid>0">
<i class="iconfont icon-previewleft"></i> <el-col>
</span> <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<div class="TP_childContent"> <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)" :false-label="UnCheckedLessPrice">
v-for="(item,index) in showPriceList" :key="index"> <font style="color:red;font-weight:bold;">拆分团队</font>
{{item.StartDate}} </el-checkbox>
<span class="TP_cancel" @click.stop="delDateList(item)"> </el-tooltip>
<i class="iconfont icon-quxiao"></i> </el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span> </span>
</span> </el-col>
</div> <el-col>
<span class="TP_Right" @click="priceRightMove"> <div class="TP_childContent">
<i class="iconfont icon-arrow-right"></i> <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
</span> v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
</span>
</span>
</div>
</el-col>
<el-col>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
</el-row>
</div> </div>
<div class="TP_DateList"></div> <div class="TP_DateList"></div>
</div> </div>
...@@ -868,7 +887,7 @@ ...@@ -868,7 +887,7 @@
{{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}} {{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}
</td> </td>
<td class="_color_666">{{$t('adm.adm_time')}}/PNR</td> <td class="_color_666">{{$t('adm.adm_time')}}/PNR</td>
<td class="_color_666">{{$t('visa.v_xcdays')}}</td> <td class="_color_666">{{$t('visa.v_xcdays')}}</td>
<td class="_color_666">{{$t('op.TicketNum')}}/{{$t('hotel.table_UseAmount')}}</td> <td class="_color_666">{{$t('op.TicketNum')}}/{{$t('hotel.table_UseAmount')}}</td>
<td class="_color_666">{{$t('op.BindTicket')}}</td> <td class="_color_666">{{$t('op.BindTicket')}}</td>
...@@ -886,7 +905,7 @@ ...@@ -886,7 +905,7 @@
{{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}} {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td> </td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}} <td>{{fitem.FlightDate}} {{fitem.Departure_time}}
<br/> <br />
{{fitem.PNR}} {{fitem.PNR}}
</td> </td>
<td>{{fitem.DayNum}}</td> <td>{{fitem.DayNum}}</td>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ a91d656f
...@@ -416,23 +416,41 @@ ...@@ -416,23 +416,41 @@
<span class="TPNotice">（{{$t('sm.tipscompanyyuj')}}）</span> <span class="TPNotice">（{{$t('sm.tipscompanyyuj')}}）</span>
<span class="TPLine"></span> <span class="TPLine"></span>
</div> </div>
<div class="TP_rightDate"> <div class="TP_rightDate">
<div class="TP_dateContent"> <div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove"> <el-row v-if="modifyTcid>0">
<i class="iconfont icon-previewleft"></i> <el-col>
</span> <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<div class="TP_childContent"> <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)" :false-label="UnCheckedLessPrice">
v-for="(item,index) in showPriceList" :key="index"> <font style="color:red;font-weight:bold;">拆分团队</font>
{{item.StartDate}} </el-checkbox>
<span class="TP_cancel" @click.stop="delDateList(item)"> </el-tooltip>
<i class="iconfont icon-quxiao"></i> </el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span> </span>
</span> </el-col>
</div> <el-col>
<span class="TP_Right" @click="priceRightMove"> <div class="TP_childContent">
<i class="iconfont icon-arrow-right"></i> <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
</span> v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
</span>
</span>
</div>
</el-col>
<el-col>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
</el-row>
</div> </div>
<div class="TP_DateList"></div> <div class="TP_DateList"></div>
</div> </div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ a91d656f
...@@ -404,21 +404,39 @@ ...@@ -404,21 +404,39 @@
</div> </div>
<div class="TP_rightDate"> <div class="TP_rightDate">
<div class="TP_dateContent"> <div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove"> <el-row v-if="modifyTcid>0">
<i class="iconfont icon-previewleft"></i> <el-col>
</span> <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<div class="TP_childContent"> <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)" :false-label="UnCheckedLessPrice">
v-for="(item,index) in showPriceList" :key="index"> <font style="color:red;font-weight:bold;">拆分团队</font>
{{item.StartDate}} </el-checkbox>
<span class="TP_cancel" @click.stop="delDateList(item)"> </el-tooltip>
<i class="iconfont icon-quxiao"></i> </el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span> </span>
</span> </el-col>
</div> <el-col>
<span class="TP_Right" @click="priceRightMove"> <div class="TP_childContent">
<i class="iconfont icon-arrow-right"></i> <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
</span> v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
</span>
</span>
</div>
</el-col>
<el-col>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
</el-row>
</div> </div>
<div class="TP_DateList"></div> <div class="TP_DateList"></div>
</div> </div>
...@@ -1187,7 +1205,7 @@ ...@@ -1187,7 +1205,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务 IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数 GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品 IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号 TeamId: 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