Skip to content

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

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

parents d454769a 8e2144a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 768 additions and 88 deletions
src/assets/common/lang/zhCN/fill.js
View file @ defed7eb
......@@ -6249,7 +6249,7 @@ export const obj = {
qianzhenglb: '签证列表',
xiugaisongqr: '修改送签日期',
xiugaichuqr: '修改出签日期',
xiugaijingr: '修改进馆日',
xiugaijingr: '修改进馆日期',
xuanzeqzlx: '选择签证类型',
ouzhouqianz: '欧洲签证',
qingshurgjmc: '输入国家名称',
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ defed7eb
......@@ -561,7 +561,11 @@
</el-image>
</template>
</div>
<span style="color:red;">{{$t('objFill.v101.Rest.jingguanrq')}}：</span>
<span style="margin-right:10px;color:red;">{{ scope.row.enterTime }}</span>
<span style="color:red;">{{$t('visa.v_sqtime')}}：</span>
<span style="margin-right:10px;color:red;">{{ scope.row.signOutTime }}</span>
<span>{{$t('restaurant.res_oderTime')}}：</span>
<span>{{ scope.row.createTime }}</span>
</div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ defed7eb
......@@ -685,9 +685,10 @@
<p class="travelnowrap">
<span>{{ $t("Airticket.Air_StartTime") }}</span>
<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">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')" placement="top-start">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
......@@ -712,6 +713,32 @@
</el-popover>
</el-tooltip>
</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 class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0">
<span>{{ $t("objFill.handpartscharge") }}</span>
......@@ -1550,6 +1577,12 @@
<el-dropdown-item @click.native="ckChangePrice(item,2)">
团队类型变更
</el-dropdown-item>
<!-- <el-dropdown-item @click.native="shorTripDialog(item,1)">
系列合并
</el-dropdown-item>
<el-dropdown-item @click.native="shorTripDialog(item,2)">
当团合并
</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1895,7 +1928,8 @@
<el-col :span="4">
<el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
<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-select>
</el-form-item>
......@@ -1922,6 +1956,11 @@
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
</div>
<div v-if="isShowPriceTripDialog">
<el-dialog :visible.sync="isShowPriceTripDialog" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<comChooseTrip :priceObj="priceObj" :mergeType="mergeType" ref="dialog"></comChooseTrip>
</el-dialog>
</div>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel="CancelGroupType"
@Success="getControlList()" />
......@@ -1934,6 +1973,7 @@
import priceDialog from "../TravelNewQuotation/priceDialog.vue";
import EditLeaveGroup from "./components/EditLeaveGroup.vue";
import DateLimit from "../../public/DateLimit.vue";
import comChooseTrip from "../../commonPage/comChooseTrip.vue";
export default {
components: {
commonBusInfo,
......@@ -1942,6 +1982,7 @@
priceDialog,
EditLeaveGroup,
DateLimit,
comChooseTrip,
},
provide() {
return {
......@@ -2245,6 +2286,9 @@
},
},
teamList: [], //团队类型列表
isShowPriceTripDialog: false,
priceObj: {},
mergeType: 1,
};
},
//监听器
......@@ -2256,6 +2300,12 @@
},
},
methods: {
//显示合并团队弹窗
shorTripDialog(item, type) {
this.priceObj = item;
this.mergeType = type;
this.isShowPriceTripDialog = true;
},
//团队类型
getTravelTeamList() {
this.apipost(
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ defed7eb
......@@ -80,6 +80,7 @@
AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型,
OfferArray:[],
},
pMsg: {
offerId: 0,
......@@ -127,7 +128,7 @@
this.haveData = false;
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V5",
"travel_get_PriceOfferInfo",
this.pMsg,
res => {
this.loading = false;
......@@ -222,9 +223,7 @@
this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
this.postData.PriceTeamType = tempData.PriceTeamType;
if (tempData.OfferArray) {
tempData.OfferArray.forEach(item => {
this.OfferArray.push(item)
})
this.postData.OfferArray = tempData.OfferArray;
}
this.haveData = true;
} else {
......@@ -242,9 +241,6 @@
if (this.$route.query.offerid) {
this.pMsg.offerId = this.$route.query.offerid;
}
// if (this.$route.query.BatchNum) {
// this.pMsg.BatchNum = this.$route.query.BatchNum;
// }
this.getPostData();
},
components: {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ defed7eb
......@@ -255,7 +255,6 @@
this.postData.PriceTeamType = tempData.PriceTeamType;
if (tempData.OfferArray) {
this.postData.OfferArray = tempData.OfferArray;
}
this.haveData = true;
} else {
......
src/components/commonPage/comChooseTrip.vue 0 → 100644
View file @ defed7eb
This diff is collapsed.
src/components/dmc/manager/tripsManager.vue
View file @ defed7eb
......@@ -404,6 +404,7 @@
font-size: 12px;
border: 1px solid #E5E5E5;
}
</style>
<template>
<div>
......@@ -415,7 +416,8 @@
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="queryMsg.LineId" class="w150" :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList(queryMsg.LineId,true)" filterable>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
:key="item.LineID">
</el-option>
</el-select>
</span>
......@@ -440,10 +442,9 @@
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
:EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
......@@ -481,10 +482,12 @@
</li>
</ul>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
<table class="TravelControlListTable TravelQueryList" v-loading="loading">
<tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
<template v-for="(item,index) in outItem.TravelPriceList">
<tr height="40">
<tr height="40" :key="`a_`+index">
<td align="center" width="80" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
<label>
<input :value="outItem.TCIDs" style="vertical-align: middle;" v-model="ArrList"
......@@ -494,7 +497,7 @@
</td>
<td colspan="5" style="padding-left: 30px;">{{item.Title}}</td>
</tr>
<tr>
<tr :key="`b_`+index">
<td width="20%">
<div class="TCL-TCNUM">{{item.OutBranchName}}</div>
<div class="TCL-TCNUM">{{item.TCNUM}}</div>
......@@ -598,7 +601,8 @@
</p>
<p>
<span>{{$t('ground.cantuan')}}</span>
<span>{{item.JoinNum+item.SingleGroupNum}}</span> <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
<span>{{item.JoinNum+item.SingleGroupNum}}</span> <span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</p>
<p>
<span>{{$t('MarketingActi.free')}}</span>
......@@ -619,7 +623,7 @@
</div>
</td>
</tr>
<tr height="40">
<tr height="40" :key="`c_`+index">
<td colspan="5" style="padding-left: 30px;">
<div>{{$t('fnc.beizhu')}}：{{item.OPRemark}}</div>
<div v-if="item.DmcRemarkLast">{{$t('Operation.Op_dijieRemark')}}：{{item.DmcRemarkLast.DMCRemark}}</div>
......@@ -771,21 +775,21 @@
this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) {
let lineArr = res.data.data;
this.queryCommonData.LineList=[];
lineArr.forEach(x=>{
if(x.LineID==14||x.LineID==90){
this.queryCommonData.LineList = [];
lineArr.forEach(x => {
if (x.LineID == 14 || x.LineID == 90) {
this.queryCommonData.LineList.push(x);
}
})
let obj = {
LineName:this.$t('pub.unlimitedSel'),
LineID:0
LineName: this.$t('pub.unlimitedSel'),
LineID: 0
}
this.queryCommonData.LineList.unshift(obj);
}
});
},
//获取系列列表
//获取系列列表
getLineTeamList(lineId, isDefault) {
//查询线路名
if (isDefault) {
......@@ -864,7 +868,7 @@
mounted() {
this.getLineList();
this.getCompanyList();
this.getLineTeamList(0,true);
this.getLineTeamList(0, true);
},
created() {
var myDate = new Date();
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ defed7eb
......@@ -122,7 +122,7 @@
@click="submitForm(2)">
{{$t('fnc.tijiao')}}</div>
<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 style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">
{{$t('sm.yulan')}}
......@@ -231,6 +231,7 @@
NotQueryCityList: [], //使用系统中的经纬度城市
FeaturePageType: 0, //1横版 2竖版
TeamType: 0,
IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
},
//行程
FeatureData: {
......@@ -565,7 +566,8 @@
}
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);
this.isSubmit = false;
this.apipost(
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ defed7eb
......@@ -18,6 +18,7 @@
.TP_rightDate {
margin-left: 50px;
padding-bottom: 10px;
}
.TPDateContent .currentInput {
......@@ -419,21 +420,39 @@
</div>
<div class="TP_rightDate">
<div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
<el-row v-if="modifyTcid>0">
<el-col>
<el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">
<font style="color:red;font-weight:bold;">拆分团队</font>
</el-checkbox>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
</span>
</div>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
<el-col>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
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 class="TP_DateList"></div>
</div>
......@@ -868,7 +887,7 @@
{{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}
</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('op.TicketNum')}}/{{$t('hotel.table_UseAmount')}}</td>
<td class="_color_666">{{$t('op.BindTicket')}}</td>
......@@ -886,7 +905,7 @@
{{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}
<br/>
<br />
{{fitem.PNR}}
</td>
<td>{{fitem.DayNum}}</td>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ defed7eb
......@@ -416,23 +416,41 @@
<span class="TPNotice">（{{$t('sm.tipscompanyyuj')}}）</span>
<span class="TPLine"></span>
</div>
<div class="TP_rightDate">
<div class="TP_rightDate">
<div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
<el-row v-if="modifyTcid>0">
<el-col>
<el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">
<font style="color:red;font-weight:bold;">拆分团队</font>
</el-checkbox>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
</span>
</div>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
<el-col>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
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 class="TP_DateList"></div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ defed7eb
......@@ -404,21 +404,39 @@
</div>
<div class="TP_rightDate">
<div class="TP_dateContent">
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
v-for="(item,index) in showPriceList" :key="index">
{{item.StartDate}}
<span class="TP_cancel" @click.stop="delDateList(item)">
<i class="iconfont icon-quxiao"></i>
<el-row v-if="modifyTcid>0">
<el-col>
<el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
<el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">
<font style="color:red;font-weight:bold;">拆分团队</font>
</el-checkbox>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col>
<span class="TP_toLeft" @click="priceLeftMove">
<i class="iconfont icon-previewleft"></i>
</span>
</span>
</div>
<span class="TP_Right" @click="priceRightMove">
<i class="iconfont icon-arrow-right"></i>
</span>
</el-col>
<el-col>
<div class="TP_childContent">
<span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
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 class="TP_DateList"></div>
</div>
......@@ -1187,7 +1205,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
TeamId: 0, //团队分组编号
};
}
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