Skip to content

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

新增团期关联显示

parent a64fd225
Hide whitespace changes
Inline Side-by-side
Showing with 3556 additions and 3404 deletions
src/assets/common/lang/EN/fill.js
View file @ 21debbbb
...@@ -1592,6 +1592,7 @@ export const obj = { ...@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'Click to open tickets for sale', dianjikqksjp: 'Click to open tickets for sale',
jietuanriqi: 'Knot date', jietuanriqi: 'Knot date',
xilietxbm: 'Series Group New Layout', xilietxbm: 'Series Group New Layout',
xilietdate: 'Series Group Date',
dangtuanxbm: 'New Layout of Dangtuan', dangtuanxbm: 'New Layout of Dangtuan',
xiazaiqiyueshu: "Download The Contract", xiazaiqiyueshu: "Download The Contract",
tuisongxiaoxi: 'Push message', tuisongxiaoxi: 'Push message',
......
src/assets/common/lang/Japan/fill.js
View file @ 21debbbb
...@@ -1592,6 +1592,7 @@ export const obj = { ...@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'クリックして航空券を販売することができます', dianjikqksjp: 'クリックして航空券を販売することができます',
jietuanriqi: '結団日', jietuanriqi: '結団日',
xilietxbm: 'シリーズ団新版面', xilietxbm: 'シリーズ団新版面',
xilietdate: 'シリーズ団期',
dangtuanxbm: '契約書のダウンロード', dangtuanxbm: '契約書のダウンロード',
xiazaiqiyueshu:"下載契約書", xiazaiqiyueshu:"下載契約書",
tuisongxiaoxi: 'プッシュメッセージ', tuisongxiaoxi: 'プッシュメッセージ',
......
src/assets/common/lang/zhCN/fill.js
View file @ 21debbbb
...@@ -1592,6 +1592,7 @@ export const obj = { ...@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '点击开启可售机票', dianjikqksjp: '点击开启可售机票',
jietuanriqi: '结团日期', jietuanriqi: '结团日期',
xilietxbm: '系列团新版面', xilietxbm: '系列团新版面',
xilietdate: '系列团期',
dangtuanxbm: '当团新版面', dangtuanxbm: '当团新版面',
xiazaiqiyueshu:"下载契约书", xiazaiqiyueshu:"下载契约书",
tuisongxiaoxi: '推送消息', tuisongxiaoxi: '推送消息',
......
src/assets/common/lang/zhTW/fill.js
View file @ 21debbbb
...@@ -1592,6 +1592,7 @@ export const obj = { ...@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '點擊開啓可售機票', dianjikqksjp: '點擊開啓可售機票',
jietuanriqi: '結團日期', jietuanriqi: '結團日期',
xilietxbm: '系列團新版面', xilietxbm: '系列團新版面',
xilietdate: '系列團期',
dangtuanxbm: '當團新版面', dangtuanxbm: '當團新版面',
xiazaiqiyueshu: "下載契約書", xiazaiqiyueshu: "下載契約書",
tuisongxiaoxi: '推送消息', tuisongxiaoxi: '推送消息',
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 21debbbb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 21debbbb
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
.AuditGreenType { .AuditGreenType {
color: green; color: green;
} }
</style> </style>
<template> <template>
<div> <div>
...@@ -277,9 +276,12 @@ ...@@ -277,9 +276,12 @@
<el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text="" <el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" /> active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
<div style="margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails"> <div style="margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</span> <span
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">{{$t('objFill.guonei')}}</span> style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">{{$t('Operation.Op_leaveCountry')}}</span> <span
style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">{{$t('objFill.guonei')}}</span>
<span
style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">{{$t('Operation.Op_leaveCountry')}}</span>
</div> </div>
</span> </span>
</div> </div>
...@@ -372,13 +374,15 @@ ...@@ -372,13 +374,15 @@
<span v-if="item.FreePlan==1" :title="$t('sm.PlanFa')">{{$t('sm.Fang')}}</span> <span v-if="item.FreePlan==1" :title="$t('sm.PlanFa')">{{$t('sm.Fang')}}</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==1" :title="$t('Operation.Op_zhu')" <span v-if="item.IsUnion==1&&item.UnionTypeStr==1" :title="$t('Operation.Op_zhu')"
class="MainTeam">{{$t('Operation.Op_zhu')}}</span> class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==2" :title="$t('Operation.Op_lian')">{{$t('Operation.Op_lian')}}</span> <span v-if="item.IsUnion==1&&item.UnionTypeStr==2"
:title="$t('Operation.Op_lian')">{{$t('Operation.Op_lian')}}</span>
<span v-if="item.Status==2" <span v-if="item.Status==2"
:title="$t('objFill.jietuansj')+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span> :title="$t('objFill.jietuansj')+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==5" :title="$t('objFill.jietuanshz')" <span v-if="item.Status==5" :title="$t('objFill.jietuanshz')"
style="background: rgb(0 128 255);">{{$t('fnc.a_shezhong')}}</span> style="background: rgb(0 128 255);">{{$t('fnc.a_shezhong')}}</span>
<span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span> <span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span>
<span v-if="item.GroupRecommendType==1" :title="$t('objFill.jingping')">{{$t('objFill.jing')}}</span> <span v-if="item.GroupRecommendType==1"
:title="$t('objFill.jingping')">{{$t('objFill.jing')}}</span>
<label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;"> <label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">
{{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:$t('ground.dantuan')}} {{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:$t('ground.dantuan')}}
</label> </label>
...@@ -483,6 +487,29 @@ ...@@ -483,6 +487,29 @@
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
{{item.StartDate}} {{item.StartDate}}
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<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.RelationPriceList">
<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;">
{{item.RelationPriceList.length}}
</el-button>
</el-popover>
</el-tooltip>
</template>
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('objFill.jietuanriqi')}}</span> <span>{{$t('objFill.jietuanriqi')}}</span>
...@@ -498,7 +525,8 @@ ...@@ -498,7 +525,8 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckjdyudxq')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckjdyudxq')"
placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
...@@ -514,11 +542,13 @@ ...@@ -514,11 +542,13 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckctyudxq')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckctyudxq')"
placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<span slot="reference" style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.cantyudqk')}}</span> <span slot="reference"
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.cantyudqk')}}</span>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</p> </p>
...@@ -528,7 +558,8 @@ ...@@ -528,7 +558,8 @@
:TCNUM="item.TCNUM"> :TCNUM="item.TCNUM">
</commonBusInfo> </commonBusInfo>
<div slot="reference"> <div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.dingcheqk')}}</span> <span class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.dingcheqk')}}</span>
</div> </div>
</el-popover> </el-popover>
</p> </p>
...@@ -608,7 +639,8 @@ ...@@ -608,7 +639,8 @@
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;"> <p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
<span>{{$t('ground.bjd')}}</span> <span>{{$t('ground.bjd')}}</span>
<span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray"> <span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<el-tooltip :key="subIndex" class="item" effect="dark" :content="$t('objFill.dianjixzbjd')" placement="top"> <el-tooltip :key="subIndex" class="item" effect="dark" :content="$t('objFill.dianjixzbjd')"
placement="top">
<a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;" <a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;"
:href="subItem.Url" v-if="subItem.Url" target="_blank" :href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a> :download="subItem.Name">{{subItem.Name}}</a>
...@@ -762,7 +794,8 @@ ...@@ -762,7 +794,8 @@
</tr> </tr>
</table> </table>
<div slot="reference" :title="$t('objFill.xushenhexx')" <div slot="reference" :title="$t('objFill.xushenhexx')"
style="cursor:pointer;color:rgb(71,191,140);text-decoration:underline;width:50px;">{{$t('objFill.xushenhexx')}}</div> style="cursor:pointer;color:rgb(71,191,140);text-decoration:underline;width:50px;">
{{$t('objFill.xushenhexx')}}</div>
</el-popover> </el-popover>
</template> </template>
</div> </div>
...@@ -838,17 +871,21 @@ ...@@ -838,17 +871,21 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)"> <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
{{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item> <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,item.TCID,item)"> <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,item.TCID,item)">
{{$t('Operation.Op_dangtuanModify')}}</el-dropdown-item> {{$t('Operation.Op_dangtuanModify')}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}</el-button> style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}</el-button>
<template v-if="item.LineID==14||item.LineID==118"> <template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top" :content="$t('objFill.v101.dingftuis')"> <el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top"
:content="$t('objFill.v101.dingftuis')">
<el-button @click.native='PushMessage(item)' type="primary" <el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}} style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}}
</el-button> </el-button>
...@@ -872,7 +909,8 @@ ...@@ -872,7 +909,8 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template v-if="item.LineID==14||item.LineID==118"> <template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top" :content="$t('objFill.v101.dinchetuis')"> <el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top"
:content="$t('objFill.v101.dinchetuis')">
<el-button @click.native='PushBusMessage(item)' type="primary" <el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}} style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}}
</el-button> </el-button>
...@@ -914,7 +952,8 @@ ...@@ -914,7 +952,8 @@
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item> @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)"> <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}}</el-dropdown-item> {{$t('Operation.Op_xiajia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">{{$t('objFill.xiugaisjpt')}} <el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">
{{$t('objFill.xiugaisjpt')}}
</el-dropdown-item> </el-dropdown-item>
<!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断--> <!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断-->
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)"> <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
...@@ -931,7 +970,8 @@ ...@@ -931,7 +970,8 @@
{{$t('Operation.Op_salelianyun')}}</el-dropdown-item> {{$t('Operation.Op_salelianyun')}}</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}} <el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">{{$t('objFill.v101.chongxtjshe')}} <el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">
{{$t('objFill.v101.chongxtjshe')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<div @click='GoToleaderReimbursement(item)' style="color:red">{{$t('objFill.dijiecbzc')}} </div> <div @click='GoToleaderReimbursement(item)' style="color:red">{{$t('objFill.dijiecbzc')}} </div>
...@@ -1092,7 +1132,8 @@ ...@@ -1092,7 +1132,8 @@
</div> </div>
<!--复制行程信息--> <!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature"> <div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle">{{CopyTripAndFeatureMsg.updateType==1?$t('objFill.v101.fuzhixingc'):$t('objFill.v101.xiugaictriqi')}}</div> <div class="combottomTitle">
{{CopyTripAndFeatureMsg.updateType==1?$t('objFill.v101.fuzhixingc'):$t('objFill.v101.xiugaictriqi')}}</div>
<el-form label-width="100px"> <el-form label-width="100px">
<template v-if="CopyTripAndFeatureMsg.updateType==1"> <template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4"> <el-col :span="4">
...@@ -1476,17 +1517,19 @@ ...@@ -1476,17 +1517,19 @@
sMsg += this.$t('sm.xianluxingcheng'); sMsg += this.$t('sm.xianluxingcheng');
} }
if (item == 2) { if (item == 2) {
sMsg += "、"+this.$t('salesModule.TripSpecial'); sMsg += "、" + this.$t('salesModule.TripSpecial');
} }
}); });
} }
var cmdStr = "travel_post_CopyTripAndFeature" var cmdStr = "travel_post_CopyTripAndFeature"
var tipMsg = this.$t('objFill.v101.shifoujian')+'【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】'+this.$t('objFill.v101.di') + sMsg + ','+this.$t('objFill.v101.fuzhidao')+'【' + this.CopyTripAndFeatureMsg var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t(
.CurrentTCNUM + '】'+this.$t('commonPickUp.Pick_Team')+'?'; 'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?';
if (this.CopyTripAndFeatureMsg.updateType == 2) { if (this.CopyTripAndFeatureMsg.updateType == 2) {
cmdStr = "travel_post_SetTCStartDate"; cmdStr = "travel_post_SetTCStartDate";
tipMsg = this.$t('objFill.v101.shifouxiiug')+"【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】"+this.$t('objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate; tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t(
'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate;
} }
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
...@@ -1572,17 +1615,21 @@ ...@@ -1572,17 +1615,21 @@
//订车推送 //订车推送
if (type == 2) { if (type == 2) {
if (item.CarIsPush == 1) { if (item.CarIsPush == 1) {
resultStr += this.$t('objFill.v101.yitsdctssji')+':' + item.CarPushDate + '<br/>'+this.$t('objFill.v101.dianjkqxyche'); resultStr += this.$t('objFill.v101.yitsdctssji') + ':' + item.CarPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkqxyche');
} else if (item.CarIsPush == 2) { } else if (item.CarIsPush == 2) {
resultStr += this.$t('objFill.v101.yiquxdcqxsji')+':' + item.CarPushDate + '<br/>'+this.$t('objFill.v101.dianjkcxtsyche'); resultStr += this.$t('objFill.v101.yiquxdcqxsji') + ':' + item.CarPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkcxtsyche');
} }
} }
//订房推送 //订房推送
else if (type == 1) { else if (type == 1) {
if (item.IsPush == 1) { if (item.IsPush == 1) {
resultStr = this.$t('objFill.v101.yitusdftssj')+':' + item.HotelPushDate + '<br/> '+this.$t('objFill.v101.dianjkqxdf'); resultStr = this.$t('objFill.v101.yitusdftssj') + ':' + item.HotelPushDate + '<br/> ' + this.$t(
'objFill.v101.dianjkqxdf');
} else if (item.IsPush == 2) { } else if (item.IsPush == 2) {
resultStr = this.$t('objFill.v101.yiqxdftsqxsj')+':' + item.HotelPushDate + '<br/>'+this.$t('objFill.v101.dianjkcxtsdf'); resultStr = this.$t('objFill.v101.yiqxdftsqxsj') + ':' + item.HotelPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkcxtsdf');
} }
} }
return resultStr; return resultStr;
...@@ -2417,5 +2464,4 @@ ...@@ -2417,5 +2464,4 @@
this.getControlList(); this.getControlList();
} }
}; };
</script>
</script> \ No newline at end of file
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 21debbbb
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
.TC_Content .avatar-uploader-icon { .TC_Content .avatar-uploader-icon {
height: auto; height: auto;
} }
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
...@@ -295,9 +294,12 @@ ...@@ -295,9 +294,12 @@
<el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text="" <el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" /> active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails"> <div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</span> <span
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">{{$t('objFill.guonei')}}</span> style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">{{$t('Operation.Op_leaveCountry')}}</span> <span
style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">{{$t('objFill.guonei')}}</span>
<span
style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">{{$t('Operation.Op_leaveCountry')}}</span>
</div> </div>
</span> </span>
</div> </div>
...@@ -396,7 +398,8 @@ ...@@ -396,7 +398,8 @@
<span v-if="item.Status==2" <span v-if="item.Status==2"
:title="$t('objFill.jietuansj')+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span> :title="$t('objFill.jietuansj')+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span> <span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span>
<span v-if="item.OutGroupType==1" :title="$t('objFill.v101.myOrdersAllType.luodituan')" style="background: #ff9c00;">{{$t('objFill.v101.luo')}}</span> <span v-if="item.OutGroupType==1" :title="$t('objFill.v101.myOrdersAllType.luodituan')"
style="background: #ff9c00;">{{$t('objFill.v101.luo')}}</span>
<span v-if="item.Status==5" :title="$t('objFill.v101.jietuanshe')" <span v-if="item.Status==5" :title="$t('objFill.v101.jietuanshe')"
style="background: #2aaef2;">{{$t('objFill.v101.FinancialModule.shen')}}</span> style="background: #2aaef2;">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</div> </div>
...@@ -445,6 +448,30 @@ ...@@ -445,6 +448,30 @@
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}</span> <span class="go_date">{{item.StartDate}}</span>
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<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.RelationPriceList">
<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;">
{{item.RelationPriceList.length}}
</el-button>
</el-popover>
</el-tooltip>
</template>
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('objFill.jietuanriqi')}}</span> <span>{{$t('objFill.jietuanriqi')}}</span>
...@@ -464,7 +491,8 @@ ...@@ -464,7 +491,8 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckjdyudxq')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckjdyudxq')"
placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
...@@ -480,11 +508,13 @@ ...@@ -480,11 +508,13 @@
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckctyudxq')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.dianjckctyudxq')"
placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<span slot="reference" style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.cantyudqk')}}</span> <span slot="reference"
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.cantyudqk')}}</span>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
</p> </p>
...@@ -494,7 +524,8 @@ ...@@ -494,7 +524,8 @@
:TCNUM="item.TCNUM"> :TCNUM="item.TCNUM">
</commonBusInfo> </commonBusInfo>
<div slot="reference"> <div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.dingcheqk')}}</span> <span class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.v101.dingcheqk')}}</span>
</div> </div>
</el-popover> </el-popover>
</p> </p>
...@@ -602,7 +633,8 @@ ...@@ -602,7 +633,8 @@
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;"> <p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
<span>{{$t('ground.bjd')}}</span> <span>{{$t('ground.bjd')}}</span>
<span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray"> <span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<el-tooltip :key="subIndex" class="item" effect="dark" :content="$t('objFill.dianjixzbjd')" placement="top"> <el-tooltip :key="subIndex" class="item" effect="dark" :content="$t('objFill.dianjixzbjd')"
placement="top">
<a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;" <a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;"
:href="subItem.Url" v-if="subItem.Url" target="_blank" :href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a> :download="subItem.Name">{{subItem.Name}}</a>
...@@ -695,19 +727,23 @@ ...@@ -695,19 +727,23 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)"> <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
{{$t('Operation.Op_xilieModyfi')}} <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
</el-dropdown-item> {{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)"> <el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a;">{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}} style="background:#67c23a; border-color:#67c23a;">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<template v-if="item.LineID==14||item.LineID==118"> <template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top" :content="$t('objFill.v101.dingftuis')"> <el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top"
:content="$t('objFill.v101.dingftuis')">
<el-button @click.native='PushMessage(item)' type="primary" <el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}} style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}}
</el-button> </el-button>
...@@ -731,7 +767,8 @@ ...@@ -731,7 +767,8 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template v-if="item.LineID==14||item.LineID==118"> <template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top" :content="$t('objFill.v101.dinchetuis')"> <el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top"
:content="$t('objFill.v101.dinchetuis')">
<el-button @click.native='PushBusMessage(item)' type="primary" <el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}} style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}}
</el-button> </el-button>
...@@ -773,7 +810,8 @@ ...@@ -773,7 +810,8 @@
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}} @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">{{$t('objFill.xiugaisjpt')}} <el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">
{{$t('objFill.xiugaisjpt')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)"> <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}} {{$t('Operation.Op_xiajia')}}
...@@ -938,7 +976,8 @@ ...@@ -938,7 +976,8 @@
</div> </div>
<!--复制行程信息--> <!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature"> <div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle">{{CopyTripAndFeatureMsg.updateType==1?$t('objFill.v101.fuzhixingc'):$t('objFill.v101.xiugaictriqi')}}</div> <div class="combottomTitle">
{{CopyTripAndFeatureMsg.updateType==1?$t('objFill.v101.fuzhixingc'):$t('objFill.v101.xiugaictriqi')}}</div>
<el-form label-width="100px"> <el-form label-width="100px">
<template v-if="CopyTripAndFeatureMsg.updateType==1"> <template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4"> <el-col :span="4">
...@@ -1303,17 +1342,19 @@ ...@@ -1303,17 +1342,19 @@
sMsg += this.$t('sm.xianluxingcheng'); sMsg += this.$t('sm.xianluxingcheng');
} }
if (item == 2) { if (item == 2) {
sMsg += "、"+this.$t('salesModule.TripSpecial'); sMsg += "、" + this.$t('salesModule.TripSpecial');
} }
}); });
} }
var cmdStr = "travel_post_CopyTripAndFeature" var cmdStr = "travel_post_CopyTripAndFeature"
var tipMsg = this.$t('objFill.v101.shifoujian')+'【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】'+this.$t('objFill.v101.di') + sMsg + ','+this.$t('objFill.v101.fuzhidao')+'【' + this.CopyTripAndFeatureMsg var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t(
.CurrentTCNUM + '】'+this.$t('commonPickUp.Pick_Team')+'?'; 'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?';
if (this.CopyTripAndFeatureMsg.updateType == 2) { if (this.CopyTripAndFeatureMsg.updateType == 2) {
cmdStr = "travel_post_SetTCStartDate"; cmdStr = "travel_post_SetTCStartDate";
tipMsg = this.$t('objFill.v101.shifouxiiug')+"【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】"+this.$t('objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate; tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t(
'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate;
} }
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
...@@ -1349,17 +1390,21 @@ ...@@ -1349,17 +1390,21 @@
//订车推送 //订车推送
if (type == 2) { if (type == 2) {
if (item.CarIsPush == 1) { if (item.CarIsPush == 1) {
resultStr += this.$t('objFill.v101.yitsdctssji')+':' + item.CarPushDate + '<br/>'+this.$t('objFill.v101.dianjkqxyche'); resultStr += this.$t('objFill.v101.yitsdctssji') + ':' + item.CarPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkqxyche');
} else if (item.CarIsPush == 2) { } else if (item.CarIsPush == 2) {
resultStr += this.$t('objFill.v101.yiquxdcqxsji')+':' + item.CarPushDate + '<br/>'+this.$t('objFill.v101.dianjkcxtsyche'); resultStr += this.$t('objFill.v101.yiquxdcqxsji') + ':' + item.CarPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkcxtsyche');
} }
} }
//订房推送 //订房推送
else if (type == 1) { else if (type == 1) {
if (item.IsPush == 1) { if (item.IsPush == 1) {
resultStr = this.$t('objFill.v101.yitusdftssj')+':' + item.HotelPushDate + '<br/> '+this.$t('objFill.v101.dianjkqxdf'); resultStr = this.$t('objFill.v101.yitusdftssj') + ':' + item.HotelPushDate + '<br/> ' + this.$t(
'objFill.v101.dianjkqxdf');
} else if (item.IsPush == 2) { } else if (item.IsPush == 2) {
resultStr = this.$t('objFill.v101.yiqxdftsqxsj')+':' + item.HotelPushDate + '<br/>'+this.$t('objFill.v101.dianjkcxtsdf'); resultStr = this.$t('objFill.v101.yiqxdftsqxsj') + ':' + item.HotelPushDate + '<br/>' + this.$t(
'objFill.v101.dianjkcxtsdf');
} }
} }
return resultStr; return resultStr;
...@@ -2298,5 +2343,4 @@ ...@@ -2298,5 +2343,4 @@
this.getControlList() this.getControlList()
} }
} }
</script>
</script> \ No newline at end of file
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 21debbbb
...@@ -587,8 +587,8 @@ ...@@ -587,8 +587,8 @@
</p> </p>
</template> </template>
<template> <template>
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading" <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
@click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}} :loading="downLoadloading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
</el-button> </el-button>
</template> </template>
</td> </td>
......
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