Skip to content

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

报价单和当地游查询调整

parent 9ecdf986
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 451 deletions
src/assets/common/lang/EN/Ground.js
View file @ d557305a
......@@ -540,7 +540,7 @@ export const obj = {
cxlindui:' Re-elect the leader ',
szlindui:' Set the leader ',
glxiaoshou:' Related sales ',
lduikongwei:' Lead position ',
lduikongwei:'Leader position',
xgtcheng:' Modify commission ',
szewaijine:' Set extra amount ',
......
src/assets/common/lang/Japan/Ground.js
View file @ d557305a
......@@ -557,7 +557,7 @@ export const obj = {
cxlindui:'監督を再選する',
szlindui:'リーダーを置く',
glxiaoshou:'関連販売',
lduikongwei:'監督コントロール',
lduikongwei:'リーダー制御',
xgtcheng:'修正して抽出する',
szewaijine:'追加金額を設定',
......
src/assets/common/lang/zh-tw.js
View file @ d557305a
......@@ -2106,7 +2106,7 @@ export const salesModule={
backUnion:"回程聯運",
LYtime:'去程聯運時間',
backUnionTime:"回程聯運時間",
BackCity:'返回都市',
BackCity:'返回城市',
TeamPrice:'本團單價',
StartLY:'出發聯運價',
BackLY:'返回聯運價',
......
src/assets/common/lang/zhTW/Ground.js
View file @ d557305a
......@@ -542,7 +542,7 @@ tuanbao:'團報',
cxlindui:'重選領隊',
szlindui:'設定領隊',
glxiaoshou:'關聯銷售',
lduikongwei:'領隊控比特',
lduikongwei:'領隊控位',
xgtcheng:'修改提成',
szewaijine:'設定額外金額',
......
src/components/SalesModule/productQueryOne2.vue
View file @ d557305a
......@@ -230,7 +230,6 @@
.productQuerybottomLayer .el-upload-list {
width: 200px;
}
</style>
<template>
<div class="flexOne">
......@@ -273,13 +272,20 @@
<el-input v-model='msg.TCID' class='w150'></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_TeamName')}}</em>
<el-input v-model="msg.Title" class="w150" clearable></el-input>
</span>
</li>
<li><span><em>{{$t('hotel.hotel_StarDate')}}</em>
<!-- <el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime"
@change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
-
<el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
<el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li style="height:34px;line-height:34px;padding: 0 0 0 20px;vertical-align: middle;">
......@@ -384,7 +390,8 @@
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
<el-dialog custom-class='w450' :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center>
<el-dialog custom-class='w450' :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
</tripDownLoadCommon>
</el-dialog>
......@@ -499,7 +506,7 @@
GatherAddress: '',
LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID
LuggageNum:''//行李数量
LuggageNum: '', //行李数量
},
GuestList: [{
SurName: '',
......@@ -649,7 +656,8 @@
TCIDList: '',
WarningQuery: '-1',
RateOnDay: '-1',
RateOn: '-1'
RateOn: '-1',
Title: "", //团名
},
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
list: [],
......@@ -738,7 +746,7 @@
}
return x1 + x2;
},
},
methods: {
goB2Bdetail(ConfigId, tcid) {
......@@ -1453,7 +1461,7 @@
this.addMsg.TripleRoomNum = '0'
this.addMsg.TradeDate = ''
this.addMsg.CostType = ''
this.addMsg.LuggageNum=''
this.addMsg.LuggageNum = ''
this.addMsg.PlatformOrder = ''
this.ddlyList = []
this.addMsg.Remarks = ''
......@@ -1784,7 +1792,7 @@
let text = this.$t('pub.unlimitedSel')
this.companyList = [{
Id: '-1',
BName: text
BName: text
}];;
res.data.data.forEach(x => {
var obj = {
......@@ -1882,5 +1890,4 @@
}
}
</script>
</script>
\ No newline at end of file
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ d557305a
......@@ -167,7 +167,8 @@
<div>{{$t('salesModule.Adult')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('Airticket.Air_salesPrice')}}：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
<span
class="pLeftPrice">{{$t('Airticket.Air_salesPrice')}}：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
</div>
</div>
<div>{{$t('op.Child')}}</div>
......@@ -229,9 +230,8 @@
</div>
</div>
<div class="AuditStatus">
<div v-if="item.TravelState==2">
<div>
<div style="color:red;">
<template v-if="item.ManagerAduitDate==''&&item.ManagerId>0">
{{item.ManagerAduitName}}
</template>
......@@ -242,7 +242,7 @@
</div>
</div>
<div v-if="item.TravelState==6">
<div>
<div style="color:red;">
<template v-if="item.ChangeManagerAduitDate==''&&item.ChangeManagerId>0">
{{item.ChangeManagerAduitName}}
</template>
......@@ -332,20 +332,21 @@
<span @click="offerAudit(item,1)">{{$t('objFill.v101.cha')}}</span>
</el-tooltip>
</span>
<span class="openGroup opbdList" v-if="item.TravelState==2">
<span class="openGroup opbdList" v-if="activeName==2&&item.TravelState==2">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,2)">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</el-tooltip>
</span>
<span class="openGroup opbdList" v-if="item.TravelState==6">
<span class="openGroup opbdList" v-if="activeName==2&&item.TravelState==6">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,4)">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</el-tooltip>
</span>
<span class="openGroup opbdList" v-if="item.TravelState==3">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.bohuicxtz')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.bohuicxtz')" placement="top-start"
popper-class="max-w250">
<span @click="refuseOffer(item)">{{$t('objFill.v101.bo')}}</span>
</el-tooltip>
</span>
......@@ -368,7 +369,8 @@
</div>
</div>
</div>
<span slot="reference" class="AuditLogSpan" @click="getAudiDanLog(item.ID)">{{$t('objFill.v101.zhi')}}</span>
<span slot="reference" class="AuditLogSpan"
@click="getAudiDanLog(item.ID)">{{$t('objFill.v101.zhi')}}</span>
</el-popover>
</el-tooltip>
</span>
......@@ -481,7 +483,7 @@
expectInfo(logIndex) {
var flag = this.AuditLogList[logIndex].isShow;
this.AuditLogList[logIndex].isShow = !flag;
let arrText = [this.$t('pub.closeSel'),this.$t('fnc.zhankai')]
let arrText = [this.$t('pub.closeSel'), this.$t('fnc.zhankai')]
if (this.AuditLogList[logIndex].isShow) {
this.AuditLogList[logIndex].expectName = arrText[0];
} else {
......@@ -569,7 +571,7 @@
OfferPayType: 0,
TeamType: item.TeamType,
};
var str = this.$t('objFill.v101.shifouboh')+"【" + item.TCNUMS + "】"+this.$t('objFill.v101.debaojiad');
var str = this.$t('objFill.v101.shifouboh') + "【" + item.TCNUMS + "】" + this.$t('objFill.v101.debaojiad');
this.Confirm(str, function () {
that.apipost(
"travel_get_AuditTravelOffer", nObj,
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ d557305a
......@@ -230,7 +230,7 @@
</div>
<div class="AuditStatus" style="width:80px;">
<div v-if="item.TravelState==2">
<div> <template v-if="item.ManagerAduitDate==''&&item.ManagerId>0">
<div style="color:red;"> <template v-if="item.ManagerAduitDate==''&&item.ManagerId>0">
{{item.ManagerAduitName}}
</template>
<template v-else>
......@@ -240,7 +240,7 @@
</div>
</div>
<div v-if="item.TravelState==6">
<div>
<div style="color:red;">
<template v-if="item.ChangeManagerAduitDate==''&&item.ChangeManagerId>0">
{{item.ChangeManagerAduitName}}
</template>
......@@ -352,7 +352,7 @@
<i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>
</el-tooltip>
</span>
<span class="bianji newAopbdd" v-if="item.TravelState==3||item.TravelState==7||item.TravelState==8">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baojdbgen')" placement="top-start"
popper-class="max-w250">
......
src/components/index.vue
View file @ d557305a
......@@ -112,12 +112,12 @@
<span v-if="!useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #a6adb4;"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:13px"></i>{{$t('pub.more')}}:</span>
style="margin-right: 5px;font-size:13px"></i>{{$t('pub.more')}}</span>
</span>
<span v-if="useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #FFF;font-size:15px"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:12px"></i>{{$t('pub.more')}}:</span>
style="margin-right: 5px;font-size:12px"></i>{{$t('pub.more')}}</span>
</span>
<el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown">
<el-dropdown-item class="clearfix _dropdown_other" v-for="(item,index) in menuList" :key="index"
......
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