Skip to content

S
SuperMan
Commit d352d0b6 authored by youjie's avatar youjie
Browse files
Options

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

parents 29405259 b7a8c608
Hide whitespace changes
Inline Side-by-side
Showing with 3608 additions and 3411 deletions
src/assets/common/lang/EN/fill.js
View file @ d352d0b6
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'Click to open tickets for sale',
jietuanriqi: 'Knot date',
xilietxbm: 'Series Group New Layout',
xilietdate: 'Series Group Date',
dangtuanxbm: 'New Layout of Dangtuan',
xiazaiqiyueshu: "Download The Contract",
tuisongxiaoxi: 'Push message',
......
src/assets/common/lang/Japan/fill.js
View file @ d352d0b6
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'クリックして航空券を販売することができます',
jietuanriqi: '結団日',
xilietxbm: 'シリーズ団新版面',
xilietdate: 'シリーズ団期',
dangtuanxbm: '契約書のダウンロード',
xiazaiqiyueshu:"下載契約書",
tuisongxiaoxi: 'プッシュメッセージ',
......
src/assets/common/lang/zhCN/fill.js
View file @ d352d0b6
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '点击开启可售机票',
jietuanriqi: '结团日期',
xilietxbm: '系列团新版面',
xilietdate: '系列团期',
dangtuanxbm: '当团新版面',
xiazaiqiyueshu:"下载契约书",
tuisongxiaoxi: '推送消息',
......
src/assets/common/lang/zhTW/fill.js
View file @ d352d0b6
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '點擊開啓可售機票',
jietuanriqi: '結團日期',
xilietxbm: '系列團新版面',
xilietdate: '系列團期',
dangtuanxbm: '當團新版面',
xiazaiqiyueshu: "下載契約書",
tuisongxiaoxi: '推送消息',
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d352d0b6
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 @ d352d0b6
......@@ -68,12 +68,16 @@
color: green;
}
.comSearchDiv .el-checkbox {
margin-right: 0;
}
</style>
<template>
<div>
<div class="TC_Content TC-MyList">
<div class="query-box">
<div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1">
<!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
......@@ -84,13 +88,24 @@
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
@change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
:key="item.LineID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
......@@ -125,11 +140,15 @@
:placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_TeamName')}}</em>
<el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
</span>
</li>
<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"
......@@ -277,9 +296,12 @@
<el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
<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 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>
<span
style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</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>
</span>
</div>
......@@ -372,13 +394,15 @@
<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')"
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"
:title="$t('objFill.jietuansj')+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==5" :title="$t('objFill.jietuanshz')"
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.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;">
{{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:$t('ground.dantuan')}}
</label>
......@@ -483,6 +507,30 @@
<p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</span>
{{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 class="travelnowrap">
<span>{{$t('objFill.jietuanriqi')}}</span>
......@@ -498,7 +546,8 @@
</p>
<p
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">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......@@ -514,11 +563,13 @@
</p>
<p
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">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
: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-tooltip>
</p>
......@@ -528,7 +579,8 @@
:TCNUM="item.TCNUM">
</commonBusInfo>
<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>
</el-popover>
</p>
......@@ -608,7 +660,8 @@
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
<span>{{$t('ground.bjd')}}</span>
<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;"
:href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a>
......@@ -762,7 +815,8 @@
</tr>
</table>
<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>
</template>
</div>
......@@ -838,17 +892,21 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<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)">
{{$t('Operation.Op_dangtuanModify')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<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">
<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"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}}
</el-button>
......@@ -872,7 +930,8 @@
</el-tooltip>
</template>
<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"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}}
</el-button>
......@@ -914,7 +973,8 @@
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$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>
<!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断-->
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
......@@ -931,7 +991,8 @@
{{$t('Operation.Op_salelianyun')}}</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</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>
<div @click='GoToleaderReimbursement(item)' style="color:red">{{$t('objFill.dijiecbzc')}} </div>
......@@ -1092,7 +1153,8 @@
</div>
<!--复制行程信息-->
<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">
<template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4">
......@@ -1188,6 +1250,8 @@
queryCommonData: {
//线路列表
LineList: [],
//目的地
PlaceList: [],
//系列列表
LineTeamList: [],
//下拉框默认值
......@@ -1253,6 +1317,7 @@
pageIndex: 1,
pageSize: 10,
LineId: 0,
PlaceID: 0,
LineIdList: [],
LineteamId: 0,
TCNUM: "",
......@@ -1288,7 +1353,8 @@
//是否显示联运
IsShowUnion: -1,
//团控状态
FreePlanType: -1
FreePlanType: -1,
Title: "", //团名
},
CurrentUserInfo: {},
showHotelObj: {
......@@ -1476,17 +1542,19 @@
sMsg += this.$t('sm.xianluxingcheng');
}
if (item == 2) {
sMsg += "、"+this.$t('salesModule.TripSpecial');
sMsg += "、" + this.$t('salesModule.TripSpecial');
}
});
}
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
.CurrentTCNUM + '】'+this.$t('commonPickUp.Pick_Team')+'?';
var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t(
'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?';
if (this.CopyTripAndFeatureMsg.updateType == 2) {
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.saveLoading = true;
......@@ -1572,17 +1640,21 @@
//订车推送
if (type == 2) {
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) {
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) {
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) {
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;
......@@ -1703,6 +1775,20 @@
}
});
},
//获取目的地列表
getLinePlaceList() {
this.queryMsg.PlaceID = 0;
this.queryMsg.LineteamId = 0;
let msg = {
lineID: this.queryMsg.LineId
};
this.apipost("team_post_GetLinePlace", msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data;
this.queryCommonData.LineTeamList = [];
}
});
},
//获取系列列表
getLineTeamList() {
this.queryMsg.LineteamId = 0;
......@@ -2405,9 +2491,8 @@
myDate.getDate();
this.queryMsg.StartGroupDate = nowDate;
}
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
userInfo.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252) {
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
}
//默认查询全部团队状态
......@@ -2417,5 +2502,4 @@
this.getControlList();
}
};
</script>
</script>
\ No newline at end of file
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ d352d0b6
......@@ -81,7 +81,6 @@
.TC_Content .avatar-uploader-icon {
height: auto;
}
</style>
<template>
<div class="TC_Content">
......@@ -140,6 +139,12 @@
@keyup.native="checkInteger(queryMsg,'TCID')" maxlength="6"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_TeamName')}}</em>
<el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
......@@ -295,9 +300,12 @@
<el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
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">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</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>
<span
style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">{{$t('objFill.danxiang')}}</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>
</span>
</div>
......@@ -396,7 +404,8 @@
<span v-if="item.Status==2"
: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.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')"
style="background: #2aaef2;">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</div>
......@@ -445,6 +454,30 @@
<p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</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 class="travelnowrap">
<span>{{$t('objFill.jietuanriqi')}}</span>
......@@ -464,7 +497,8 @@
</p>
<p
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">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......@@ -480,11 +514,13 @@
</p>
<p class="travelnowrap"
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">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
: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-tooltip>
</p>
......@@ -494,7 +530,8 @@
:TCNUM="item.TCNUM">
</commonBusInfo>
<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>
</el-popover>
</p>
......@@ -602,7 +639,8 @@
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
<span>{{$t('ground.bjd')}}</span>
<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;"
:href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a>
......@@ -695,19 +733,23 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<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>
<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"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dingftuis')}}
</el-button>
......@@ -731,7 +773,8 @@
</el-tooltip>
</template>
<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"
style="background:#00C6FF; border-color:#00C6FF;">{{$t('objFill.v101.dinchetuis')}}
</el-button>
......@@ -773,7 +816,8 @@
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
</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 v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}}
......@@ -938,7 +982,8 @@
</div>
<!--复制行程信息-->
<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">
<template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4">
......@@ -1133,6 +1178,7 @@
TeamType: 2, //一日游的团
IsShowUnion: -1,
TCID: '',
Title:"",//团名
},
remarkMsg: {
TCID: 0,
......@@ -1303,17 +1349,19 @@
sMsg += this.$t('sm.xianluxingcheng');
}
if (item == 2) {
sMsg += "、"+this.$t('salesModule.TripSpecial');
sMsg += "、" + this.$t('salesModule.TripSpecial');
}
});
}
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
.CurrentTCNUM + '】'+this.$t('commonPickUp.Pick_Team')+'?';
var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t(
'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?';
if (this.CopyTripAndFeatureMsg.updateType == 2) {
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.saveLoading = true;
......@@ -1349,17 +1397,21 @@
//订车推送
if (type == 2) {
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) {
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) {
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) {
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;
......@@ -2298,5 +2350,4 @@
this.getControlList()
}
}
</script>
</script>
\ No newline at end of file
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ d352d0b6
......@@ -587,8 +587,8 @@
</p>
</template>
<template>
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading"
@click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
:loading="downLoadloading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
</el-button>
</template>
</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