Skip to content

S
SuperMan
Commit d907e038 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 235256b6 0050c2a0
Hide whitespace changes
Inline Side-by-side
Showing with 332 additions and 324 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d907e038
...@@ -1564,7 +1564,7 @@ ...@@ -1564,7 +1564,7 @@
</div> </div>
<div style="padding-left: 75px;"> <div style="padding-left: 75px;">
<button class="hollowFixedBtn" <button class="hollowFixedBtn"
v-if="(bossID===1 || bossID===5||bossID===1934 || bossID===2786) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" v-if="(bossID===1 || bossID===5||bossID===1934 || bossID===2786 || bossID===2769) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)"
@click="bohui()">{{$t('fnc.bohui')}}</button> @click="bohui()">{{$t('fnc.bohui')}}</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button> <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
</div> </div>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ d907e038
...@@ -2717,6 +2717,7 @@ export default { ...@@ -2717,6 +2717,7 @@ export default {
cW = allW - 90; cW = allW - 90;
cH = allH - 350 - 52; cH = allH - 350 - 52;
this.msg.pageSize = parseInt(cH / 30) - 2; this.msg.pageSize = parseInt(cH / 30) - 2;
if(this.msg.pageSize>16){this.msg.pageSize=16;}
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d907e038
...@@ -595,7 +595,8 @@ ...@@ -595,7 +595,8 @@
<th width="80">{{ $t("system.query_arrivalTime") }}</th> <th width="80">{{ $t("system.query_arrivalTime") }}</th>
<th width="100">{{ $t("system.query_stopCity") }}</th> <th width="100">{{ $t("system.query_stopCity") }}</th>
</tr> </tr>
<tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center"> <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex"
style="text-align: center">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span> <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
<span v-else-if="fIndex == item.flightList.length - 1">{{ <span v-else-if="fIndex == item.flightList.length - 1">{{
...@@ -634,8 +635,8 @@ ...@@ -634,8 +635,8 @@
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<template v-if="item.UseFlightType == 0"> <template v-if="item.UseFlightType == 0">
<template v-for="(nItem,newIndex) in item.newFlightList"> <template v-for="(nItem,newIndex) in item.newFlightList">
<div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID" <div v-for="(subItem) in nItem.flightList" slot="reference"
class="TCL-flighInfoList"> :key="`d_`+index+`f_`+newIndex+`_`+subItem.ID" class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{ <span class="TCL-FlightNumber">{{
subItem.Flight_number subItem.Flight_number
...@@ -2390,7 +2391,7 @@ ...@@ -2390,7 +2391,7 @@
CurrentUserInfo: {}, CurrentUserInfo: {},
showHotelObj: { showHotelObj: {
showPrice: true, //是否显示价格 showPrice: true, //是否显示价格
showPay: false, //是否显示支付方式 showPay: true, //是否显示支付方式
showZhan: true, //占房时间 showZhan: true, //占房时间
showBtnList: false, //是否下载、确认按钮 showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别 ShowTaxType: false, //显示税入税别
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d907e038
...@@ -279,11 +279,10 @@ ...@@ -279,11 +279,10 @@
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('Operation.Op_TransportState')}}</span> <span>{{$t('Operation.Op_TransportState')}}</span>
<span> <span>
<el-select class="w180 multiple_input" v-model="queryMsg.IsShowUnion"> <el-checkbox-group v-model="queryCommonData.IsUnionCked" style="margin-left: 0">
<el-option :key="-1" :label="$t('advmanager.v_all')" :value="-1"></el-option> <el-checkbox v-for="state in unionStatus" :label="state.Id" :checked="state.Checked"
<el-option :key="1" :label="$t('system.table_isShows')" :value="1"></el-option> @change="checkedUnion(state)" :key="state.Name">{{ state.Name }}</el-checkbox>
<el-option :key="0" :label="$t('Operation.Op_hide')" :value="0"></el-option> </el-checkbox-group>
</el-select>
</span> </span>
</div> </div>
<div class="comSearchDiv" style="display: flex;align-items: center;"> <div class="comSearchDiv" style="display: flex;align-items: center;">
...@@ -1733,6 +1732,7 @@ ...@@ -1733,6 +1732,7 @@
singleTCID: 0, singleTCID: 0,
outerVisible: false, outerVisible: false,
flightCKed: [], flightCKed: [],
IsUnionCked: [],
loading: false, loading: false,
checkCompanyAll: true, checkCompanyAll: true,
showUnion: false, showUnion: false,
...@@ -1791,7 +1791,7 @@ ...@@ -1791,7 +1791,7 @@
CurrentUserInfo: {}, CurrentUserInfo: {},
showHotelObj: { showHotelObj: {
showPrice: true, //是否显示价格 showPrice: true, //是否显示价格
showPay: false, //是否显示支付方式 showPay: true, //是否显示支付方式
showZhan: true, //占房时间 showZhan: true, //占房时间
showBtnList: false, //是否下载、确认按钮 showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别 ShowTaxType: false, //显示税入税别
...@@ -1826,6 +1826,23 @@ ...@@ -1826,6 +1826,23 @@
Checked: false Checked: false
} }
], ],
//联运状态
unionStatus: [{
Id: -1,
Name: this.$t("advmanager.v_all"),
Checked: true,
},
{
Id: 0,
Name: this.$t("op.MainGroup"),
Checked: false,
},
{
Id: 1,
Name: this.$t("op.DistributionGroup"),
Checked: false,
},
],
CopyTripAndFeatureMsg: { CopyTripAndFeatureMsg: {
updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面 updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面
isShowTripFeature: false, isShowTripFeature: false,
...@@ -2979,6 +2996,11 @@ ...@@ -2979,6 +2996,11 @@
this.queryCommonData.flightCKed = []; this.queryCommonData.flightCKed = [];
this.queryCommonData.flightCKed.push(item.Id); this.queryCommonData.flightCKed.push(item.Id);
}, },
checkedUnion(item) {
this.queryMsg.IsShowUnion = item.Id;
this.queryCommonData.IsUnionCked = [];
this.queryCommonData.IsUnionCked.push(item.Id);
},
//点击选取出团公司 //点击选取出团公司
getCompanyCheck(item) { getCompanyCheck(item) {
item.isShow = !item.isShow; item.isShow = !item.isShow;
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ d907e038
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
</template> </template>
</font> </font>
</template> </template>
<!-- </br><a v-if="IsEdit==3" style="color:blue;cursor:pointer" <br /><a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> --> @click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a>
</td> </td>
<td :colspan="13-2-CostCurrencyList.length+1"> <td :colspan="13-2-CostCurrencyList.length+1">
</td> </td>
...@@ -185,9 +185,9 @@ ...@@ -185,9 +185,9 @@
</template> </template>
</font> </font>
</template> </template>
<!-- <br/> <br />
<a v-if="IsEdit==3" style="color:blue;cursor:pointer" <a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> --> @click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a>
</td> </td>
<td :colspan="13-2-CostNumberList.length+1"> <td :colspan="13-2-CostNumberList.length+1">
</td> </td>
...@@ -333,7 +333,6 @@ ...@@ -333,7 +333,6 @@
</font><br /> </font><br />
</template> </template>
</template> </template>
</td> </td>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
<template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange"> <template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange">
...@@ -391,7 +390,9 @@ ...@@ -391,7 +390,9 @@
v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')"> v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')">
<font> <font>
{{childIndex+1}}、 {{childIndex+1}}、
<font v-if="childItem.TicketName!=''" :style="(childItem.TicketCostPrice+childItem.NewTicketCostPrice==0)?'text-decoration: line-through;':''">{{childItem.TicketName}}</font> <font v-if="childItem.TicketName!=''"
:style="(childItem.TicketCostPrice+childItem.NewTicketCostPrice==0)?'text-decoration: line-through;':''">
{{childItem.TicketName}}</font>
<font v-if="childItem.NewTicketName&&childItem.NewTicketName!=''" style="color：red;"> <font v-if="childItem.NewTicketName&&childItem.NewTicketName!=''" style="color：red;">
{{childItem.NewTicketName}}</font> {{childItem.NewTicketName}}</font>
</font> </font>
...@@ -463,7 +464,6 @@ ...@@ -463,7 +464,6 @@
<template v-else> <template v-else>
{{getDayChangeXiaoJi(1,1)}} {{getDayChangeXiaoJi(1,1)}}
</template> </template>
</font> </font>
=<font style="color:red">{{Number(getDayXiaoJi(1,1))+Number(getDayChangeXiaoJi(1,1))}}</font> =<font style="color:red">{{Number(getDayXiaoJi(1,1))+Number(getDayChangeXiaoJi(1,1))}}</font>
</template> </template>
...@@ -547,14 +547,17 @@ ...@@ -547,14 +547,17 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(1)!=0"> <template v-if="getRateChangeXiaoJi(1)!=0">
<template v-if="getRateChangeXiaoJi(1)>0"> <el-tooltip content="汇率变更">
+{{getRateChangeXiaoJi(1)}} <font style="color:#ef5b9c;">
</template> <template v-if="getRateChangeXiaoJi(1)>0">
<template v-else> +{{getRateChangeXiaoJi(1)}}
{{getRateChangeXiaoJi(1)}} </template>
</template> <template v-else>
{{getRateChangeXiaoJi(1)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font> {{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font>
...@@ -574,12 +577,16 @@ ...@@ -574,12 +577,16 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(2)!=0"> <template v-if="getRateChangeXiaoJi(2)!=0">
<template v-if="getRateChangeXiaoJi(2)>0"> <el-tooltip content="汇率变更">
+{{getRateChangeXiaoJi(2)}} <font style="color:#ef5b9c;">
</template> <template v-if="getRateChangeXiaoJi(2)>0">
<template v-else> +{{getRateChangeXiaoJi(2)}}
{{getRateChangeXiaoJi(2)}} </template>
</template> <template v-else>
{{getRateChangeXiaoJi(2)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -600,12 +607,16 @@ ...@@ -600,12 +607,16 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(4)!=0"> <template v-if="getRateChangeXiaoJi(4)!=0">
<template v-if="getRateChangeXiaoJi(4)>0"> <el-tooltip content="汇率变更">
+{{getRateChangeXiaoJi(4)}} <font style="color:#ef5b9c;">
</template> <template v-if="getRateChangeXiaoJi(4)>0">
<template v-else> +{{getRateChangeXiaoJi(4)}}
{{getRateChangeXiaoJi(4)}} </template>
</template> <template v-else>
{{getRateChangeXiaoJi(4)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -626,12 +637,16 @@ ...@@ -626,12 +637,16 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(3)!=0"> <template v-if="getRateChangeXiaoJi(3)!=0">
<template v-if="getRateChangeXiaoJi(3)>0"> <el-tooltip content="汇率变更">
+{{getRateChangeXiaoJi(3)}} <font style="color:#ef5b9c;">
</template> <template v-if="getRateChangeXiaoJi(3)>0">
<template v-else> +{{getRateChangeXiaoJi(3)}}
{{getRateChangeXiaoJi(3)}} </template>
</template> <template v-else>
{{getRateChangeXiaoJi(3)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -652,12 +667,16 @@ ...@@ -652,12 +667,16 @@
</template> </template>
</template> </template>
<template v-if="getRateChangeXiaoJi(9)!=0"> <template v-if="getRateChangeXiaoJi(9)!=0">
<template v-if="getRateChangeXiaoJi(9)>0"> <el-tooltip content="汇率变更">
+{{getRateChangeXiaoJi(9)}} <font style="color:#ef5b9c;">
</template> <template v-if="getRateChangeXiaoJi(9)>0">
<template v-else> +{{getRateChangeXiaoJi(9)}}
{{getRateChangeXiaoJi(9)}} </template>
</template> <template v-else>
{{getRateChangeXiaoJi(9)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red;"> =<font style="color:red;">
...@@ -770,7 +789,6 @@ ...@@ -770,7 +789,6 @@
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('objFill.qitafeiyongsm')"> <el-form-item :label="$t('objFill.qitafeiyongsm')">
{{OtherPrice.OtherRemark}} {{OtherPrice.OtherRemark}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2" rowspan="2"> <td colspan="2" rowspan="2">
...@@ -1116,28 +1134,23 @@ ...@@ -1116,28 +1134,23 @@
</td> </td>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}} {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
<template <template v-if="(getLocalJpyChangeTotalMoney(subItem)!=0)!=0">
v-if="(getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumJpyChangeTotalMoney(subItem))!=0">
<font style="color:red;"> <font style="color:red;">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0"> <template v-if="getLocalJpyChangeTotalMoney(subItem)!=0">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)>0"> <el-tooltip content="地接费用变更金额">
+{{getLocalJpyChangeTotalMoney(subItem.PeopleNumber)}} <font>
</template> <template v-if="getLocalJpyChangeTotalMoney(subItem)>0">
<template v-else> +{{getLocalJpyChangeTotalMoney(subItem)}}
{{getLocalJpyChangeTotalMoney(subItem.PeopleNumber)}} </template>
</template> <template v-else>
</template> {{getLocalJpyChangeTotalMoney(subItem)}}
<template v-if="getPeopleNumJpyChangeTotalMoney(subItem)!=0"> </template>
<template v-if="getPeopleNumJpyChangeTotalMoney(subItem)>0"> </font>
+{{getPeopleNumJpyChangeTotalMoney(subItem)}} </el-tooltip>
</template>
<template v-else>
{{getPeopleNumJpyChangeTotalMoney(subItem)}}
</template>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
{{(Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))+Number(getPeopleNumJpyChangeTotalMoney(subItem))).toFixed(2)}} {{(Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem))).toFixed(2)}}
</font> </font>
</template> </template>
</td> </td>
...@@ -1156,12 +1169,16 @@ ...@@ -1156,12 +1169,16 @@
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <el-tooltip content="人数汇率变更">
+{{getPeopleNumberChangeTotalMoney(subItem)}} <font style="color:#ef5b9c;">
</template> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
<template v-else> +{{getPeopleNumberChangeTotalMoney(subItem)}}
{{getPeopleNumberChangeTotalMoney(subItem)}} </template>
</template> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -1183,12 +1200,16 @@ ...@@ -1183,12 +1200,16 @@
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <el-tooltip content="人数汇率变更">
+{{getPeopleNumberChangeTotalMoney(subItem)}} <font style="color:#ef5b9c;">
</template> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
<template v-else> +{{getPeopleNumberChangeTotalMoney(subItem)}}
{{getPeopleNumberChangeTotalMoney(subItem)}} </template>
</template> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -1210,12 +1231,16 @@ ...@@ -1210,12 +1231,16 @@
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <el-tooltip content="人数汇率变更">
+{{getPeopleNumberChangeTotalMoney(subItem)}} <font style="color:#ef5b9c;">
</template> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
<template v-else> +{{getPeopleNumberChangeTotalMoney(subItem)}}
{{getPeopleNumberChangeTotalMoney(subItem)}} </template>
</template> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}}
</template>
</font>
</el-tooltip>
</template> </template>
</font> </font>
=<font style="color:red"> =<font style="color:red">
...@@ -1241,12 +1266,16 @@ ...@@ -1241,12 +1266,16 @@
</template> </template>
</template> </template>
<template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0"> <template v-if="getPeopleNumberChangeTotalMoney(subItem)!=0">
<template v-if="getPeopleNumberChangeTotalMoney(subItem)>0"> <el-tooltip content="人数汇率变更">
+{{getPeopleNumberChangeTotalMoney(subItem)}} <font style="color:#ef5b9c;">
</template> <template v-if="getPeopleNumberChangeTotalMoney(subItem)>0">
<template v-else> +{{getPeopleNumberChangeTotalMoney(subItem)}}
{{getPeopleNumberChangeTotalMoney(subItem)}} </template>
</template> <template v-else>
{{getPeopleNumberChangeTotalMoney(subItem)}}
</template>
</font>
</el-tooltip>
</template> </template>
<template v-if="getChangeCostTotalMoney()!=0"> <template v-if="getChangeCostTotalMoney()!=0">
<template v-if="getChangeCostTotalMoney()>0"> <template v-if="getChangeCostTotalMoney()>0">
...@@ -1595,7 +1624,6 @@ ...@@ -1595,7 +1624,6 @@
this.changMsg.checkObj = item; this.changMsg.checkObj = item;
} }
} }
}, },
GetDayStr(dayNum) { GetDayStr(dayNum) {
var str = ""; var str = "";
...@@ -1911,10 +1939,14 @@ ...@@ -1911,10 +1939,14 @@
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
//获取地接项目变更金额 //获取地接项目变更金额
getLocalJpyChangeTotalMoney(PeopleNumber) { getLocalJpyChangeTotalMoney(subItem) {
var PeopleNumber = subItem.PeopleNumber;
if (PeopleNumber <= 0) { if (PeopleNumber <= 0) {
PeopleNumber = 1; PeopleNumber = 1;
} }
if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
PeopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
}
let totalMoney = 0.0; let totalMoney = 0.0;
var busFee = Number(this.getDayChangeXiaoJi(2, 1)) / PeopleNumber; var busFee = Number(this.getDayChangeXiaoJi(2, 1)) / PeopleNumber;
var hotelPrice = Number(this.getDayChangeXiaoJi(1, 1)); //酒店费用 var hotelPrice = Number(this.getDayChangeXiaoJi(1, 1)); //酒店费用
...@@ -1924,21 +1956,6 @@ ...@@ -1924,21 +1956,6 @@
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
//地接成本（日元）
getPeopleNumJpyChangeTotalMoney(subItem) {
let totalMoney = 0.0;
var peopleNumber = Number(subItem.PeopleNumber);
if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
var busFee = Number(this.getDayXiaoJi(2, 1)) / peopleNumber;
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / peopleNumber; //其它费用
totalMoney = busFee + otherPrice; //hotelPrice + sencePrice + canPrice +
if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney = Number(totalMoney) * Number(-1);
}
}
return totalMoney.toFixed(2);
},
getPeopleNumberChangeTotalMoney(subItem) { getPeopleNumberChangeTotalMoney(subItem) {
let totalMoney = 0.0; let totalMoney = 0.0;
//汇率的变更 //汇率的变更
...@@ -1955,8 +1972,7 @@ ...@@ -1955,8 +1972,7 @@
//人数的变更 //人数的变更
if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) { if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue); peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
// console.log(peopleNumber, "otherPrice", this.getRateChangeXiaoJi(9));
// console.log(peopleNumber, "busFee", this.getRateChangeXiaoJi(2));
if (subItem.OtherChangeModel.HotelChangeValue > 0) { if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney -= Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用 totalMoney -= Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用
totalMoney -= Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费 totalMoney -= Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费
......
src/components/commonPage/changeOfferExchangeRate.vue
View file @ d907e038
...@@ -48,35 +48,32 @@ ...@@ -48,35 +48,32 @@
<template> <template>
<div class="changeOffer"> <div class="changeOffer">
<div> <div>
<table class="changeOfferTable" > <table class="changeOfferTable">
<tr> <tr>
<td style="width:105px;" class="CP_ComTitle2 CostcomCenter">币种</td> <td style="width:105px;" class="CP_ComTitle2 CostcomCenter">币种</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">汇率</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">汇率</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">汇率变更值</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">汇率变更值</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">人数</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">人数</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">人数变更值</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">人数变更值</td>
<td style="width:500px;" class="CP_ComTitle2 CostcomCenter">变更备注</td> <td style="width:500px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter"> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">
<a style="color:blue;cursor:pointer;" @click="AddOfferObj()" v-show="dataList.length<costCurrencyList.length">添加</a> <a style="color:blue;cursor:pointer;" @click="AddOfferObj()"
v-show="dataList.length<costCurrencyList.length">添加</a>
</td> </td>
</tr> </tr>
<tbody> <tbody>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList" :key="index">
<td> <td>
<el-select v-model="item.CurrencyId" filterable @change="handleCheckChange(index,item)" placeholder="请选择"> <el-select v-model="item.CurrencyId" filterable @change="handleCheckChange(index,item)" placeholder="请选择">
<!-- <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> --> <el-option v-for="item in costCurrencyList" :key="item.CurrencyId" :label="item.CurrencyName"
<el-option
v-for="item in costCurrencyList"
:key="item.CurrencyId"
:label="item.CurrencyName"
:value="item.CurrencyId"> :value="item.CurrencyId">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
{{ item.ExchangeRate}} {{ item.ExchangeRate}}
</td> </td>
<td> <td>
<el-input v-model="item.NewExchangeRate" style="width:100px;" max="6"></el-input> <el-input v-model="item.NewExchangeRate" style="width:100px;" max="6"></el-input>
</td> </td>
<td> <td>
...@@ -89,7 +86,7 @@ ...@@ -89,7 +86,7 @@
<el-input placeholder="请输入内容" v-model="item.ChangeRemarks" class="input-with-select"> <el-input placeholder="请输入内容" v-model="item.ChangeRemarks" class="input-with-select">
</el-input> </el-input>
</td> </td>
<td> <td>
<a style="color:red;cursor:pointer;" @click="DeleteOfferChange(item,index)">删除</a> <a style="color:red;cursor:pointer;" @click="DeleteOfferChange(item,index)">删除</a>
</td> </td>
</tr> </tr>
...@@ -104,35 +101,17 @@ ...@@ -104,35 +101,17 @@
</template> </template>
<script> <script>
export default { export default {
props: ["OfferCurrency","costNumberList","costCurrencyList"], props: ["OfferCurrency", "costNumberList", "costCurrencyList"],
data() { data() {
return { return {
loading: false, loading: false,
dataList: [], dataList: [],
datas: {
ChangeId:0,
OfferId:0,
EidtType:3,
DayNum:0,
ChangeType:8,
ChangeValue:0,
ChangeRemarks:"",
OldPrice:0,
DJPrice:0,
CostId:0,
PeopleNumber:0,
ExchangeRate:0,
CurrencyId:'',
NewExchangeRate:0,
NewPeopleNumber:0,
},
}; };
}, },
watch:{ watch: {},
},
methods: { methods: {
handleCheckChange(index,nowItem) { handleCheckChange(index, nowItem) {
var flag = false; var flag = false;
if (this.dataList && this.dataList.length > 0) { if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach((qitem, qIndex) => { this.dataList.forEach((qitem, qIndex) => {
if (!flag && qIndex != index) { if (!flag && qIndex != index) {
...@@ -145,63 +124,60 @@ ...@@ -145,63 +124,60 @@
if (flag) { if (flag) {
this.Error("已存在此项币种,请选择其他变更币种!"); this.Error("已存在此项币种,请选择其他变更币种!");
nowItem.CurrencyId = ''; nowItem.CurrencyId = '';
return ; return;
} }
if (this.costCurrencyList != null && this.costCurrencyList.length > 0) { if (this.costCurrencyList != null && this.costCurrencyList.length > 0) {
var typeIndex=this.dataList[index]; var typeIndex = this.dataList[index];
var costCurrency = this.costCurrencyList.find(item=>item.CurrencyId==typeIndex.CurrencyId);//币种信息 var costCurrency = this.costCurrencyList.find(item => item.CurrencyId == typeIndex.CurrencyId); //币种信息
//查找人数信息 //查找人数信息
var costNumber={}; var costNumber = {};
if(this.costNumberList.length>index){ if (this.costNumberList.length > index) {
costNumber=this.costNumberList[index]; costNumber = this.costNumberList[index];
} else {
costNumber = this.costNumberList[0];
} }
else{ // 使用find方法查找value为3的对象
costNumber=this.costNumberList[0]; let hasCurrencyId = this.dataList.findIndex(item => item.CurrencyId === nowItem.CurrencyId)
}
// 使用find方法查找value为3的对象
let hasCurrencyId = this.dataList.findIndex(item => item.CurrencyId === nowItem.CurrencyId)
const nowData = this.dataList[hasCurrencyId]; const nowData = this.dataList[hasCurrencyId];
// 创建深拷贝（避免引用问题） // 创建深拷贝（避免引用问题）
const newData = JSON.parse(JSON.stringify(nowData)); const newData = JSON.parse(JSON.stringify(nowData));
newData.PeopleNumber=costNumber.PeopleNumber; newData.PeopleNumber = costNumber.PeopleNumber;
newData.CostId=costNumber.Id; newData.CostId = costNumber.Id;
newData.NewPeopleNumber=Number(0) - Number(newData.PeopleNumber);//costNumber.PeopleNumber; newData.NewPeopleNumber = 0; //costNumber.PeopleNumber;
newData.ExchangeRate=costCurrency.ExchangeRate; newData.ExchangeRate = costCurrency.ExchangeRate;
newData.NewExchangeRate=Number(0) - Number(newData.ExchangeRate);//costCurrency.ExchangeRate; newData.NewExchangeRate = 0; //costCurrency.ExchangeRate;
newData.ChangeRemarks = "人数/汇率变更";
newData.ChangeRemarks=""; // 替换原对象
console.log("newData",newData);
// 替换原对象
this.$set(this.dataList, hasCurrencyId, newData); this.$set(this.dataList, hasCurrencyId, newData);
this.getOfferChange(); this.getOfferChange();
} }
}, },
AddOfferObj() { AddOfferObj() {
var obj = { var obj = {
ChangeId:0, ChangeId: 0,
OfferId:0, OfferId: 0,
EidtType:3, EidtType: 3,
DayNum:0, DayNum: 0,
ChangeType:8, ChangeType: 8,
ChangeValue:0, ChangeValue: 0,
ChangeRemarks:"", ChangeRemarks: "人数/汇率变更",
OldPrice:0, OldPrice: 0,
DJPrice:0, DJPrice: 0,
CostId:0, CostId: 0,
PeopleNumber:0, PeopleNumber: 0,
ExchangeRate:0, ExchangeRate: 0,
CurrencyId:'', CurrencyId: '',
NewExchangeRate:0, NewExchangeRate: 0,
NewPeopleNumber:0, NewPeopleNumber: 0,
} }
obj.OfferId = this.OfferCurrency.OfferId; obj.OfferId = this.OfferCurrency.OfferId;
obj.EidtType = this.OfferCurrency.EditType; obj.EidtType = this.OfferCurrency.EditType;
if(this.dataList.length<this.costCurrencyList.length){ if (this.dataList.length < this.costCurrencyList.length) {
this.dataList.push(obj); this.dataList.push(obj);
} }
}, },
//删除报价单变更项 //删除报价单变更项
DeleteOfferChange(item, index) { DeleteOfferChange(item, index) {
var that = this; var that = this;
this.Confirm('是否要删除此项变更内容?', function () { this.Confirm('是否要删除此项变更内容?', function () {
...@@ -221,8 +197,8 @@ ...@@ -221,8 +197,8 @@
// } // }
// ); // );
// } else { // } else {
that.dataList.splice(index, 1); that.dataList.splice(index, 1);
// } // }
}) })
}, },
//关闭弹窗 //关闭弹窗
...@@ -231,74 +207,71 @@ ...@@ -231,74 +207,71 @@
}, },
//向父组件传递选中酒店 //向父组件传递选中酒店
saveOfferChange() { saveOfferChange() {
var tempMsg=[]; var tempMsg = [];
var changeList=[]; var changeList = [];
if( this.dataList!=null&& this.dataList.length>0){ if (this.dataList != null && this.dataList.length > 0) {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(item.CurrencyId!=""&& item.CurrencyId>0){ if (item.CurrencyId != "" && item.CurrencyId > 0) {
changeList.push( { changeList.push({
CurrencyId:item.CurrencyId, CurrencyId: item.CurrencyId,
OfferId:item.OfferId, OfferId: item.OfferId,
CostId:item.CostId, CostId: item.CostId,
PeopleNumber:item.NewPeopleNumber, PeopleNumber: item.NewPeopleNumber,
ExchangeRate:item.NewExchangeRate, ExchangeRate: item.NewExchangeRate,
ChangeRemarks:item.ChangeRemarks, }); ChangeRemarks: item.ChangeRemarks,
} });
}); }
if(changeList==null||changeList.length==0){
this.Error("请选择变更类型");
return;
}
tempMsg.push({
ChangeId:this.dataList[0].ChangeId,
OfferId:this.dataList[0].OfferId,
EidtType:this.dataList[0].EidtType,
DayNum:0,
ChangeType:this.dataList[0].ChangeType,
ChangeValue:0,
ChangeRemarks:'',
OldPrice:0,
DJPrice:0,
ChangeContent:JSON.stringify(changeList),
HotelList:[]
}); });
this.apipost("travel_post_SetChangeOffer", tempMsg, res => { if (changeList == null || changeList.length == 0) {
if (res.data.resultCode == 1) { this.Error("请选择变更类型");
this.getOfferChange() return;
this.Success(res.data.message); }
this.$emit("success", 1); tempMsg.push({
} else { ChangeId: this.dataList[0].ChangeId,
this.Error(res.data.message); OfferId: this.dataList[0].OfferId,
} EidtType: this.dataList[0].EidtType,
}); DayNum: 0,
} ChangeType: this.dataList[0].ChangeType,
else{ ChangeValue: 0,
var searchParmeters = { ChangeRemarks: '人数/汇率变更',
EidtType: 0, OldPrice: 0,
OfferId: 0, DJPrice: 0,
DayNum: 0, ChangeContent: JSON.stringify(changeList),
}; HotelList: []
searchParmeters.OfferId = this.OfferCurrency.OfferId; });
searchParmeters.EidtType = this.OfferCurrency.EditType; this.apipost("travel_post_SetChangeOffer", tempMsg, res => {
searchParmeters.DayNum = 0; if (res.data.resultCode == 1) {
this.apipost( this.getOfferChange()
"travel_post_RemoveChangeOfferByEidtType", searchParmeters, this.Success(res.data.message);
res => { this.$emit("success", 1);
if (res.data.resultCode == 1) { } else {
this.getOfferChange() this.Error(res.data.message);
this.Success(res.data.message); }
this.$emit("success", 1); });
} else { } else {
this.Error(that.$t('objFill.v101.hote.shanchusb')); var searchParmeters = {
} EidtType: 0,
OfferId: 0,
DayNum: 0,
};
searchParmeters.OfferId = this.OfferCurrency.OfferId;
searchParmeters.EidtType = this.OfferCurrency.EditType;
searchParmeters.DayNum = 0;
this.apipost(
"travel_post_RemoveChangeOfferByEidtType", searchParmeters,
res => {
if (res.data.resultCode == 1) {
this.getOfferChange()
this.Success(res.data.message);
this.$emit("success", 1);
} else {
this.Error(that.$t('objFill.v101.hote.shanchusb'));
} }
); }
} );
}
}, },
//查询价格变更信息 //查询价格变更信息
getOfferChange() { getOfferChange() {
this.loading = true; this.loading = true;
var searchParmeters = { var searchParmeters = {
...@@ -313,71 +286,67 @@ ...@@ -313,71 +286,67 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempArray = res.data.data; var tempArray = res.data.data;
if(tempArray!=null&&tempArray.length>0){ if (tempArray != null && tempArray.length > 0) {
tempArray.forEach(item => { tempArray.forEach(item => {
var ChangeContentList= JSON.parse(item.ChangeContent); var ChangeContentList = JSON.parse(item.ChangeContent);
ChangeContentList.forEach(ChangeContentModel => { ChangeContentList.forEach(ChangeContentModel => {
let hasCurrencyId = this.dataList.findIndex(itemd => itemd.CurrencyId === ChangeContentModel.CurrencyId) let hasCurrencyId = this.dataList.findIndex(itemd => itemd.CurrencyId ===
console.log("hasCurrencyId",hasCurrencyId); ChangeContentModel.CurrencyId)
if(hasCurrencyId!=-1){ if (hasCurrencyId != -1) {
const nowData = this.dataList[hasCurrencyId]; const nowData = this.dataList[hasCurrencyId];
// 创建深拷贝（避免引用问题） // 创建深拷贝（避免引用问题）
const newData = JSON.parse(JSON.stringify(nowData)); const newData = JSON.parse(JSON.stringify(nowData));
newData.NewPeopleNumber=ChangeContentModel.PeopleNumber; newData.NewPeopleNumber = ChangeContentModel.PeopleNumber;
newData.NewExchangeRate=ChangeContentModel.ExchangeRate; newData.NewExchangeRate = ChangeContentModel.ExchangeRate;
newData.ChangeRemarks=ChangeContentModel.ChangeRemarks; newData.ChangeRemarks = ChangeContentModel.ChangeRemarks;
newData.ChangeId=item.ChangeId; newData.ChangeId = item.ChangeId;
newData.CostId=ChangeContentModel.CostId; newData.CostId = ChangeContentModel.CostId;
// 替换原对象 // 替换原对象
this.$set(this.dataList, hasCurrencyId, newData); this.$set(this.dataList, hasCurrencyId, newData);
} } else {
else{ var obj = {
var obj = { ChangeId: item.ChangeId,
ChangeId:item.ChangeId, OfferId: 0,
OfferId:0, EidtType: 3,
EidtType:3, DayNum: 0,
DayNum:0, ChangeType: 8,
ChangeType:8, ChangeValue: 0,
ChangeValue:0, ChangeRemarks: ChangeContentModel.ChangeRemarks,
ChangeRemarks:ChangeContentModel.ChangeRemarks, OldPrice: 0,
OldPrice:0, DJPrice: 0,
DJPrice:0, CostId: ChangeContentModel.CostId,
CostId:ChangeContentModel.CostId, PeopleNumber: 0,
PeopleNumber:0, ExchangeRate: 0,
ExchangeRate:0, CurrencyId: ChangeContentModel.CurrencyId,
CurrencyId:ChangeContentModel.CurrencyId, NewExchangeRate: ChangeContentModel.ExchangeRate,
NewExchangeRate:ChangeContentModel.ExchangeRate, NewPeopleNumber: ChangeContentModel.PeopleNumber,
NewPeopleNumber:ChangeContentModel.PeopleNumber, }
}
let hasOCurrencyId = this.costCurrencyList.findIndex(item => item.CurrencyId ===
let hasOCurrencyId = this.costCurrencyList.findIndex(item => item.CurrencyId === ChangeContentModel.CurrencyId) ChangeContentModel.CurrencyId)
obj.ExchangeRate=this.costCurrencyList[hasOCurrencyId].ExchangeRate; obj.ExchangeRate = this.costCurrencyList[hasOCurrencyId].ExchangeRate;
//查找人数信息 //查找人数信息
var costNumber={}; var costNumber = {};
if(this.costNumberList.length>hasOCurrencyId){ if (this.costNumberList.length > hasOCurrencyId) {
costNumber=this.costNumberList[hasOCurrencyId]; costNumber = this.costNumberList[hasOCurrencyId];
} } else {
else{ costNumber = this.costNumberList[0];
costNumber=this.costNumberList[0]; }
obj.PeopleNumber = costNumber.PeopleNumber;
} obj.OfferId = this.OfferCurrency.OfferId;
obj.PeopleNumber=costNumber.PeopleNumber; obj.EidtType = this.OfferCurrency.EditType;
obj.OfferId = this.OfferCurrency.OfferId; this.dataList.push(obj);
obj.EidtType = this.OfferCurrency.EditType; }
this.dataList.push(obj); });
} });
});
});
} }
} }
}); });
}, },
}, },
created() { created() {
}, },
mounted() { mounted() {
this.getOfferChange(); this.getOfferChange();
......
src/components/index.vue
View file @ d907e038
...@@ -2416,7 +2416,6 @@ ...@@ -2416,7 +2416,6 @@
} }
); );
} }
}, },
//测试方法 //测试方法
testEmp() { testEmp() {
......
src/components/orderCommon/productOrderList.vue
View file @ d907e038
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
<div class="dline"> <div class="dline">
<div class="d1"> <div class="d1">
<div v-if="item.IsB2B === 0" class="product_nei"></div> <div v-if="item.IsB2B === 0" class="product_nei"></div>
<div v-if="item.IsUnionTravel === 1" class="product_union"></div> <div v-else-if="item.IsUnionTravel === 1" class="product_union"></div>
<div v-if="item.IsWarning === 1" class="product_warning"></div> <div v-if="item.IsWarning === 1" class="product_warning"></div>
<div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'300px':'auto'}"> <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'300px':'auto'}">
<p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p> <p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
...@@ -904,9 +904,9 @@ ...@@ -904,9 +904,9 @@
icon="iconfont icon-sousuo"> icon="iconfont icon-sousuo">
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!--关内团后不能在报名 hk 2022-07-13去掉 && item.IsB2B === 1 修改为可报名 --> <!--关内团后(IsB2B=0)不能在报名 过了出发日期不能下单(IsPayOrder=1) -->
<el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start"
v-if="item.IsPayOrder !== 1 && item.IsB2B !== 0 "> v-if="item.IsPayOrder == 2 && item.IsB2B == 1 ">
<el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important" <el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important"
v-if="!TCIDList" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button> v-if="!TCIDList" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
</el-tooltip> </el-tooltip>
......
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