tplus-components-touch 3.27.22 → 3.27.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -868,7 +868,8 @@ var SettlementStore = (_class = function () {
|
|
|
868
868
|
authCode: '',
|
|
869
869
|
steadCashIntegral: null,
|
|
870
870
|
errinfo: '',
|
|
871
|
-
maxamount: this.paymode.amount
|
|
871
|
+
maxamount: this.paymode.amount,
|
|
872
|
+
virtualPay: themode.virtualPay
|
|
872
873
|
});
|
|
873
874
|
if (type == PayStyle.hyczk) {
|
|
874
875
|
if (!mode.member.id || !mode.member.StorageCardNo) {
|
|
@@ -942,7 +943,7 @@ var SettlementStore = (_class = function () {
|
|
|
942
943
|
mode.value = shouldSetValue;
|
|
943
944
|
mode.value2 = (0, _utils.getFixedNumber)(mode.calDirection == "88" ? shouldSetValue / mode.exchangeRate : shouldSetValue * mode.exchangeRate);
|
|
944
945
|
mode.value3 = shouldSetValue;
|
|
945
|
-
this.paymode.calcReserved('
|
|
946
|
+
this.paymode.calcReserved('bookPay'); //参数multiPay代表复合结算
|
|
946
947
|
}
|
|
947
948
|
}
|
|
948
949
|
}, {
|
|
@@ -1648,9 +1649,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1648
1649
|
sum = Math.Add(sum, mode.value == "" ? 0 : mode.value);
|
|
1649
1650
|
});
|
|
1650
1651
|
this.received = (0, _utils.getFixedNumber)(sum);
|
|
1651
|
-
if (type === '
|
|
1652
|
-
this.receivable = (0, _utils.getFixedNumber)(this.bookMaxValue - sum);
|
|
1653
|
-
} else if (type === 'multiPay' && this.isNotFullBook) {
|
|
1652
|
+
if (type === 'bookPay' && this.isNotFullBook) {
|
|
1654
1653
|
if (this.amount <= sum && sum <= this.bookMaxValue) {
|
|
1655
1654
|
this.receivable = (0, _utils.getFixedNumber)(0);
|
|
1656
1655
|
}
|
|
@@ -1977,7 +1976,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1977
1976
|
exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
|
|
1978
1977
|
idCurrency: mode.Currency ? mode.Currency.ID : -1,
|
|
1979
1978
|
calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
|
|
1980
|
-
virtualPay: mode.VirtualPay
|
|
1979
|
+
virtualPay: mode.VirtualPay
|
|
1981
1980
|
});
|
|
1982
1981
|
});
|
|
1983
1982
|
_this15.paymodes = paymodes;
|