|
|
@@ -641,6 +641,7 @@ export default {
|
|
|
},
|
|
|
data: {
|
|
|
UserId: that.userId,
|
|
|
+ PortType: 1
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
if (res.data.code == 200) {
|
|
|
@@ -829,11 +830,33 @@ export default {
|
|
|
if (creditCardPayment.paymentCurrency == 0) {
|
|
|
that.OpHotelReservationsData.paymentCurrency = ''
|
|
|
}
|
|
|
+
|
|
|
+ if (that.OpHotelReservationsData.governmentRentCurrency == 0) {
|
|
|
+ that.OpHotelReservationsData.governmentRentCurrency = '';
|
|
|
+ }
|
|
|
+ if (that.OpHotelReservationsData.cityTaxCurrency == 0) {
|
|
|
+ that.OpHotelReservationsData.cityTaxCurrency = '';
|
|
|
+ }
|
|
|
that.OpHotelReservationsData.paymentCurrency = creditCardPayment.paymentCurrency;
|
|
|
that.OpHotelReservationsData.payDId = creditCardPayment.payDId;
|
|
|
+ if (that.OpHotelReservationsData.payDId == 0) {
|
|
|
+ that.OpHotelReservationsData.payDId == ''
|
|
|
+ }
|
|
|
that.OpHotelReservationsData.consumptionPatterns = creditCardPayment.consumptionPatterns;
|
|
|
that.OpHotelReservationsData.consumptionDate = creditCardPayment.consumptionDate;
|
|
|
+ debugger
|
|
|
that.OpHotelReservationsData.ctdId = creditCardPayment.ctdId;
|
|
|
+ if (that.OpHotelReservationsData.ctdId == 0) {
|
|
|
+ that.ctdIdPay = '';
|
|
|
+ that.OpHotelReservationsData.ctdId = '';
|
|
|
+ }
|
|
|
+ var a = that.currencyList.filter(x => x.id == that.OpHotelReservationsData.budgetCurrency);
|
|
|
+ if (a.length > 0) {
|
|
|
+ that.currencySingle.id = a[0].id;
|
|
|
+ that.currencySingle.name = a[0].name;
|
|
|
+ that.currencySingle.remark = a[0].remark;
|
|
|
+ that.CardCurrency = that.currencySingle.name + '(' + that.currencySingle.remark + ')'
|
|
|
+ }
|
|
|
that.OpHotelReservationsData.companyBankNo = creditCardPayment.companyBankNo;
|
|
|
that.OpHotelReservationsData.otherBankName = creditCardPayment.otherBankName;
|
|
|
that.OpHotelReservationsData.otherSideNo = creditCardPayment.otherSideNo;
|
|
|
@@ -852,18 +875,18 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
that.PostCurrencyByDiid(that.OpHotelReservationsData.diId, 76, that.OpHotelReservationsData.budgetCurrency)
|
|
|
- var s = that.currencyList.filter(x => x.id == that.OpHotelReservationsData.paymentCurrency);
|
|
|
- if (s.length > 0) {
|
|
|
- that.currencySingle.id = s[0].id;
|
|
|
- that.currencySingle.name = s[0].name;
|
|
|
- that.currencySingle.remark = s[0].remark;
|
|
|
- that.CardCurrency = that.currencySingle.name + '(' + that.currencySingle.remark + ')'
|
|
|
- }
|
|
|
+ // var s = that.currencyList.filter(x => x.id == that.OpHotelReservationsData.paymentCurrency);
|
|
|
+ // if (s.length > 0) {
|
|
|
+ // that.currencySingle.id = s[0].id;
|
|
|
+ // that.currencySingle.name = s[0].name;
|
|
|
+ // that.currencySingle.remark = s[0].remark;
|
|
|
+ // that.CardCurrency = that.currencySingle.name + '(' + that.currencySingle.remark + ')'
|
|
|
+ // }
|
|
|
if (that.OpHotelReservationsData.ctdId == '74') {
|
|
|
that.CardCurrency = "USD(美元)"
|
|
|
} else if (that.OpHotelReservationsData.ctdId == '75') {
|
|
|
that.CardCurrency = "EUR(欧元)"
|
|
|
- } else {
|
|
|
+ } else if (that.OpHotelReservationsData.ctdId != '' && that.OpHotelReservationsData.ctdId != 0) {
|
|
|
that.CardCurrency = "CNY(人民币)"
|
|
|
}
|
|
|
|
|
|
@@ -1011,7 +1034,7 @@ export default {
|
|
|
this.HotelConversionAmounts();
|
|
|
},
|
|
|
bankCardPriceChange() {
|
|
|
- if (this.OpHotelReservationsData.ctdId != 0 && this.OpHotelReservationsData.ctdId != '' && this.OpHotelReservationsData.ctdId != undefined && (this.OpHotelReservationsData.governmentRent != 0 || this.OpHotelReservationsData.cityTax != 0)) {
|
|
|
+ if (this.OpHotelReservationsData.ctdId != 0 || this.OpHotelReservationsData.ctdId != '' || this.OpHotelReservationsData.ctdId != undefined || this.OpHotelReservationsData.governmentRent != 0 || this.OpHotelReservationsData.cityTax != 0) {
|
|
|
this.HotelConversionAmounts();
|
|
|
}
|
|
|
},
|
|
|
@@ -1068,6 +1091,9 @@ export default {
|
|
|
if (that.ctdIdPay == '') {
|
|
|
that.ctdIdPay = 0;
|
|
|
}
|
|
|
+ if (that.OpHotelReservationsData.payDId == '') {
|
|
|
+ that.OpHotelReservationsData.payDId = 72
|
|
|
+ }
|
|
|
if (that.OpHotelReservationsData.governmentRentCurrency == '') {
|
|
|
that.OpHotelReservationsData.governmentRentCurrency = 0;
|
|
|
}
|
