Skip to content

S
SuperMan
Commit 3c703a89 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 87668817 3e69c777
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 396 deletions
src/assets/common/lang/jp.js
View file @ 3c703a89
......@@ -427,7 +427,7 @@ export const admin={ //行政
leader_leaderGuid:'添乗員/ガイド',　　　　　　　　　　　　　　
leader_Leader:'添乗員',　　　　　　　　　　　　　　　　　　　　　
leader_Guide:'ガイド',　　　　　　　　　　　　　　　　　　　　　
leader_schedule:'パフォーマンス',　　　　　　　　　　　　　　　　　　　
leader_schedule:'档期',　　　　　　　　　　　　　　　　　　　
leader_performance:'绩效',　　　　　　　　　　　　　　　　　
leader_Sex:'性別',　　　　　　　　　　　　　　　　　　　　　　　
leader_List:'添乗員/ガイドパフォーマンスリーダーボード',　　　　　
......@@ -440,6 +440,10 @@ export const admin={ //行政
leader_Inreception:'仕事中',　　　　　　　　　　　
leader_noStart:'未開始',　　　　　　　　　　　　　
leader_HasCompleted:'完成済み',　
leader_ScheduleType:'アーカイブ型',
leader_Vacation:'休暇',
leader_LandG:'リーダー兼ガイド',
}
//餐厅
export const restaurant = {
......@@ -1375,7 +1379,7 @@ export const Operation = {
Op_people:'人',
Op_takeSeat:'占位',
Op_nozhipai:'まだ割り当てていない',
op_caozuoop:'操作op',
Op_caozuoop:'オペレーションop',
Op_bindNum:'バインディング数',
Op_Warmprompt:'スイート・ヒント',
Op_registrationList:'エントリーリスト',
......@@ -1384,11 +1388,11 @@ export const Operation = {
Op_advertising:'広告',
Op_remark:'OP備考',
Op_moreOperation:'さらなる操作',
op_shouzhidetail: 'チームの収支の明細',
Op_shouzhidetail: 'チームの収支の明細',
Op_tripDownLoad:'ストロークダウンロード',
Op_shangjia:'上架',
Op_xiajia:'下架',
op_shourudan:'収入確認書',
Op_shourudan:'収入確認書',
Op_b2bView:'B2Bプレビュー',
Op_salelianyun:'別売連運',
Op_bentuanMaidian:'このグループのセールスポイント',
......@@ -1403,7 +1407,7 @@ export const Operation = {
Op_scTrip:' WORDストロークをアップロードする',
Op_longTerm:'長線',
Op_shortTerm:'短線',
op_hetuan: '団団号',
Op_hetuan: '団団号',
Op_shipNum:'ハッチ',
Op_chaifen:'チーム分け',
Op_orderNum:'収容定員数',
......@@ -1740,7 +1744,7 @@ export const visaT = {
Addingsuppliers:'ベンダーを追加する',
Vendortemplate:'ベンダーテンプレート',
xiugaigysxx:'修正ベンダー情報',
Accountmanagement:'アカウント管理',
Accountmanagement:'アカウ管理',
qsrgysname:'プロバイダ名を入力してください。',
qsradder:'アドレスを入力してください。',
qxzguojia:'国家を選んでください',
......@@ -2475,8 +2479,81 @@ export const op={
qxzsuosxl:'所属線を選んでください',
qtxmddmc:'目的地名を記入してください。',
XilieName:'シリーズ名',
StaffName:'スタッフ名',
BL:'比例',
Zhi:'直',
Fei:'非',
SalesPrice:'販売定価',
TYmember:'同業会員',
TakeBed:'ベッドを占める',
Child:'子供は',
NoneedBed:'ベッドをとらない',
Surcharge:'割増料金',
SingleQuotes:'単発オファー',
Qi:'から',
Kai:'开く',
FFBDowmLoad:'分房表下載',
Fenfang:'分譲',
DJyiguanbi:'地接はすでにホテルを閉鎖して操作して、もし修正する必要があるならばOPに連絡してください',
RTXF:'人頭チップ',
TodayClicks:'今日のクリック数',
TotalClicks:'総クリック数',
TicketNum:'航空券の数',
CenterPNR:'中段PNR',
Tickets:'入场券贩売',
FlightToNum:'総機数',
Setjingpin:'逸品推奨とする',
CancelSetjp:'キャンセルして逸品にする',
HotelXJ:'ホテルの下',
UploadFFB:'分房表をアップロードする',
LookPassengerSurvey:'旅客調査を見る',
DJBZTH:'地接備団号',
CompanyLeader:'会社のリーダー',
THLeader:'同行添乗員',
LXLeader:'臨時添乗員',
JWPhone:'域外電話',
AccountOverdue:'アカウントの期限切れ',
TDHT:'チーム合団',
HE:'合',
TQBH:'団番',
Zong:'総',
Sheng:'残りの',
ChoiceMonth:'選択月',
Addschedule:'アーカイブの追加',
LeaderGuildName:'リーダー/ガイド名',
SysCantuan:'システム参加グループ',
DQZL:'アーカイブ',
WEI:'尾',
EndDate:'締め切り日',
Procurement:'仕掛人',
CaiGou:'仕入れ',
IsBind:'バインディングの有無',
PurchaseNumber:'仕入れ番号',
Inversion:'トランス位',
TransferredOut:'転任した',
OpSure:'注:残りの席は他のOP要員に譲ることができるが,相手の確認が必要である',
TransferedNum:'机位数を譲る',
RequestDis:'需要記述',
DealPeople:'処理人',
CostTime:'もつれる',
TicketNeedDAN:'航空券需要',
IsTransit:'中継するか',
Send:'送信',
MainGroup:'主団',
DistributionGroup:'しはん団',
TotalMoney:'総額',
Tocollected:'待受け取って',
TourNum:'旅客総数',
CancelNum:'キャンセル数',
TotalRoomNum:'総部屋数',
CanCelRoomNum:'部屋数をキャンセルする',
JapnaseYen:'円(税込/税抜き)',
RYCBJ:'円原価',
RZLDR:'入居/離店時間',
UpdateCBJ:'修正原価',
RYHS:'円税込価格',
RYBHS:'円税抜き価格',
Tiquan:'票劵',
CZOP:'オペレーションOP',
}
\ No newline at end of file
src/assets/common/lang/zh-tw.js
View file @ 3c703a89
......@@ -450,6 +450,10 @@ export const admin={ //行政
leader_Inreception:'接待中',
leader_noStart:'未開始',
leader_HasCompleted:'已完成',
leader_ScheduleType:'檔期類型',
leader_Vacation:'休暇',
leader_LandG:'リーダー兼ガイド',
}
//餐厅
......@@ -2472,9 +2476,83 @@ export const op={
qtxxianlumc:'請填寫線路名',
qxzsuosxl:'請選擇所屬線路',
qtxmddmc:'請填寫目的地名稱',
XilieName:'系列名',
StaffName:'員工名稱',
BL:'比例',
Zhi:'直',
Fei:'非',
SalesPrice:'銷售定價',
TYmember:'同業會員',
TakeBed:'占床',
Child:'小孩',
NoneedBed:'不占床',
Surcharge:'附加費',
SingleQuotes:'單項報價',
Qi:'起',
Kai:'開',
FFBDowmLoad:'分房錶下載',
Fenfang:'分房',
DJyiguanbi:'地接已關閉飯店操作，如需修改請聯系地接OP',
RTXF:'人頭小費',
TodayClicks:'今日點擊量',
TotalClicks:'總點擊量',
TicketNum:'機票數量',
CenterPNR:'中段PNR',
Tickets:'票務',
FlightToNum:'總機位數',
Setjingpin:'設為精品推薦',
CancelSetjp:'取消設為精品',
HotelXJ:'飯店下架',
UploadFFB:'上傳分房錶',
LookPassengerSurvey:'查看旅客調查',
DJBZTH:'地接備註團號',
CompanyLeader:'公司領隊',
THLeader:'同行領隊',
LXLeader:'臨時領隊',
JWPhone:'境外電話',
AccountOverdue:'帳號過期',
TDHT:'團隊合團',
HE:'合',
TQBH:'團期編號',
Zong:'總',
Sheng:'剩',
ChoiceMonth:'選擇月',
Addschedule:'新增檔期',
LeaderGuildName:'領隊/導遊姓名',
SysCantuan:'系統參團',
DQZL:'檔期資料',
WEI:'尾',
EndDate:'截止日期',
Procurement:'採購人',
CaiGou:'採購',
IsBind:'是否綁定',
PurchaseNumber:'採購編號',
Inversion:'轉位',
TransferredOut:'轉出餘比特',
OpSure:'注：餘比特轉出是指可以把剩餘座位轉讓給其他的OP人員，但是需要得到對方的確認',
TransferedNum:'轉讓機位數',
RequestDis:'需求描述',
DealPeople:'處理人',
CostTime:'耗時',
TicketNeedDAN:'機票需求單',
IsTransit:'是否中轉',
Send:'發送',
MainGroup:'主團',
DistributionGroup:'分銷團',
TotalMoney:'總價',
Tocollected:'待收',
TourNum:'旅客總數',
CancelNum:'取消數',
TotalRoomNum:'總房間數',
CanCelRoomNum:'取消房間數',
JapnaseYen:'日元（含稅/不含稅）',
RYCBJ:'日元成本價',
RZLDR:'入住/離店時間',
UpdateCBJ:'修改成本價',
RYHS:'日元含稅價',
RYBHS:'日元不含稅價',
Tiquan:'票劵',
CZOP:'操作OP',
}
......
src/assets/common/lang/zh.js
View file @ 3c703a89
......@@ -451,6 +451,9 @@ export const admin={ //行政
leader_Inreception:'接待中',
leader_noStart:'未开始',
leader_HasCompleted:'已完成',
leader_ScheduleType:'档期类型',
leader_Vacation:'休假',
leader_LandG:'領隊兼導遊',
}
//餐厅
......@@ -1654,7 +1657,6 @@ export const adm={
adm_xbdkdizhi:"下班打卡地址",
adm_dkshebei:"打卡设备",
adm_timenomorethan:"时间跨度不能超过31天!",
adm_time:"时间",
adm_exportexcel:"导出报表",
adm_Sunday:"星期日",
adm_Monday:"星期一",
......@@ -2492,6 +2494,80 @@ export const op={
XilieName:'系列名',
StaffName:'员工名称',
BL:'比例',
Zhi:'直',
Fei:'非',
SalesPrice:'销售定价',
TYmember:'同业会员',
TakeBed:'占床',
Child:'小孩',
NoneedBed:'不占床',
Surcharge:'附加费',
SingleQuotes:'单项报价',
Qi:'起',
Kai:'开',
FFBDowmLoad:'分房表下载',
Fenfang:'分房',
DJyiguanbi:'地接已关闭酒店操作,如需修改请联系地接OP',
RTXF:'人头小费',
TodayClicks:'今日点击量',
TotalClicks:'总点击量',
TicketNum:'机票数量',
CenterPNR:'中段PNR',
Tickets:'票务',
FlightToNum:'总机位数',
Setjingpin:'设为精品推荐',
CancelSetjp:'取消设为精品',
HotelXJ:'酒店下架',
UploadFFB:'上传分房表',
LookPassengerSurvey:'查看旅客调查',
DJBZTH:'地接备注团号',
CompanyLeader:'公司领队',
THLeader:'同行领队',
LXLeader:'临时领队',
JWPhone:'境外电话',
AccountOverdue:'账号过期',
TDHT:'团队合团',
HE:'合',
TQBH:'团期编号',
Zong:'总',
Sheng:'剩',
ChoiceMonth:'选择月',
Addschedule:'新增档期',
LeaderGuildName:'领队/导游姓名',
SysCantuan:'系统参团',
DQZL:'档期资料',
WEI:'尾',
EndDate:'截止日期',
Procurement:'采购人',
CaiGou:'采购',
IsBind:'是否绑定',
PurchaseNumber:'采购编号',
Inversion:'转位',
TransferredOut:'转出余位',
OpSure:'注：余位转出是指可以把剩余座位转让给其他的OP人员，但是需要得到对方的确认',
TransferedNum:'转让机位数',
RequestDis:'需求描述',
DealPeople:'处理人',
CostTime:'耗时',
TicketNeedDAN:'机票需求单',
IsTransit:'是否中转',
Send:'发送',
MainGroup:'主团',
DistributionGroup:'分销团',
TotalMoney:'总价',
Tocollected:'待收',
TourNum:'旅客总数',
CancelNum:'取消数',
TotalRoomNum:'总房间数',
CanCelRoomNum:'取消房间数',
JapnaseYen:'日元(含税/不含税)',
RYCBJ:'日元成本价',
RZLDR:'入住/离店时间',
UpdateCBJ:'修改成本价',
RYHS:'日元含税价',
RYBHS:'日元不含税价',
Tiquan:'票劵',
CZOP:'操作OP',
}
import invoicesManager from './zhCN/invoicesManager'
......
src/components/BusExport.vue
View file @ 3c703a89
......@@ -126,11 +126,11 @@
<table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;">
<tr>
<th>做账主体</th>
<th width="200">团号</th>
<th width="250">团号</th>
<th>单号</th>
<th>车配号</th>
<th style="width:20%">{{msg.CurrName}}</th>
<th style="width:20%">人民币</th>
<th style="width:19%">人民币</th>
</tr>
<tr v-for="subItem in item.RBobj">
<td class="txLeft">{{subItem.BranchName}}</td>
......
src/components/LeaderManagement/leaderScheduleManager.vue
View file @ 3c703a89
......@@ -374,7 +374,7 @@
<ul>
<li>
<span>
<em>领队/导游</em>
<em>{{$t('leader.leader_leaderGuid')}}</em>
<el-select v-model="msg.LeaderId" filterable :placeholder="$t('admin.admin_phBirthPlace')" class="w210">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"> </el-option>
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
......@@ -384,25 +384,25 @@
</li>
<li>
<span>
<em>档期类型</em>
<em>{{$t('leader.leader_ScheduleType')}}</em>
<el-select v-model="msg.ScheduleType" filterable :placeholder="$t('admin.admin_phBirthPlace')" class="w210">
<el-option :label="$t('system.ph_buxian')" :value='0'></el-option>
<el-option label="休假" value='1'></el-option>
<el-option label="领队" value='2'></el-option>
<el-option label="领队兼导游" value='3'></el-option>
<el-option label="导游" value='4'></el-option>
<el-option :label="$t('leader.leader_Vacation')" value='1'></el-option>
<el-option :label="$t('leader.leader_Leader')" value='2'></el-option>
<el-option :label="$t('leader.leader_LandG')" value='3'></el-option>
<el-option :label="$t('leader.leader_Guide')" value='4'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>时间</em>
<el-date-picker v-model="msg.YearMonth" value-format="yyyy-MM" type="month" placeholder="选择月">
<em>{{$t('adm.adm_time')}}</em>
<el-date-picker v-model="msg.YearMonth" value-format="yyyy-MM" type="month" :placeholder="$t('op.ChoiceMonth')">
</el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="新增档期"
<input type="button" class="normalBtn" :value="$t('op.Addschedule')"
@click="addMsg.LeaderId = msg.LeaderId, addShow = true,text='新增',resetForm('addMsg')" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
......@@ -413,32 +413,32 @@
<table border="0" cellspacing="1" cellpadding="0" class="singeRowTable" v-loading="loading"
style="border: 1px solid rgb(230, 230, 230);background: #ccc;width: 100%">
<tr>
<th>领队/导游姓名</th>
<th>开始日期</th>
<th>结束日期</th>
<th>档期类型</th>
<th>团队编号</th>
<th>备注</th>
<th>操作人</th>
<th>操作</th>
<th>{{$t('op.LeaderGuildName')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_EndDate')}}</th>
<th>{{$t('leader.leader_ScheduleType')}}</th>
<th>{{$t('scen.sc_temID')}}</th>
<th>{{$t('pub.pubRemark')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item, index) in dataList">
<td>{{item.LeaderName}}/{{item.GuideName}} </td>
<td>{{item.StartDate}}</td>
<td>{{item.EndDate}}</td>
<td>
<span v-if="item.TypeId===0">系统参团</span>
<span v-if="item.TypeId===1">休假</span>
<span v-if="item.TypeId===0">{{$t('op.SysCantuan')}}</span>
<span v-if="item.TypeId===1">{{$t('leader.leader_Vacation')}}</span>
</td>
<td><span style="text-decoration: underline;cursor: pointer;color: #3980C8;"
@click="goUrl('productQuery',item.TCID)">{{item.TCID}}</span></td>
<td>{{item.Remarks}}</td>
<td>{{item.OperationName}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editLeader(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="removeLeader(item)">
</el-button>
</el-tooltip>
......@@ -449,7 +449,7 @@
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}档期资料</p>
<p class="_tit">{{text}}{{$t('op.DQZL')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn"
......@@ -461,7 +461,7 @@
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="名称：" prop="LeaderId">
<el-form-item :label="$t('system.query_airName')" prop="LeaderId">
<el-select v-model="addMsg.LeaderId" filterable :placeholder="$t('admin.admin_phBirthPlace')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"> </el-option>
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
......@@ -470,19 +470,19 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="开始时间：" prop="sDate">
<el-date-picker v-model="addMsg.StartDate" type="date" placeholder="请选择" value-format="yyyy-MM-dd">
<el-form-item :label="$t('system.table_begTime')" prop="sDate">
<el-date-picker v-model="addMsg.StartDate" type="date" :placeholder="$t('pub.pleaseSel')" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="结束时间：" prop="eDate">
<el-date-picker v-model="addMsg.EndDate" type="date" placeholder="请选择" value-format="yyyy-MM-dd">
<el-form-item :label="$t('salesModule.EndTime')" prop="eDate">
<el-date-picker v-model="addMsg.EndDate" type="date" :placeholder="$t('pub.pleaseSel')" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注：" prop="eDate">
<el-form-item :label="$t('pub.pubRemark')" prop="eDate">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
</el-form-item>
</el-col>
......
src/components/NeedCenter/MyNeed.vue
View file @ 3c703a89
......@@ -400,7 +400,7 @@
<ul>
<li>
<span>
<em>提交时间</em>
<em>{{$t('salesModule.SaveTime')}}</em>
<el-date-picker class="w150" v-model="msg.StartDate" type="date" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder="">
</el-date-picker>
......@@ -429,25 +429,25 @@
<table>
<tr>
<th width="200" v-if="activeName!=4">
名称
{{$t('system.query_airName')}}
</th>
<th width="80">
时间
{{$t('adm.adm_time')}}
</th>
<th width="80">
{{tabItemName}}
</th>
<th width="80">
国家&城市
{{$t('system.table_country')}}&{{$t('system.table_city')}}
</th>
<th width="100">
需求描述
{{$t('op.RequestDis')}}
</th>
<th width="100">
处理状态
{{$t('Airticket.Air_ProcessState')}}
</th>
<th width="80">
处理人
{{$t('op.DealPeople')}}
</th>
</tr>
<tbody>
......@@ -459,7 +459,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</td>
<td>
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}人
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel.hotel_people')}}
</td>
<td>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......@@ -478,7 +478,7 @@
<div class="DealStatus" v-if="item.DealStatus==3">
<i class="iconfont icon-yiquxiao quxiao"></i>{{item.DealStatusStr}}
</div>
<i class="iconfont icon-qingjia UseTime"></i>耗时: {{item.UseTimeStr}}
<i class="iconfont icon-qingjia UseTime"></i>{{$t('hotel.hotel_people')}}{{$t('op.CostTime')}}: {{item.UseTimeStr}}
</td>
<td>
......@@ -500,11 +500,11 @@
:page-size='msg.pageSize' :total='msg.total'>
</el-pagination>
<div class="combottomDiv" v-if="isShowNeed">
<div class="combottomTitle">机票需求单</div>
<div class="combottomTitle">{{$t('op.TicketNeedDAN')}}</div>
<el-form label-width="100px" :model="addNeedMsg" ref="addNeedMsg" :rules="rules2">
<el-col :span="5">
<el-form-item label="需求类型" prop="NeedSubType">
<el-select class="w150" filterable placeholder="请选择" v-model="addNeedMsg.NeedSubType">
<el-form-item :label="$t('Airticket.Air_requirent')" prop="NeedSubType">
<el-select class="w150" filterable :placeholder="$t('pub.pleaseSel')" v-model="addNeedMsg.NeedSubType">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefaultValue"></el-option>
<el-option v-for='item in TicketNeedTypeList' :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -512,8 +512,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出发地" prop="MainId">
<el-select class="w150" filterable placeholder="请选择" v-model="addNeedMsg.MainId">
<el-form-item :label="$t('sm.chufadi')" prop="MainId">
<el-select class="w150" filterable :placeholder="$t('pub.pleaseSel')" v-model="addNeedMsg.MainId">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefaultValue"></el-option>
<el-option v-for="item in CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
......@@ -521,8 +521,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="目的地" prop="SubId">
<el-select class="w150" filterable placeholder="请选择" v-model="addNeedMsg.SubId">
<el-form-item :label="$t('system.query_dest')" prop="SubId">
<el-select class="w150" filterable :placeholder="$t('pub.pleaseSel')" v-model="addNeedMsg.SubId">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefaultValue"></el-option>
<el-option v-for="item in CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
......@@ -530,26 +530,26 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出发日期" prop="NeedDate">
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="起飞时间" v-model="addNeedMsg.NeedDate">
<el-form-item :label="$t('hotel.hotel_StarDate')" prop="NeedDate">
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" :placeholder="$t('system.ph_flightTime')" v-model="addNeedMsg.NeedDate">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否中转" prop="IsAcceptTransfer">
<el-form-item :label="$t('op.IsTransit')" prop="IsAcceptTransfer">
<el-switch :active-value="AcceptTransferDefault" :inactive-value="NotAcceptTransferDefault" v-model="addNeedMsg.IsAcceptTransfer"></el-switch>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="人数" prop="UseNum">
<el-form-item :label="$t('admin.admin_personNumber')" prop="UseNum">
<el-input v-model="addNeedMsg.UseNum" @keyup.native="checkInteger(addNeedMsg,'UseNum')" type="text" class="w150"
placeholder="请输入人数"></el-input>
:placeholder="$t('rule.EnterPnum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<!-- <button type="button" class="normalBtn" style="margin:5px 0 0 55px;" @click="SetNeed()">发送</button> -->
<button type="button" class="normalBtn" style="margin:5px 0 0 55px;" @click="submitForm('addNeedMsg')">发送</button>
<button type="button" class="hollowFixedBtn" @click="clearInfo(),isShowNeed=false">取消</button>
<button type="button" class="normalBtn" style="margin:5px 0 0 55px;" @click="submitForm('addNeedMsg')">{{$t('op.Send')}}</button>
<button type="button" class="hollowFixedBtn" @click="clearInfo(),isShowNeed=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-form>
</div>
......@@ -582,19 +582,23 @@ export default {
tabItemList: [
{
TypeID: "4",
Name: "机票"
// Name: "机票"
Name:this.$t('active.cl_jipiao')
},
{
TypeID: "1",
Name: "酒店"
// Name: "酒店"
Name:this.$t('hotel.hotel')
},
{
TypeID: "2",
Name: "餐厅"
// Name: "餐厅"
Name:this.$t('commonPickUp.Pick_resName')
},
{
TypeID: "3",
Name: "票劵"
// Name: "票劵"
Name:this.$t('op.Tiquan')
}
],
//接受中转
......
src/components/Ticketing/seatStatistics.vue
View file @ 3c703a89
......@@ -254,7 +254,7 @@
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="DownLoadAirticket()">下载</button>
<button class="normalBtn" type="button" @click="DownLoadAirticket()">{{$t('adm.adm_download')}}</button>
</li>
</ul>
</div>
......@@ -268,13 +268,13 @@
<li>
<i class="el-icon-caret-left monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i>
<input type="text" disabled="disabled" v-model="currentYear" class="currentInput"
@input="getDateString(),initCalendar(dateString)">年
@input="getDateString(),initCalendar(dateString)">{{$t('pub.year')}}
<i class="el-icon-caret-right monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i>
</li>
<li>
<i class="el-icon-caret-left monthminus" @click="pickPre(currentYear,currentMonth)"></i>
<input type="text" disabled="disabled" v-model="currentMonth" class="currentInput"
@input="getDateString(),initCalendar(dateString)">月
@input="getDateString(),initCalendar(dateString)">{{$t('pub.month')}}
<i class="el-icon-caret-right monthadd" @click="pickNext(currentYear,currentMonth)"></i>
</li>
</ul>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 3c703a89
......@@ -624,7 +624,7 @@
<ul>
<li>
<span>
<em>线路</em>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="Query.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
......@@ -634,7 +634,7 @@
</li>
<li>
<span class="hotel_name">
<em>起飞时间</em>
<em>{{$t('system.ph_flightTime')}}</em>
<el-date-picker class="w150" v-model="Query.QNeedDateStart" type="date" value-format="yyyy-MM-dd"
placeholder="" :picker-options="pickerBeginDateBefore">
</el-date-picker>
......@@ -645,7 +645,7 @@
</li>
<li>
<span class="hotel_name">
<em>航空公司</em>
<em>{{$t('system.query_airCompanyName')}}</em>
<el-select v-model="Query.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in AirLineList" :label='item.AlName' :value='item.AirLineId' :key='item.AirLineId'>
......@@ -655,27 +655,27 @@
</li>
<li>
<span class="hotel_name">
<em>航班号</em>
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" placeholder="请输入航班号">
<em>{{$t('system.query_flightNum')}}</em>
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" :placeholder="$t('system.ph_airNum')">
</el-input>
</span>
</li>
<li>
<span class="hotel_name">
<em>PNR</em>
<el-input v-model="Query.PNR" type="text" @keyup.native.enter="getList" placeholder="请输入航班号">
<el-input v-model="Query.PNR" type="text" @keyup.native.enter="getList" :placeholder="$t('pub.pleaseImport')">
</el-input>
</span>
</li>
<li>
<span>
<em>机票编号</em>
<el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
<em>{{$t('fnc.jpbianhao')}}</em>
<el-input v-model="Query.ID" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(Query,'ID')"></el-input>
</span>
</li>
<li>
<span>
<em>操作人</em>
<em>{{$t('admin.admin_czPerson')}}</em>
<el-select v-model="Query.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
......@@ -707,7 +707,7 @@
<span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
<span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
<div>
<span class="TICK_Code">编号：{{item.ID}}</span>
<span class="TICK_Code">{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}</span>
<img class="_oll_img" v-if="item.AirlineUrl" :src="item.AirlineUrl" :onerror="defaultImg" />
<img class="_oll_img" v-else src="../../../assets/img/bg_z1@2x.png" />
</div>
......@@ -737,19 +737,19 @@
<el-popover popper-class="_tripDetails" width="100" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th>联运城市</th>
<th>{{$t('visa.v_lycity')}}</th>
</tr>
<tr v-for="(unionItem,x) in item.UnionList">
<td> {{unionItem.CityName}} </td>
</tr>
</table>
<el-button slot="reference" class="hollowFixedBtn wangfan">联运</el-button>
<el-button slot="reference" class="hollowFixedBtn wangfan">{{$t('salesModule.Union')}}</el-button>
</el-popover>
</div>
</el-col>
<el-col :span="2" class="vmiddle">
<div class="TMM_CNY">
成本:<span class="PingFangSC">{{item.CostPrice}}</span>
{{$t('hotel.hotel_cost')}}:<span class="PingFangSC">{{item.CostPrice}}</span>
</div>
</el-col>
<el-col :span="3" class="vmiddle">
......@@ -805,9 +805,9 @@
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"
v-if="item.FinalPayment">
<span>尾</span>
<span>{{$t('op.WEI')}}</span>
</el-tooltip>
<span v-else>尾</span>
<span v-else>{{$t('op.WEI')}}</span>
</li>
</ul>
</div>
......@@ -821,8 +821,8 @@
</el-col>
<el-col :span="3" class="vmiddle">
<div class="_jztime">
<p class="PingFangSC">航班日期:{{item.FlightDate}}</p>
<p class="PingFangSC">截止日期:{{item.TicketDeadlineStr}}</p>
<p class="PingFangSC">{{$t('Airticket.Air_flightDate')}}:{{item.FlightDate}}</p>
<p class="PingFangSC">{{$t('op.EndDate')}}:{{item.TicketDeadlineStr}}</p>
</div>
</el-col>
<el-col :span="2" class="vmiddle">
......@@ -837,8 +837,8 @@
<el-row :gutter="0">
<el-col :span="8">
<div class="TCID_cont PingFangSC">
团期：
<span v-show="item.PriceList.length==0">暂无</span>
{{$t('fnc.tuanqi')}}：
<span v-show="item.PriceList.length==0">{{$t('pub.noMsg')}}</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">
<a style="color:blue;cursor:pointer" @click='goUrlT("TravelControlList",subItem.TCNUM,"团控列表")'>
({{subItem.TCID}}){{subItem.TCNUM}} </a>
......@@ -846,11 +846,11 @@
</div>
</el-col>
<el-col :span="6">
<div class="TCID_cont"> 采购人：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
<div class="TCID_cont"> {{$t('op.Procurement')}}：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
</el-col>
<el-col :span="10">
<div class="TCID_cont">
PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
</div>
</el-col>
</el-row>
......@@ -864,7 +864,7 @@
</el-pagination>
<div class="combottomDiv" style="height:150px;" v-if="isShowOrder">
<div class="combottomTitle">采购</div>
<div class="combottomTitle">{{$t('op.CaiGou')}}</div>
<el-col :span="3">
<el-input v-model="bindAirticket.PurchaseAmount"
@keyup.native="checkInteger(bindAirticket,'PurchaseAmount')" type="text" class="w150"
......@@ -872,9 +872,9 @@
</el-col>
<el-col :span="5">
<button type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
@click="SetTicketPurchase()">确定</button>
@click="SetTicketPurchase()">{{$t('pub.sureBtn')}}</button>
<button type="button" class="hollowFixedBtn"
@click="isShowOrder=false,bindAirticket.PurchaseAmount=''">取消</button>
@click="isShowOrder=false,bindAirticket.PurchaseAmount=''">{{$t('pub.cancelBtn')}}</button>
</el-col>
</div>
</div>
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ 3c703a89
......@@ -291,9 +291,9 @@
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item :label="$t('system.query_workType')" prop="LeaderGuidClass">
<el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
<el-option key="0" label="公司领队" :value="0"></el-option>
<el-option key="1" label="同行领队" :value="1"></el-option>
<el-option key="2" label="临时领队" :value="2"></el-option>
<el-option key="0" :label="$t('op.CompanyLeader')" :value="0"></el-option>
<el-option key="1" :label="$t('op.THLeader')" :value="1"></el-option>
<el-option key="2" :label="$t('op.LXLeader')" :value="2"></el-option>
</el-select>
</el-form-item>
<div class="cn_name clearfix">
......@@ -366,7 +366,7 @@
<el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input">
<el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input>
</el-form-item>
<el-form-item label="境外电话" class="other_input">
<el-form-item :label="$t('op.JWPhone')" class="other_input">
<el-input type="text" v-model="addMsg.SpareTel" :placeholder="$t('admin.admin_SpareTel')" class="w210"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_Passport')" prop="Passport" class="other_input">
......@@ -395,12 +395,12 @@
</el-radio-group>
</el-form-item>
<template>
<el-form-item label="账号过期" v-if="addMsg.LeaderGuidClass!== '0'" prop="ValidDate" class='time'>
<el-form-item :label="$t('op.AccountOverdue')" v-if="addMsg.LeaderGuidClass!== '0'" prop="ValidDate" class='time'>
<el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="账号过期" v-else class='time'>
<el-form-item :label="$t('op.AccountOverdue')" v-else class='time'>
<el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd">
</el-date-picker>
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ 3c703a89
......@@ -125,7 +125,7 @@
<div class="TCL_Content">{{item.Title}}</div>
</div>
<div class="clearfix" v-if="item.OpenTeamDescribe&&item.OpenTeamDescribe!=''">
<div class="TCL_remarkTitle TCL-redType">备注：</div>
<div class="TCL_remarkTitle TCL-redType">{{$t('pub.pubRemark')}}：</div>
<div class="TCL_Content">{{item.OpenTeamDescribe}}</div>
</div>
</div>
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 3c703a89
......@@ -107,7 +107,7 @@
<li>
<span>
<em>{{$t('system.table_company')}}</em>
<el-select class="w150" filterable placeholder="公司" v-model="queryMsg.OutBranchId">
<el-select class="w150" filterable :placeholder="$t('sm.company')" v-model="queryMsg.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
<el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
</el-option>
......@@ -160,7 +160,7 @@
<th width="100">{{$t('Operation.Op_chutuan')}}</th>
<th width='120'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="80">团期编号</th>
<th width="80">{{$t('op.TQBH')}}</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
......@@ -204,7 +204,7 @@
</tr>
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 3c703a89
......@@ -275,9 +275,9 @@
<span>{{$t('Operation.Op_TransportState')}}</span>
<span>
<el-select class="w180 multiple_input" v-model="queryMsg.IsShowUnion">
<el-option :key="-1" label="全部" :value="-1"></el-option>
<el-option :key="0" label="主团" :value="0"></el-option>
<el-option :key="1" label="分销团" :value="1"></el-option>
<el-option :key="-1" :label="$t('advmanager.v_all')" :value="-1"></el-option>
<el-option :key="0" :label="$t('op.MainGroup')" :value="0"></el-option>
<el-option :key="1" :label="$t('op.DistributionGroup')" :value="1"></el-option>
</el-select>
</span>
</div>
......
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @ 3c703a89
......@@ -8,7 +8,7 @@
<ul>
<li>
<span>
<em>所属线路</em>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" 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.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
......@@ -18,7 +18,7 @@
</li>
<li>
<span>
<em>系列名称</em>
<em>{{$t('active.ad_xlmc')}}</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
......@@ -28,14 +28,14 @@
</li>
<li>
<span>
<em>团号</em>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>操作人</em>
<em>{{$t('admin.admin_czPerson')}}</em>
<el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId'
......@@ -46,7 +46,7 @@
</li>
<li>
<span>
<em>发团日期</em>
<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>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter"
......@@ -77,19 +77,19 @@
</div>
<div class="el-col" style="width:220px;">
<div class="d3">
<p><i class="iconfont icon-tuandui"></i>团队信息</p>
<p><em>{{item.DayNum}}天{{item.NightNum}}晚</em></p>
<p><i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}</p>
<p><em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</em></p>
</div>
</div>
<div class="el-col" style="width:220px;">
<div class="d3">
<p><i class="iconfont icon-tuandui"></i>团期信息</p>
<p><i class="iconfont icon-tuandui"></i>{{$t('Operation.Op_teamInfo')}}</p>
<p class="d12p">{{item.TCNUMS}}</p>
</div>
</div>
<div class="el-col" style="width:130px;">
<div class="d5 TC-oparation" style="padding-top:10px;">
<p><i class="iconfont icon-yuangong"></i>操作OP</p>
<p><i class="iconfont icon-yuangong"></i>{{$t('op.CZOP')}}</p>
<div class="clearfix TC-OpInfo">
<div class="TC-leftIMG">
<img v-if="item.OPPhoto" :src="item.OPPhoto" alt="">
......@@ -101,15 +101,15 @@
</div>
<div class="el-col">
<div class="d7">
<el-button @click="goToOpenTravel('TravelManager4',item.ID)" type="primary">行程修改</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">行程复制</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">删除</el-button>
<el-button @click="goToOpenTravel('TravelManager4',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.ph_shanchu')}}</el-button>
</div>
</div>
</div>
<div class="TC_remarkContent">
<div class="clearfix">
<div class="TCL_remarkTitle TCL-redType">团名：</div>
<div class="TCL_remarkTitle TCL-redType">{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content">{{item.Title}}</div>
</div>
</div>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 3c703a89
......@@ -33,10 +33,10 @@
</li>
<li>
<span>
<em>部门选择</em>
<em>{{$t('fnc.bmxuanze')}}</em>
<el-select class="w135" filterable v-model='msg.RB_Department_Id'
@change="employeeMsg.DepartmentId=msg.RB_Department_Id,getEmployee(),msg.CreateBy=''">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
......@@ -76,7 +76,7 @@
type="date"></el-date-picker>
</span>
</li>
<li><span><em>发团日期</em>
<li><span><em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker v-model='msg.QStartDate' class="w135" value-format="yyyy-MM-dd" type="date">
</el-date-picker>
-
......@@ -120,11 +120,11 @@
</p>
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
<span>机位数</span>
<span>{{$t('salesModule.AirNum')}}</span>
</div>
<p>
<span class="color_red_order">总: {{countData.YSeat}}(经济舱)+{{countData.CSeat}}(商务舱)+{{countData.FSeat}}(头等舱) ;</span>
<span class="color_red_order">剩: {{countData.YSeat-countData.SurplusYSeat}}(经济舱)+{{countData.CSeat-countData.SurplusCSeat}}(商务舱)+{{countData.FSeat-countData.SurplusFSeat}}(头等舱) ;</span>
<span class="color_red_order">{{$t('op.Zong')}}: {{countData.YSeat}}({{$t('Airticket.Air_EconomyClass')}})+{{countData.CSeat}}({{$t('Airticket.Air_businessClass')}})+{{countData.FSeat}}({{$t('Airticket.Air_firstClass')}}) ;</span>
<span class="color_red_order">{{$t('op.Sheng')}}: {{countData.YSeat-countData.SurplusYSeat}}({{$t('Airticket.Air_EconomyClass')}})+{{countData.CSeat-countData.SurplusCSeat}}({{$t('Airticket.Air_businessClass')}})+{{countData.FSeat-countData.SurplusFSeat}}({{$t('Airticket.Air_firstClass')}}) ;</span>
</p>
</div>
</el-col>
......@@ -195,7 +195,7 @@
<th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">{{$t('fnc.shishou')}}</th>
<th width="70">{{$t('fnc.youhui')}}</th>
<th width="80">幸福存折</th>
<th width="80">{{$t('salesModule.HappinessPassbook')}}</th>
<th width="70">{{$t('fnc.xiaofei')}}</th>
<th width="70">{{$t('fnc.tuikuan')}}</th>
<th width="70">{{$t('fnc.ptshuijin')}}</th>
......@@ -206,7 +206,7 @@
<th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
</tr>
<tr>
<td v-show="OrderList.length==0" colspan="16" align="center">{{$t('system.content_noData')}}</td>
<td v-show="OrderList.length==0" colspan="17" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tbody v-for="(item,index) in OrderList" :key="index">
<tr>
......@@ -222,23 +222,23 @@
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis">下单时间：{{item.createDate}}</p>
<p class="fz12 over_ellipsis">{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.commissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.commissionMoney" style="color:red">{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}
</p>
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">{{$t('salesModule.EWKCJE')}}：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red" v-else>
<p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
<p v-if="item.extraDeductMoney>0">{{$t('salesModule.EWKCJE')}}：{{item.extraDeductMoney}}</p>
</div>
<div style="color:red">
<p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
<p v-if="item.unionExtraMoney!=0">{{$t('salesModule.LYEWFY')}}：{{item.unionExtraMoney}}</p>
</div>
</div>
</td>
......@@ -253,7 +253,7 @@
</td>
<td>{{item.guestNum}}
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
({{$t('salesModule.RefuseQ')}} {{item.refuseVisaNum}}{{$t('sm.person')}})
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......@@ -307,10 +307,10 @@
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('salesModule.Type')}}</th>
<th>{{$t('system.label_info')}}</th>
<th>{{$t('adm.adm_time')}}(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">{{$t('salesModule.LookMore')}}</span>)</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
......@@ -322,7 +322,7 @@
<td>{{item2.UpdateTime}}</td>
</tr>
<tr v-if='redBagList.length==0'>
<td colspan="4" align="center">暂无数据</td>
<td colspan="4" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
......@@ -345,10 +345,10 @@
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
<p v-if="item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
<p v-if="item.industryCategory!==''" style="color:green">{{$t('salesModule.HYLB')}}：{{item.industryCategory}}</p>
</td>
<td v-if="isEditOrderCreate==1||userId==1">
<button class="normalBtn" @click="getSalerInfo(item)">修改业务员</button>
<button class="normalBtn" @click="getSalerInfo(item)">{{$t('salesModule.UpdateYWY')}}</button>
</td>
</tr>
<tr>
......@@ -356,7 +356,7 @@
<div>
<div>
<span>{{$t('hotel.hotel_remark')}}：</span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}{{$t('fnc.dingdan')}}
{{item.platformOrder}};</span>{{item.remarks}}</p>
</div>
<div>
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 3c703a89
......@@ -48,8 +48,8 @@
<li v-for="item in dataList" :key="item.subCode" :data-id="item.ID">
<div class="_left">
<div class="QT_Style">
<span v-if="item.IsDirect==1">直</span>
<span v-else>非</span>
<span v-if="item.IsDirect==1">{{$t('op.Zhi')}}</span>
<span v-else>{{$t('op.Fei')}}</span>
</div>
<div>
<p class="quoListName" @click="getJourney(item.ID,item.Title)">
......@@ -63,70 +63,70 @@
</div>
</div>
<div class="_cent">
<div class="stayDays">{{item.DayNum}}天{{item.NightNum}}晚</div>
<div class="stayDays">{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</div>
<div class="">
销售定价
{{$t('op.SalesPrice')}}
<el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv">
<div v-for="salesItem in SalesPriceList">
<div>成人</div>
<div>{{$t('salesModule.Adult')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">同业会员：￥{{salesItem.B2BMemberPrice}}</span>
<span class="pRightPrice">同业：￥{{salesItem.B2BPrice}}</span>
<span class="pLeftPrice">{{$t('op.TYmember')}}：￥{{salesItem.B2BMemberPrice}}</span>
<span class="pRightPrice">{{$t('salesModule.Trade')}}：￥{{salesItem.B2BPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">直客会员：￥{{salesItem.B2CMemberPrice}}</span>
<span class="pRightPrice">直客：￥{{salesItem.B2CPrice}}</span>
<span class="pLeftPrice">{{$t('Operation.Op_directMember')}}：￥{{salesItem.B2CMemberPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_direct')}}：￥{{salesItem.B2CPrice}}</span>
</div>
</div>
<div>小孩</div>
<div>{{$t('op.Child')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">占床：￥{{salesItem.ChildNeedPrice}}</span>
<span class="pRightPrice">不占床：￥{{salesItem.ChildNoNeedPrice}}</span>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{salesItem.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{salesItem.ChildNoNeedPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">婴儿：￥{{salesItem.BabyPrice}}</span>
<span class="pRightPrice">附加费：￥{{salesItem.BabyChargePrice}}</span>
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{salesItem.BabyPrice}}</span>
<span class="pRightPrice">{{$t('op.Surcharge')}}：￥{{salesItem.BabyChargePrice}}</span>
</div>
</div>
<div>老人</div>
<div>{{$t('sm.laoren')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">附加费：￥{{salesItem.OldManChargePrice}}</span>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{salesItem.OldManChargePrice}}</span>
</div>
</div>
<div>杂费</div>
<div>{{$t('Operation.Op_zafei')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">签证：￥{{salesItem.VisaPrice}}</span>
<span class="pRightPrice">单房差：￥{{salesItem.SingleRoomPrice}}</span>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{salesItem.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{salesItem.SingleRoomPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">杂费：￥{{salesItem.OtherPrice}}</span>
<span class="pLeftPrice">{{$t('Operation.Op_zafei')}}：￥{{salesItem.OtherPrice}}</span>
</div>
</div>
<div>单项报价</div>
<div>{{$t('op.SingleQuotes')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">单地接：￥{{salesItem.SingleDMCPrice}}</span>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{salesItem.SingleDMCPrice}}</span>
</div>
</div>
<div>优惠</div>
<div>{{$t('fnc.youhui')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">同行返佣：￥{{salesItem.RebatePrice}}</span>
<span class="pRightPrice">早鸟优惠：￥{{salesItem.DiscountPrice}}</span>
<span class="pLeftPrice">{{$t('sm.tonghangfanyong')}}：￥{{salesItem.RebatePrice}}</span>
<span class="pRightPrice">{{$t('sm.zaoniaoyouhui')}}：￥{{salesItem.DiscountPrice}}</span>
</div>
</div>
</div>
</div>
<span slot="reference" class="diPrice" @click="getSalsPrice(item.ID)">{{item.SalesPrice}}<span class="qi">起</span></span>
<span slot="reference" class="diPrice" @click="getSalsPrice(item.ID)">{{item.SalesPrice}}<span class="qi">{{$t('op.Qi')}}</span></span>
</el-popover>
</div>
<div class="QT_CodeNum">
编号：{{item.ID}}
{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}
</div>
</div>
<div class="_right">
......@@ -141,15 +141,15 @@
</div>
<div>
<span class="openGroup opbd" @click="goToOpenTravel('TravelManager2',item.ID,item.OpenState)">
开
{{$t('op.Kai')}}
</span>
<span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)" >
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
<span class="QT-delete opbd" @click="delQuotation(item.ID)" >
<el-tooltip class="item" effect="dark" content="删除" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-shanchu"></i>
</el-tooltip>
</span>
......@@ -361,7 +361,7 @@
//删除报价单
delQuotation(ID) {
var that = this;
this.Confirm("删除过后数据不能恢复，请谨慎操作", function () {
this.Confirm(this.$t('sm.schbnhfjscz'), function () {
let msg = {
ID: ID,
};
......@@ -370,7 +370,7 @@
msg,
res => {
if (res.data.resultCode == 1) {
that.Success("删除成功");
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
......
src/components/dmc/manager/tripsManager.vue
View file @ 3c703a89
......@@ -466,7 +466,7 @@
</li>
<li>
<button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<input type="button" class="hollowFixedBtn" value="团队合团" @click="heTuan" v-show="this.ArrList.length>1" />
<input type="button" class="hollowFixedBtn" :value="$t('op.TDHT')" @click="heTuan" v-show="this.ArrList.length>1" />
</li>
</ul>
</div>
......@@ -479,7 +479,7 @@
<input :value="outItem.TCIDs" style="vertical-align: middle;" v-model="ArrList"
type="checkbox">{{outItem.TCIDs}}
</label>
<span v-if='outItem.TravelPriceList.length>1'>合</span>
<span v-if='outItem.TravelPriceList.length>1'>{{$t('op.HE')}}</span>
</td>
<td colspan="5" style="padding-left: 30px;">{{item.Title}}</td>
</tr>
......@@ -549,7 +549,7 @@
<div class="d3">
<p>
<i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}
<em>{{item.DayNum}}天{{item.NightNum}}晚</em>
<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</em>
</p>
<p>
<span>{{$t('Airticket.Air_StartTime')}}</span>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 3c703a89
......@@ -7,25 +7,25 @@
<div>
<div class="clearfix" style="margin:auto;width:1200px;">
<div class="TravelLeftMenu">
<div class="TravelTopTitle">页面导航</div>
<div class="TravelTopTitle">{{$t('sm.yemiandaohang')}}</div>
<div class="TravelNavList" :class="{'TravelCked':ckedNav==1}" @click.prevent="custormAnchor('firstAnchor',1)">
基础设置
{{$t('sm.jichushezhi')}}
</div>
<div class="TravelLine"></div>
<div class="TravelNavList" :class="{'TravelCked':ckedNav==2}" @click.prevent="custormAnchor('secondAnchor',2)">
线路行程
{{$t('sm.xianluxingcheng')}}
</div>
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
产品特色
{{$t('sm.chanpintese')}}
</div>
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
补充信息
{{$t('sm.buchongxinxi')}}
</div>
<div class="TravelLine"></div>
<div class="TravelNavList" :class="{'TravelCked':ckedNav==5}" @click.prevent="custormAnchor('fiveAnchor',5)">
团期设置
{{$t('sm.tuanqishezhi')}}
</div>
<div class="TravelLine"></div>
</div>
......@@ -60,12 +60,12 @@
<div class="toTop" @click="backTop">
<i class="iconfont icon-huidaodingbu"></i>
</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">保存</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">提交</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">{{$t('pub.saveBtn')}}</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">{{$t('fnc.tijiao')}}</div>
<div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(3)"
title="另存为新模板">保存
title="另存为新模板">{{$t('pub.saveBtn')}}
</div>
<div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">预览</div>
<div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}</div>
</div>
</div>
</div>
......
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