Skip to content

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

团队类型调整

parent d4513086
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 48 deletions
src/assets/common/lang/en.js
View file @ c1c9e7af
......@@ -1316,6 +1316,7 @@ export const fnc = {
a_hkfkshijian: 'Remittance time/payment time',
a_dhuanlv: 'Exchange rate',
a_rminbi: 'RMB',
a_ynd:"Rupiah",
a_qcyue: 'Opening balance',
a_fkshijian: 'Payment time',
a_heji: 'Total',
......
src/assets/common/lang/jp.js
View file @ c1c9e7af
......@@ -1262,6 +1262,7 @@ export const fnc = {
a_hkfkshijian:'送金時間/支払時間',
a_dhuanlv:'為替レート',
a_rminbi:'人民元',
a_ynd:"インドネシア盾",
a_qcyue:'期首残高',
a_fkshijian:'支払い時間',
a_heji:'合計',
......
src/assets/common/lang/zh-tw.js
View file @ c1c9e7af
......@@ -1306,6 +1306,7 @@ export const fnc = {
a_hkfkshijian: '匯款時間/付款時間',
a_dhuanlv: '兌換率',
a_rminbi: '人民幣',
a_ynd:"印尼盾",
a_qcyue: '期初餘額',
a_fkshijian: '付款時間',
a_heji: '合計',
......
src/assets/common/lang/zh.js
View file @ c1c9e7af
......@@ -1319,6 +1319,7 @@ export const fnc = {
a_hkfkshijian: '汇款时间/付款时间',
a_dhuanlv: '兑换率',
a_rminbi: '人民币',
a_ynd:"印尼盾",
a_qcyue: '期初余额',
a_fkshijian: '付款时间',
a_heji: '合计',
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ c1c9e7af
......@@ -57,7 +57,7 @@
<div class="QuotationFirstDiv1">
<table style="font-size:14px;">
<tr>
<td width="80" class="txtRightCost">{{$t('objFill.v101.kaituants')}}</td>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td width="300">
<template v-if="postConfig.TeamType==1">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
......@@ -680,16 +680,39 @@
</td>
<td>
{{$t('objFill.tongyexsjg')}}
<!-- <br />({{$t('fnc.a_rminbi')}}) -->
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
{{$t('objFill.zhikexsjg')}}
<!-- <br />({{$t('fnc.a_rminbi')}}) -->
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</template>
</td>
<td colspan="2">
......@@ -860,8 +883,11 @@
{{subItem.B2CSalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
</template>
</template>
</td>
<td colspan="2">
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ c1c9e7af
......@@ -577,16 +577,40 @@
</td>
<td>
{{$t('objFill.tongyexsjg')}}
<!-- <br />({{$t('fnc.a_rminbi')}}) -->
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
{{$t('objFill.zhikexsjg')}}
<!-- <br />({{$t('fnc.a_rminbi')}}) -->
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</template>
</td>
<td colspan="2">
......@@ -629,17 +653,20 @@
{{subItem.TotalMoney}}
</td>
<td>
<el-input type='text' class="w70" v-model="subItem.SalePrice"
<el-input type='text' class="w120" v-model="subItem.SalePrice"
@keyup.native="checkPrice(subItem,'SalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input type='text' class="w70" v-model="subItem.B2CSalePrice"
<el-input type='text' class="w120" v-model="subItem.B2CSalePrice"
@keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
</template>
</td>
<td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input>
......@@ -1028,7 +1055,7 @@
this.getConvertMoney(this.otherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.otherPrice.InlandTrainTicketMoney)+
this.getConvertMoney(this.otherPrice.InlandTrainTicketMoney) +
this.getConvertMoney(this.otherPrice.SafeMoney) -
this.getConvertMoney(this.otherPrice.KBMoney)
return totalMoney;
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ c1c9e7af
......@@ -172,7 +172,9 @@
<span>{{getTitle(item)}}</span>
</el-tooltip>
</p>
<p>{{$t('fnc.khmingcheng')}}：{{item.CustomerName}}</p>
<template v-if="item.CustomerName&&item.CustomerName!=''">
<p>{{$t('fnc.khmingcheng')}}：{{item.CustomerName}}</p>
</template>
<p>{{$t('scen.sc_cp')}}：{{item.OutBranchName}}</p>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ c1c9e7af
......@@ -911,18 +911,25 @@
</div>
<div class="clearfix">
<div class="TPright clearfix">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<template v-if="priceData.TeamType==0||priceData.TeamType==1">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<template v-if="priceData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
<template v-if="priceData.TeamType==1">
<el-option v-if="item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</template>
</el-select>
</el-form-item>
</template>
<el-form-item style="margin-top:1px;display:none;">
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ c1c9e7af
......@@ -554,7 +554,7 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
......@@ -612,7 +612,7 @@
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
......@@ -897,17 +897,25 @@
</div>
<div class="clearfix">
<div class="TPright clearfix">
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id==2||item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<template v-if="priceData.TeamType==0||priceData.TeamType==1">
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<template v-if="priceData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
<template v-if="priceData.TeamType==1">
<el-option v-if="item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</template>
</el-select>
</el-form-item>
</template>
<el-form-item style="margin-top:1px;display:none;">
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
......@@ -1419,7 +1427,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsLeaderDaiTuan: 1, //领队带团/不带团
IsNewArrival: 0, //是否新品
IsNewArrival: 0, //是否新品
};
}
this.returnPriceList.push(objItem);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ c1c9e7af
......@@ -1178,7 +1178,7 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType: 1, //团队类型
PriceTeamType: "", //团队类型
PriceOfferUrl: '', //报价单地址
PriceOfferName: "", //报价单名称
IsUseCompanyBus: 0, //是否使用公司车辆
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ c1c9e7af
......@@ -1276,7 +1276,7 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType: 1, //团队类型
PriceTeamType: "", //团队类型
PriceOfferUrl: '', //报价单地址
PriceOfferName: "", //报价单名称
IsUseCompanyBus: 0, //是否使用公司车辆
......
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