Skip to content

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

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

parents 83803d40 45d8e403
Show whitespace changes
Inline Side-by-side
Showing with 293 additions and 255 deletions
src/assets/common/lang/EN/fill.js
View file @ b578e81b
......@@ -1608,6 +1608,7 @@ export const obj = {
baoxiansdzfd: 'Insurance, director miscellaneous fees, etc.',
guolufei: 'Toll',
tingchefei: 'Parking fees',
dayofferchange:"Change",
hanzaocan: 'Breakfast included',
hanwancan: 'Including dinner',
zao: 'Morning',
......@@ -1615,9 +1616,13 @@ export const obj = {
wan: 'Late',
waibixj: 'Foreign currency subtotal',
jiudianxj: 'Hotel Subtotal',
jiudianchangxj:'Total Hotel Changes',
chezhixj: 'Fare subtotal',
chezhichangexj:'Total fare changes',
canxj: 'Meal Subtotal',
canchangexj:"Total meal changes",
menpiaoxj: 'Ticket subtotal',
menpiaochangexj:"Total ticket changes",
zazhixj: 'Miscellaneous subtotals',
renmingbxj: 'RMB Subtotal',
qitacbrmb: 'Other costs (RMB)',
......
src/assets/common/lang/Japan/fill.js
View file @ b578e81b
......@@ -1606,6 +1606,7 @@ export const obj = {
baoxiansdzfd: '保険、司導雑費など',
guolufei: '通行料',
tingchefei: '駐車料金',
dayofferchange:"変更",
hanzaocan: '朝食付き',
hanwancan: '夕食付き',
zao: 'おはようございます',
......@@ -1613,9 +1614,13 @@ export const obj = {
wan: '遅い',
waibixj: '外為小計',
jiudianxj: '酒店小計',
jiudianchangxj:'ホテル変更合計',
chezhixj: '車資小計',
chezhichangexj:'運賃変更合計',
canxj: '食小計',
canchangexj:"食事変更合計",
menpiaoxj: '入場券小計',
menpiaochangexj:"チケット変更合計",
zazhixj: '私はあなたを愛しています',
renmingbxj: '人民元の小計',
qitacbrmb: 'その他のコスト(人民元)',
......
src/assets/common/lang/zhCN/fill.js
View file @ b578e81b
......@@ -1608,6 +1608,7 @@ export const obj = {
baoxiansdzfd: '保险、司导杂费等',
guolufei: '过路费',
tingchefei: '停车费',
dayofferchange:"变更",
hanzaocan: '含早餐',
hanwancan: '含晚餐',
zao: '早',
......@@ -1615,9 +1616,13 @@ export const obj = {
wan: '晚',
waibixj: '外币小计',
jiudianxj: '酒店小计',
jiudianchangxj:'酒店变更合计',
chezhixj: '车资小计',
chezhichangexj:'车资变更合计',
canxj: '餐小计',
canchangexj:"餐变更合计",
menpiaoxj: '门票小计',
menpiaochangexj:"门票变更合计",
zazhixj: '杂支小计',
renmingbxj: '人民币小计',
qitacbrmb: '其它成本(人民币)',
......@@ -7519,9 +7524,9 @@ export const obj = {
tianxjqcaiyjg: '填写景点名称才能带出价格',
hancan: '含餐',
guolfqcfei: '过路费、停车费',
zaocanmc: '早餐名称',
wucanmc: '午餐名称',
wancaimc: '晚餐名称',
zaocanmc: '早',
wucanmc: '午',
wancaimc: '晚',
jindianjiag: '景点价格',
zazhiminc: '杂支名称',
guanltcqzqtx: '关联提成,请正确填写',
......
src/assets/common/lang/zhTW/fill.js
View file @ b578e81b
......@@ -1608,6 +1608,7 @@ export const obj = {
baoxiansdzfd: '保險、司導雜費等',
guolufei: '過路費',
tingchefei: '停車費',
dayofferchange:"變更",
hanzaocan: '含早餐',
hanwancan: '含晚餐',
zao: '早',
......@@ -1615,9 +1616,13 @@ export const obj = {
wan: '晚',
waibixj: '外幣小計',
jiudianxj: '酒店小計',
jiudianchangxj:'酒店變更合計',
chezhixj: '車資小計',
chezhichangexj:'車資變更合計',
canxj: '餐小計',
canchangexj:"餐變更合計",
menpiaoxj: '門票小計',
menpiaochangexj:"門票變更合計",
zazhixj: '雜支小計',
renmingbxj: '人民幣小計',
qitacbrmb: '其它成本(人民幣)',
......@@ -7518,10 +7523,10 @@ export const obj = {
tianxctmccyjg: '填寫餐廳名稱才能帶出價格',
tianxjqcaiyjg: '填寫景點名稱才能帶出價格',
hancan: '含餐',
guolfqcfei: '過路費、請車費"',
zaocanmc: '早餐名稱',
wucanmc: '午餐名稱',
wancaimc: '晚餐名稱',
guolfqcfei: '過路費、停車費',
zaocanmc: '早',
wucanmc: '午',
wancaimc: '晚',
jindianjiag: '景點價格',
zazhiminc: '雜支名稱',
guanltcqzqtx: '關聯提成,請正確填寫',
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ b578e81b
......@@ -70,7 +70,7 @@
<div class="QuotationFirstDiv1">
<table style="font-size:14px;">
<tr>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td width="80" class="txtRightCost">{{$t('objFill.v101.kaituants')}}</td>
<td width="300">
<template v-if="postConfig.TeamType==1">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
......@@ -135,7 +135,7 @@
<table class="CostPriceTable CostNewTable">
<thead>
<tr>
<td colspan="13" class="CP_ComTitle2 CostcomCenter">成本预算信息</td>
<td colspan="13" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.baojiaxinxi')}}</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_Currency')}}</td>
......@@ -170,20 +170,23 @@
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">{{$t('hotel.hotel_Currency')}}</td>
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">{{$t('Airticket.Air_Trip')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">
{{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:180px">{{$t('hotel.table_hotelname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.chezi')}}/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiageren')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">
{{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">{{$t('restaurant.res_resName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiagecan')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">{{$t('visaT.jdname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiageren')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('system.query_airName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('Operation.Op_price')}}</td>
</tr>
......@@ -194,7 +197,7 @@
<br />
{{GetDayStr(subItem.DayNum-1)}}
<br />
<a v-if="IsEdit==3" style="color:blue;cursor:pointer" @click="showOfferChange(1,subItem)">变更</a>
<a v-if="IsEdit==3" style="color:blue;cursor:pointer" @click="showOfferChange(1,subItem)">{{$t('objFill.dayofferchange')}}</a>
</td>
<td align="center">
{{getCurrencyName(subItem.CurrencyId)}}
......@@ -204,9 +207,9 @@
</td>
<td>
{{subItem.HotelName}}<br />
<template v-if="subItem.ContainDinnerType==1">含早餐</template>
<template v-if="subItem.ContainDinnerType==2">含晚餐</template>
<template v-if="subItem.ContainDinnerType==3">含晚餐</template>
<template v-if="subItem.ContainDinnerType==1">{{$t('objFill.hanzaocan')}}</template>
<template v-if="subItem.ContainDinnerType==2">{{$t('objFill.hanwancan')}}</template>
<template v-if="subItem.ContainDinnerType==3">{{$t('objFill.v101.hanzaowanc')}}</template>
</td>
<td>
{{subItem.HotelCostPrice}}
......@@ -243,12 +246,12 @@
</td>
<td style="width:250px;">
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
早: {{subItem.BreakfastName}}<br />
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
午: {{subItem.LunchName}}<br />
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchName}}<br />
<template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''">
<font style="color:#106BAF;"> 真实名称:
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''">
<a @click="OpenNewUrl(subItem.LunchUrl)" target="_blank"
style="cursor:pointer;text-decoration: underline;color:#106BAF;">{{subItem.LunchRealName}}</a>
......@@ -259,9 +262,9 @@
</template>
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
晚: {{subItem.DinnerName}}<br />
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerName}}<br />
<template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''">
<font style="color:#106BAF;">真实名称:
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''">
<a @click="OpenNewUrl(subItem.DinnerUrl)" target="_blank"
style="cursor:pointer;text-decoration: underline;color:#106BAF;">{{subItem.DinnerRealName}}</a>
......@@ -274,18 +277,18 @@
</td>
<td>
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
早: {{subItem.BreakfastCostPrice}}<br />
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastCostPrice}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
午: {{subItem.LunchCostPrice}}<br />
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchCostPrice}}<br />
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
晚: {{subItem.DinnerCostPrice}}<br />
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerCostPrice}}<br />
</template>
<template v-if="subItem.IsLunchChange">
<br />
<font style="color:red;">
午:
{{$t('objFill.v101.wucanmc')}}:
<template v-if="subItem.LunchChangeValue>0">
+
</template>
......@@ -295,7 +298,7 @@
<template v-if="subItem.IsDinnerChange">
<br />
<font style="color:red;">
晚:
{{$t('objFill.v101.wancaimc')}}:
<template v-if="subItem.DinnerChangeValue>0">
+
</template>
......@@ -342,72 +345,72 @@
</template>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
外币小计
{{$t('objFill.waibixj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,1)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}}
<template v-if="getDayChangeXiaoJi(1,1)!=0">
<br />
<font style="color:red">酒店变更合计:{{getDayChangeXiaoJi(1,1)}}</font>
<font style="color:red">{{$t('objFill.jiudianchangxj')}} :{{getDayChangeXiaoJi(1,1)}}</font>
</template>
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,1)}}
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,1)}}
<template v-if="getDayChangeXiaoJi(2,1)!=0">
<br />
<font style="color:red">车资变更合计:{{getDayChangeXiaoJi(2,1)}}</font>
<font style="color:red">{{$t('objFill.chezhichangexj')}}:{{getDayChangeXiaoJi(2,1)}}</font>
</template>
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,1)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}}
<template v-if="getDayChangeXiaoJi(4,1)!=0">
<br />
<font style="color:red">餐变更合计:{{getDayChangeXiaoJi(4,1)}}</font>
<font style="color:red">{{$t('objFill.canchangexj')}}:{{getDayChangeXiaoJi(4,1)}}</font>
</template>
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,1)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}}
<template v-if="getDayChangeXiaoJi(3,1)!=0">
<br />
<font style="color:red">门票变更合计:{{getDayChangeXiaoJi(3,1)}}</font>
<font style="color:red">{{$t('objFill.menpiaochangexj')}}:{{getDayChangeXiaoJi(3,1)}}</font>
</template>
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,1)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币小计
{{$t('objFill.renmingbxj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,2)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}}
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,2)}}
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}}
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,2)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}}
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,2)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,2)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
</td>
</tr>
<tr>
<td colspan="13">其它成本(人民币)</td>
<td colspan="13">{{$t('objFill.qitacbrmb')}}</td>
</tr>
<tr>
<td colspan="2">
......@@ -416,33 +419,33 @@
</el-form-item>
</td>
<td>
<el-form-item label="中段机票">
<el-form-item :label="$t('objFill.zhongduanjp')">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
<el-form-item :label="$t('objFill.shuijin')">
{{teamPrice.TaxPrice}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="联运">
<el-form-item :label="$t('salesModule.Union')">
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="6" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
{{$t('objFill.xiaojijpzdsjly')}}:
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-form-item :label="$t('objFill.lingduidyft')">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td>
<el-form-item label="过夜">
<el-form-item :label="$t('objFill.guoye')">
{{teamPrice.NightPrice}}
</el-form-item>
</td>
......@@ -452,7 +455,7 @@
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="保险">
<el-form-item :label="$t('Operation.Op_insurance')">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
......@@ -462,12 +465,12 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="婴儿">
<el-form-item :label="$t('Operation.Op_baby')">
{{teamPrice.BabyPrice}}
</el-form-item>
</td>
<td>
<el-form-item label="单地接(成本)">
<el-form-item :label="$t('objFill.dandijcb')">
{{teamPrice.SingleDMCPrice}}
</el-form-item>
</td>
......@@ -487,19 +490,19 @@
</el-form-item>
</td>
<td colspan="4">
<el-form-item label="单地接(价格)">
<el-form-item :label="$t('objFill.dandijjg')">
{{teamPrice.SingleDMCTCPrice}}
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="主OP">
<el-form-item :label="$t('Operation.Op_zhu')+`OP`">
{{postConfig.OPName}}
</el-form-item>
</td>
<td colspan="3">
<el-form-item label="助理OP：">
<el-form-item :label="$t('objFill.zhuli')+`OP`">
<template v-if="postConfig.Assistantlist&&postConfig.Assistantlist.length>0">
<span v-for="(subItem,subIndex) in postConfig.Assistantlist" :key="subIndex"
style="padding-left:3px;">{{subItem.Name}}</span>
......@@ -509,18 +512,18 @@
<td colspan="2">
<el-form-item :label="$t('fnc.fkfangshi')">
<template v-if="postConfig.SaleOfferPayType==1">
现金
{{$t('fnc.xianjin')}}
</template>
<template v-if="postConfig.SaleOfferPayType==2">
汇款
{{$t('objFill.huikuan')}}
</template>
<template v-if="postConfig.SaleOfferPayType==3">
外站自理
{{$t('objFill.waizhanzili')}}
</template>
</el-form-item>
</td>
<td colspan="6">
附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
{{$t('objFill.fj')}}: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
......@@ -532,36 +535,36 @@
<td>
</td>
<td>
人数
{{$t('admin.admin_personNumber')}}
</td>
<td>
酒店+车+餐+门票+杂支
{{$t('objFill.v101.jiudccmzji')}}
</td>
<td>
地接成本<br />(外币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.waibi')}})
</td>
<td colspan="2">
地接成本<br />(人民币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.a_rminbi')}})
</td>
<td colspan="2">
成本<br />[地接成本(人民币)+其它成本(人民币)小计+单地接]
{{$t('hotel.hotel_cost')}}<br /> [{{$t('objFill.v101.dandjqtcbrmbxj')}}]
</td>
<td>
同业销售价格
<br />(人民币)
{{$t('objFill.tongyexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
直客销售价格
<br />(人民币)
{{$t('objFill.zhikexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</td>
<td colspan="2">
备注
{{$t('fnc.beizhu')}}
</td>
</tr>
<!--已填写人数-->
......@@ -569,15 +572,15 @@
<template v-for="(subItem,subIndex) in CostNumberList">
<tr :key="subIndex">
<td v-if="subIndex==0" :rowspan="CostNumberList.length">
合计
{{$t('fnc.a_heji')}}
</td>
<td>
{{subItem.PeopleNumber}}
</td>
<td>
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{getDayXiaoJi(1,1)}}({{$t('objFill.jiu')}})+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.chezczcyrs')}})+{{getDayXiaoJi(4,1)}}({{$t('objFill.can')}})+{{getDayXiaoJi(3,1)}}({{$t('scen.sc_piao')}})
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.zazhizzzcyrsK')}})
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
......@@ -620,7 +623,7 @@
<td colspan="13"></td>
</tr>
<tr>
<td class="CP_ComTitle2">审核备注</td>
<td class="CP_ComTitle2">{{$t('objFill.shenhebz')}}</td>
<td colspan="5">
<template
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
......@@ -639,10 +642,10 @@
<p>
{{postConfig.AuditByName}}：{{postConfig.AuditDate}}
<template v-if="postConfig.TravelState==3">
<span style="color:blue;">通过</span>
<span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
</template>
<template v-if="postConfig.TravelState==4">
<span style="color:red;">驳回</span>
<span style="color:red;">{{$t('fnc.bohui')}}</span>
</template>
{{postConfig.AuditContent}}
</p>
......@@ -665,10 +668,10 @@
<p>
{{postConfig.ChangeAuditByName}}：{{postConfig.ChangeAduitDate}}
<template v-if="postConfig.TravelState==8">
<span style="color:blue;"> 通过</span>
<span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
</template>
<template v-if="postConfig.TravelState==7">
<span style="color:red;"> 驳回</span>
<span style="color:red;">{{$t('fnc.bohui')}}</span>
</template>
{{postConfig.ChangeAduitContent}}
</p>
......@@ -679,7 +682,7 @@
</template>
</td>
<td colspan="3">
当前出团类型: <template v-if="postConfig.TeamTypeName=='小包团'">
{{$t('objFill.dangqiantdlx')}}: <template v-if="postConfig.TeamTypeName=='小包团'">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
</template>
<template v-else>
......@@ -687,7 +690,7 @@
</template>
</td>
<td colspan="4">
<el-form-item label="更改出团类型">
<el-form-item :label="$t('objFill.v101.gengctleix')">
<el-select class="multiple_input" v-model="postConfig.TeamType">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ b578e81b
......@@ -73,20 +73,23 @@
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">{{$t('hotel.hotel_Currency')}}</td>
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">{{$t('Airticket.Air_Trip')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">
{{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">{{$t('hotel.table_hotelname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('objFill.chezi')}}/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('objFill.v101.jiageren')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">
{{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">{{$t('restaurant.res_resName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">{{$t('objFill.v101.jiagecan')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('visaT.jdname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('objFill.v101.jiageren')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('system.query_airName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('Operation.Op_price')}}</td>
</tr>
......@@ -105,9 +108,9 @@
</td>
<td>
{{subItem.HotelName}}<br />
<template v-if="subItem.ContainDinnerType==1">含早餐</template>
<template v-if="subItem.ContainDinnerType==2">含晚餐</template>
<template v-if="subItem.ContainDinnerType==3">含晚餐</template>
<template v-if="subItem.ContainDinnerType==1">{{$t('objFill.hanzaocan')}}</template>
<template v-if="subItem.ContainDinnerType==2">{{$t('objFill.hanwancan')}}</template>
<template v-if="subItem.ContainDinnerType==3">{{$t('objFill.v101.hanzaowanc')}}</template>
</td>
<td>
{{subItem.HotelCostPrice}}
......@@ -144,12 +147,12 @@
</td>
<td style="width:250px;">
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
早: {{subItem.BreakfastName}}<br />
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
午: {{subItem.LunchName}}<br />
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchName}}<br />
<template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''">
<font style="color:red;"> 真实名称:
<font style="color:red;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''">
<a @click="OpenNewUrl(subItem.LunchUrl)" target="_blank"
style="cursor:pointer;text-decoration: underline;color:red;">{{subItem.LunchRealName}}</a>
......@@ -160,9 +163,9 @@
</template>
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
晚: {{subItem.DinnerName}}<br />
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerName}}<br />
<template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''">
<font style="color:red;">真实名称:
<font style="color:red;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''">
<a @click="OpenNewUrl(subItem.DinnerUrl)" target="_blank"
style="cursor:pointer;text-decoration: underline;color:red;">{{subItem.DinnerRealName}}</a>
......@@ -175,18 +178,18 @@
</td>
<td>
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
早: {{subItem.BreakfastCostPrice}}<br />
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastCostPrice}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
午: {{subItem.LunchCostPrice}}<br />
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchCostPrice}}<br />
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
晚: {{subItem.DinnerCostPrice}}<br />
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerCostPrice}}<br />
</template>
<template v-if="subItem.IsLunchChange">
<br />
<font style="color:red;">
午:
{{$t('objFill.v101.wucanmc')}}:
<template v-if="subItem.LunchChangeValue>0">
+
</template>
......@@ -196,7 +199,7 @@
<template v-if="subItem.IsDinnerChange">
<br />
<font style="color:red;">
晚:
{{$t('objFill.v101.wancaimc')}}:
<template v-if="subItem.DinnerChangeValue>0">
+
</template>
......@@ -243,72 +246,72 @@
</template>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
外币小计
{{$t('objFill.waibixj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,1)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}}
<template v-if="getDayChangeXiaoJi(1,1)!=0">
<br />
<font style="color:red">酒店变更合计:{{getDayChangeXiaoJi(1,1)}}</font>
<font style="color:red">{{$t('objFill.jiudianchangxj')}}:{{getDayChangeXiaoJi(1,1)}}</font>
</template>
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,1)}}
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,1)}}
<template v-if="getDayChangeXiaoJi(2,1)!=0">
<br />
<font style="color:red">车资变更合计:{{getDayChangeXiaoJi(2,1)}}</font>
<font style="color:red">{{$t('objFill.chezhichangexj')}}:{{getDayChangeXiaoJi(2,1)}}</font>
</template>
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,1)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}}
<template v-if="getDayChangeXiaoJi(4,1)!=0">
<br />
<font style="color:red">餐变更合计:{{getDayChangeXiaoJi(4,1)}}</font>
<font style="color:red">{{$t('objFill.canchangexj')}}:{{getDayChangeXiaoJi(4,1)}}</font>
</template>
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,1)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}}
<template v-if="getDayChangeXiaoJi(3,1)!=0">
<br />
<font style="color:red">门票变更合计:{{getDayChangeXiaoJi(3,1)}}</font>
<font style="color:red">{{$t('objFill.menpiaochangexj')}}:{{getDayChangeXiaoJi(3,1)}}</font>
</template>
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,1)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币小计
{{$t('objFill.renmingbxj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,2)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}}
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,2)}}
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}}
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,2)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}}
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,2)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,2)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
</td>
</tr>
<tr>
<td colspan="13">其它成本(人民币)</td>
<td colspan="13">{{$t('objFill.qitacbrmb')}}</td>
</tr>
<tr>
<td colspan="2">
......@@ -317,33 +320,33 @@
</el-form-item>
</td>
<td>
<el-form-item label="中段机票">
<el-form-item :label="$t('objFill.zhongduanjp')">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
<el-form-item :label="$t('objFill.shuijin')">
{{teamPrice.TaxPrice}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="联运">
<el-form-item :label="$t('salesModule.Union')">
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="6" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
{{$t('objFill.xiaojijpzdsjly')}}:
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-form-item :label="$t('objFill.lingduidyft')">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td>
<el-form-item label="过夜">
<el-form-item :label="$t('objFill.guoye')">
{{teamPrice.NightPrice}}
</el-form-item>
</td>
......@@ -353,7 +356,7 @@
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="保险">
<el-form-item :label="$t('Operation.Op_insurance')">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
......@@ -363,12 +366,12 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="婴儿">
<el-form-item :label="$t('Operation.Op_baby')">
{{teamPrice.BabyPrice}}
</el-form-item>
</td>
<td>
<el-form-item label="单地接(成本)">
<el-form-item :label="$t('objFill.dandijcb')">
{{teamPrice.SingleDMCPrice}}
</el-form-item>
</td>
......@@ -389,19 +392,19 @@
</el-form-item>
</td>
<td colspan="4">
<el-form-item label="单地接(价格)">
<el-form-item :label="$t('objFill.dandijjg')">
{{teamPrice.SingleDMCTCPrice}}
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="主OP">
<el-form-item :label="$t('Operation.Op_zhu')+`OP`">
{{postConfig.OPName}}
</el-form-item>
</td>
<td colspan="3">
<el-form-item label="助理OP：">
<el-form-item :label="$t('objFill.zhuli')+`OP`">
<template v-if="postConfig.Assistantlist&&postConfig.Assistantlist.length>0">
<span v-for="(subItem,subIndex) in postConfig.Assistantlist" :key="subIndex"
style="padding-left:3px;">{{subItem.Name}}</span>
......@@ -411,18 +414,18 @@
<td colspan="2">
<el-form-item :label="$t('fnc.fkfangshi')">
<template v-if="postConfig.SaleOfferPayType==1">
现金
{{$t('fnc.xianjin')}}
</template>
<template v-if="postConfig.SaleOfferPayType==2">
汇款
{{$t('objFill.huikuan')}}
</template>
<template v-if="postConfig.SaleOfferPayType==3">
外站自理
{{$t('objFill.waizhanzili')}}
</template>
</el-form-item>
</td>
<td colspan="6">
附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
{{$t('objFill.fj')}}: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
......@@ -434,36 +437,36 @@
<td>
</td>
<td>
人数
{{$t('admin.admin_personNumber')}}
</td>
<td>
酒店+车+餐+门票+杂支
{{$t('objFill.v101.jiudccmzji')}}
</td>
<td>
地接成本<br />(外币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.waibi')}})
</td>
<td colspan="2">
地接成本<br />(人民币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.a_rminbi')}})
</td>
<td colspan="2">
成本<br />[地接成本(人民币)+其它成本(人民币)小计+单地接]
{{$t('hotel.hotel_cost')}}<br /> [{{$t('objFill.v101.dandjqtcbrmbxj')}}]
</td>
<td>
同业销售价格
<br />(人民币)
{{$t('objFill.tongyexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
直客销售价格
<br />(人民币)
{{$t('objFill.zhikexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</td>
<td colspan="2">
备注
{{$t('fnc.beizhu')}}
</td>
</tr>
<!--已填写人数-->
......@@ -471,15 +474,15 @@
<template v-for="(subItem,subIndex) in CostNumberList">
<tr :key="subIndex">
<td v-if="subIndex==0" :rowspan="CostNumberList.length">
合计
{{$t('fnc.a_heji')}}
</td>
<td>
{{subItem.PeopleNumber}}
</td>
<td>
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{getDayXiaoJi(1,1)}}({{$t('objFill.jiu')}})+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.chezczcyrs')}})+{{getDayXiaoJi(4,1)}}({{$t('objFill.can')}})+{{getDayXiaoJi(3,1)}}({{$t('scen.sc_piao')}})
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.zazhizzzcyrsK')}})
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
......@@ -522,26 +525,26 @@
<td colspan="13"></td>
</tr>
<tr>
<td class="CP_ComTitle2">审核备注</td>
<td class="CP_ComTitle2">{{$t('objFill.shenhebz')}}</td>
<td colspan="9">
<template
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
{{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <template
v-if="postConfig.ManagerAduitStatus==1">
<span style="color:blue;"> 通过</span>
<span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
</template>
<template v-if="postConfig.ManagerAduitStatus==2">
<span style="color:red;"> 驳回</span>
<span style="color:red;">{{$t('fnc.bohui')}}</span>
</template>
{{postConfig.ManagerAduitContent}}
</template>
<template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
<br />
{{postConfig.AuditByName}}：{{postConfig.AuditDate}} <template v-if="postConfig.TravelState==3">
<span style="color:blue;"> 通过</span>
<span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
</template>
<template v-if="postConfig.TravelState==4">
<span style="color:red;"> 驳回</span>
<span style="color:red;">{{$t('fnc.bohui')}}</span>
</template>
{{postConfig.AuditContent}}
</template>
......@@ -558,27 +561,27 @@
{{postConfig.ChangeManagerAduitContent}}
</p>
</template>
<template v-if=" postConfig.ChangeAduitDate&&postConfig.ChangeAduitDate!=''">
<template v-if="postConfig.ChangeAduitDate&&postConfig.ChangeAduitDate!=''">
<br />
<p>
{{postConfig.ChangeAuditByName}}：{{postConfig.ChangeAduitDate}}
<template v-if="postConfig.TravelState==8">
<span style="color:blue;"> 通过</span>
<span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
</template>
<template v-if="postConfig.TravelState==7">
<span style="color:red;"> 驳回</span>
<span style="color:red;">{{$t('fnc.bohui')}}</span>
</template>
{{postConfig.ChangeAduitContent}}
</p>
</template>
<template>
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
:loading="importOfferLoading" @click="downLoadOffer(postConfig)">下载系统报价单
:loading="importOfferLoading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
</el-button>
</template>
</td>
<td colspan="3">
当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">
{{$t('objFill.dangqiantdlx')}}: <template v-if="postConfig.TeamTypeName=='小包团'">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
</template>
<template v-else>
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ b578e81b
......@@ -111,7 +111,7 @@
</td>
<td :colspan="13-2-CostNumberList.length+1">
<el-form-item>
<el-input placeholder="请填写人数" v-model='priceObj.priceNum' style="width:140px;"
<el-input :placeholder="$t('objFill.qingtxrs')" v-model='priceObj.priceNum' style="width:140px;"
@keyup.native="checkInteger(priceObj,'priceNum'),getchange()">
<el-button slot="append" class="iconfont icon-img_haha" @click="addPeoNunber"></el-button>
</el-input>
......@@ -155,7 +155,6 @@
{{$t('tips.di')}}{{subItem.DayNum}}{{$t('hotel.hotel_day')}}
<br />
{{GetDayStr(subItem.DayNum-1)}}
</td>
<td>
<el-form-item>
......@@ -172,14 +171,14 @@
</td>
<td>
<el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, subItem)"
v-model='subItem.HotelId' placeholder="请输入酒店名称" :loading="loading"
v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
@change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
<el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
</el-option>
</el-select>
<el-form-item label="含餐:">
<el-select v-model='subItem.ContainDinnerType' style="width:100px;" :placeholder="$t('objFill.v101.hancanlxin')"
@change="DinnerTypeChange(subItem)">
<el-form-item :label="$t('objFill.v101.hancan')">
<el-select v-model='subItem.ContainDinnerType' style="width:100px;"
:placeholder="$t('objFill.v101.hancanlxin')" @change="DinnerTypeChange(subItem)">
<el-option :label="$t('objFill.v101.hancanlxin')" :value='0'></el-option>
<el-option :label="$t('objFill.hanzaocan')" :value='1'></el-option>
<el-option :label="$t('objFill.hanwancan')" :value='2'></el-option>
......@@ -189,7 +188,8 @@
</td>
<td>
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" :placeholder="$t('objFill.v101.jiudianjge')"></el-input>
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)"
:placeholder="$t('objFill.v101.jiudianjge')"></el-input>
<template v-if="subItem.IsHotelChange">
<font style="color:red;">
<template v-if="subItem.HotelChangeValue>0">
......@@ -202,7 +202,7 @@
</td>
<td>
<el-input type='text' v-model="subItem.BusCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange(1)" placeholder="车资">
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange(1)" :placeholder="$t('objFill.chezi')">
</el-input>
<template v-if="subItem.IsBusChange">
<font style="color:red;">
......@@ -216,26 +216,27 @@
</td>
<td>
<el-input type='text' v-model="subItem.PassFee" class="w70"
@keyup.native="checkPrice(subItem,'PassFee'),getchange(1)" placeholder="过路费、请车费">
@keyup.native="checkPrice(subItem,'PassFee'),getchange(1)"
:placeholder="$t('objFill.v101.guolfqcfei')">
</el-input>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
<el-form-item label="早:" label-width="16px">
<el-form-item :label="$t('objFill.v101.zaocanmc')" label-width="16px">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')"
v-model="subItem.BreakfastName" style="width:160px">
<i slot="suffix" class="el-input__icon el-icon-search" style="cursor:pointer;"
@click="showDiningDig(subItem,1)"></i>
</el-input>
</el-form-item>
<el-form-item label="午:" label-width="16px">
<el-form-item :label="$t('objFill.v101.wucanmc')" label-width="16px">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')" v-model="subItem.LunchName"
style="width:160px">
<i slot="suffix" class="el-input__icon el-icon-search" style="cursor:pointer;"
@click="showDiningDig(subItem,2)"></i>
</el-input>
</el-form-item>
<el-form-item label="晚:" label-width="16px">
<el-form-item :label="$t('objFill.v101.wancaimc')" label-width="16px">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')"
v-model="subItem.DinnerName" style="width:160px;">
<i slot="suffix" class="el-input__icon el-icon-search" style="cursor:pointer;"
......@@ -244,38 +245,41 @@
</el-form-item>
</template>
<template v-else>
早:<el-input type="text"
{{$t('objFill.v101.zaocanmc')}}:<el-input type="text"
:disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.BreakfastName' class="w120" placeholder="早餐名称"> </el-input>
v-model='subItem.BreakfastName' class="w120" :placeholder="$t('objFill.v101.zaocanmc')"> </el-input>
<br />
午:<el-input type="text" v-model='subItem.LunchName' class="w120" placeholder="午餐名称"></el-input>
{{$t('objFill.v101.wucanmc')}}:<el-input type="text" v-model='subItem.LunchName' class="w120"
:placeholder="$t('objFill.v101.wucanmc')"></el-input>
<br />
晚:<el-input type="text"
{{$t('objFill.v101.wancaimc')}}:<el-input type="text"
:disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.DinnerName' class="w120" placeholder="晚餐名称"></el-input>
v-model='subItem.DinnerName' class="w120" :placeholder="$t('objFill.v101.wancaimc')"></el-input>
</template>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
早:<el-input type="text" :disabled="true" v-model='subItem.BreakfastCostPrice' class="w70"
{{$t('objFill.v101.zaocanmc')}}:<el-input type="text" :disabled="true"
v-model='subItem.BreakfastCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange(1)"></el-input>
<br />
午:<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
{{$t('objFill.v101.wucanmc')}}:<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange(1)" :disabled="true"></el-input>
<br />
晚:<el-input type="text" :disabled="true" v-model='subItem.DinnerCostPrice' class="w70"
{{$t('objFill.v101.wancaimc')}}:<el-input type="text" :disabled="true"
v-model='subItem.DinnerCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange(1)"></el-input>
</template>
<template v-else>
早:<el-input type="text"
{{$t('objFill.v101.zaocanmc')}}:<el-input type="text"
:disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.BreakfastCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange(1)"></el-input>
<br />
午:<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
{{$t('objFill.v101.wucanmc')}}:<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange(1)"></el-input>
<br />
晚:<el-input type="text"
{{$t('objFill.v101.wancaimc')}}:<el-input type="text"
:disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.DinnerCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange(1)"></el-input>
......@@ -287,7 +291,7 @@
<el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
:remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
@change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
<el-option :value="0" label="请选择"></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
:value='x.TicketId'>
</el-option>
......@@ -297,7 +301,7 @@
<el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
:remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
@change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
<el-option :value="0" label="请选择"></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
:value='x.TicketId'>
</el-option>
......@@ -310,19 +314,20 @@
<template v-if="scenicIndex==0">
<el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
placeholder="景点价格">
:placeholder="$t('objFill.v101.jindianjiag')">
</el-input>
</template>
<template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketId>0">
<el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
placeholder="景点价格">
:placeholder="$t('objFill.v101.jindianjiag')">
</el-input>
</template>
</template>
</td>
<td>
<el-input type="text" v-model='subItem.OtherName' class="w70" placeholder="杂支名称"></el-input>
<el-input type="text" v-model='subItem.OtherName' class="w70"
:placeholder="$t('objFill.v101.zazhiminc')"></el-input>
</td>
<td>
<el-input type="text" v-model='subItem.OtherPrice' class="w70"
......@@ -332,56 +337,56 @@
</template>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
外币小计
{{$t('objFill.waibixj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,1)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}}
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,1)}}
{{$t('objFill.chezhixj')}}: {{getDayXiaoJi(2,1)}}
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,1)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}}
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,1)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}}
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,1)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币小计
{{$t('objFill.renmingbxj')}}
</td>
<!--酒店小计-->
<td colspan="2">
酒店小计: {{getDayXiaoJi(1,2)}}
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}}
</td>
<!--车资小计-->
<td colspan="2">
车资小计:{{getDayXiaoJi(2,2)}}
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}}
</td>
<!--餐小计-->
<td colspan="2">
餐小计: {{getDayXiaoJi(4,2)}}
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}}
</td>
<!--门票小计-->
<td colspan="2">
门票小计: {{getDayXiaoJi(3,2)}}
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
</td>
<!--其它费用小计-->
<td colspan="2">
杂支小计: {{getDayXiaoJi(9,2)}}
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
</td>
</tr>
<tr>
<td colspan="13">其它成本(人民币)</td>
<td colspan="13">{{$t('objFill.qitacbrmb')}}</td>
</tr>
<tr>
<td colspan="2">
......@@ -391,37 +396,37 @@
</el-form-item>
</td>
<td>
<el-form-item label="中段机票">
<el-form-item :label="$t('objFill.zhongduanjp')">
<el-input type="text" v-model='otherPrice.InlandAirTicketMoney' class="w100"
@keyup.native="checkPrice(otherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
<el-form-item :label="$t('objFill.shuijin')">
<el-input type="text" v-model='teamPrice.TaxPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="联运">
<el-form-item :label="$t('salesModule.Union')">
<el-input type="text" v-model='teamPrice.UnionPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="6" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
{{$t('objFill.xiaojijpzdsjly')}}:
<br /> {{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-form-item :label="$t('objFill.lingduidyft')">
<el-input type='text' class="w100" v-model="otherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(otherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="过夜">
<el-form-item :label="$t('objFill.guoye')">
<el-input type="text" v-model='teamPrice.NightPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
</el-form-item>
......@@ -433,7 +438,7 @@
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="保险">
<el-form-item :label="$t('Operation.Op_insurance')">
<el-input type='text' class="w100" v-model="otherPrice.SafeMoney"
@keyup.native="checkPrice(otherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item>
......@@ -444,13 +449,13 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="婴儿">
<el-form-item :label="$t('Operation.Op_baby')">
<el-input v-model="teamPrice.BabyPrice" @keyup.native="checkInteger(teamPrice,'BabyPrice')" class="w70">
</el-input>
</el-form-item>
</td>
<td>
<el-form-item label="单地接(成本)">
<el-form-item :label="$t('objFill.dandijcb')">
<el-input v-model="teamPrice.SingleDMCPrice" @keyup.native="checkInteger(teamPrice,'SingleDMCPrice')"
@blur="getchange()" class="w70">
</el-input>
......@@ -478,7 +483,7 @@
</el-form-item>
</td>
<td colspan="4">
<el-form-item label="单地接(价格)">
<el-form-item :label="$t('objFill.dandijjg')">
<el-input placeholder="" v-model="teamPrice.SingleDMCTCPrice"
@keyup.native="checkPrice(teamPrice,'SingleDMCTCPrice')" class="w70">
</el-input>
......@@ -487,7 +492,7 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="主OP">
<el-form-item :label="$t('Operation.Op_zhu')+`OP`">
<el-select class="w100" v-model="postConfig.OPId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
......@@ -495,10 +500,10 @@
</el-option>
</el-select>
</el-form-item>
<span style="color:red">关联提成,请正确填写</span>
<span style="color:red">{{$t('objFill.v101.guanltcqzqtx')}}</span>
</td>
<td colspan="3">
<el-form-item label="助理OP">
<el-form-item :label="$t('objFill.zhuli')+`OP`">
<el-select class="w250" v-model="postConfig.AssistantList" :placeholder="$t('pub.pleaseSel')" filterable
multiple>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
......@@ -506,7 +511,7 @@
:key="index"></el-option>
</el-select>
</el-form-item>
<span style="color:red">关联提成,请正确填写;美工有单独的配置，请不要配置在助理OP里面。</span>
<span style="color:red">{{$t('objFill.v101.meigydddpeiz')}}</span>
</td>
<td colspan="2">
<el-form-item :label="$t('fnc.fkfangshi')">
......@@ -519,10 +524,10 @@
</el-form-item>
</td>
<td colspan="6">
附件: <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="UploadAttachment"
:show-file-list="false" action="">
<el-button size="small" type="primary">报价单附件</el-button>
{{$t('objFill.fj')}}: <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length"
class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="UploadAttachment" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.bjdfj')}}</el-button>
</el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray">
......@@ -542,36 +547,36 @@
<td>
</td>
<td>
人数
{{$t('admin.admin_personNumber')}}
</td>
<td colspan="2">
酒店+车+餐+门票+杂支
{{$t('objFill.v101.jiudccmzji')}}
</td>
<td>
地接成本<br />(外币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.waibi')}})
</td>
<td>
地接成本<br />(人民币)
{{$t('objFill.dijiechengben')}}<br />({{$t('fnc.a_rminbi')}})
</td>
<td colspan="2">
成本<br />[单地接+其它成本(人民币)小计]
{{$t('hotel.hotel_cost')}}<br /> [{{$t('objFill.v101.dandjqtcbrmbxj')}}]
</td>
<td>
同业销售价格
<br />(人民币)
{{$t('objFill.tongyexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
直客销售价格
<br />(人民币)
{{$t('objFill.zhikexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</td>
<td colspan="2">
备注
{{$t('fnc.beizhu')}}
</td>
</tr>
<!--已填写人数-->
......@@ -579,15 +584,15 @@
<template v-for="(subItem,subIndex) in CostNumberList">
<tr :key="subIndex">
<td v-if="subIndex==0" :rowspan="CostNumberList.length">
合计
{{$t('fnc.a_heji')}}
</td>
<td>
{{subItem.PeopleNumber}}
</td>
<td colspan="2">
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{getDayXiaoJi(1,1)}}({{$t('objFill.jiu')}})+
{{(getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.chezczcyrs')}})+{{getDayXiaoJi(4,1)}}({{$t('objFill.can')}})+{{getDayXiaoJi(3,1)}}({{$t('scen.sc_piao')}})
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.zazhizzzcyrsK')}})
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ b578e81b
......@@ -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>
......@@ -289,7 +290,7 @@
</div>
</div>
<template v-if="item.ChangeManagerAduitDate&&item.ChangeManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;" >
<div class="priceContentDiv" style="margin-bottom:5px;">
<div>
<span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
<span class="AuditDate">{{item.ChangeManagerAduitDate}}</span>
......@@ -304,7 +305,8 @@
</div>
</div>
</template>
<div class="priceContentDiv" v-if="item.ChangeAduitDate&&item.ChangeAduitDate!=''" style="margin-bottom:5px;">
<div class="priceContentDiv" v-if="item.ChangeAduitDate&&item.ChangeAduitDate!=''"
style="margin-bottom:5px;">
<div>
<span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
<span class="AuditDate">{{item.ChangeAduitDate}}</span>
......@@ -324,7 +326,8 @@
</div>
<div style="width:134px;">
<span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&& item.OpenState==2">
<el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start"
popper-class="max-w250">
</el-tooltip>
{{$t('op.Kai')}}
</span>
......@@ -349,9 +352,11 @@
<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">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baojdbgen')" placement="top-start" popper-class="max-w250">
<i @click="goUrl('OfferChange',item,3)" class="iconfont el-icon-edit"></i>
<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">
<i @click="goUrl('OfferChange',item,3)" class="el-icon-edit" circle></i>
</el-tooltip>
</span>
<span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)">
......@@ -389,7 +394,8 @@
<tbody>
<tr height="36">
<td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label></td>
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label>
</td>
<td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
for="IsShowTraffic">{{$t('objFill.v101.jiaotobuf')}}</label></td>
</tr>
......@@ -413,7 +419,7 @@
</tr>
<tr height="36">
<td><input id="IsCostRebate" type="checkbox" v-model="downLoadMsg.IsCostRebate" /><label
for="IsCostRebate" >{{$t('objFill.v101.chengbhuko')}}</label></td>
for="IsCostRebate">{{$t('objFill.v101.chengbhuko')}}</label></td>
<td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
for="IsShowOtherPrice">{{$t('objFill.v101.linduifentan')}}</label></td>
</tr>
......@@ -484,8 +490,8 @@
</td>
<td>
<el-form-item :label="$t('fnc.khmingcheng')">
<el-input v-model="postConfig.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')" maxlength="200"
style="width:180px">
<el-input v-model="postConfig.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')"
maxlength="200" style="width:180px">
</el-input>
</el-form-item>
</td>
......@@ -506,7 +512,8 @@
</tbody>
<tr>
<td colspan="2" style="text-align:center;">
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">{{$t('pub.saveBtn')}}
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">
{{$t('pub.saveBtn')}}
</el-button>
<input type="button" class="normalBtn" :value="$t('pub.closeSel')"
@click="isShowImportOffer=false,clearMsg()" />
......@@ -618,7 +625,7 @@
//复制报价单
copyOffer(item) {
var that = this;
var tipMsg = that.$t('sm.shifyfzhi')+"【" + item.Title + "】"+that.$t('objFill.v101.cibaojdan');
var tipMsg = that.$t('sm.shifyfzhi') + "【" + item.Title + "】" + that.$t('objFill.v101.cibaojdan');
that.Confirm(tipMsg, function () {
let offerMsg = {
OldOfferId: item.OfferId,
......@@ -698,7 +705,7 @@
this.isShowImportOffer = false;
this.getList();
} else {
this.$message.error(this.$t('objFill.v101.Rest.shangchuansb')+'!');
this.$message.error(this.$t('objFill.v101.Rest.shangchuansb') + '!');
}
}
}).catch(err => {
......@@ -867,7 +874,7 @@
} else if (item.LineName) {
fileName += "【" + item.LineName + "】";
}
fileName += this.$t('objFill.v101.chengbenxiaz')+".xls";
fileName += this.$t('objFill.v101.chengbenxiaz') + ".xls";
this.downLoadMsg.FileName = fileName;
this.downloadBill = true;
},
......
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