tplus-components-touch 3.23.5 → 3.24.1
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.
- package/dist/components/settlement/prototypeTable/style.less +1 -1
- package/dist/components/settlement/settlementStore.js +3 -19
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo_index.html +5202 -5202
- package/dist/components/ticon/iconfont/iconfont.css +887 -887
- package/dist/components/ticon/iconfont/iconfont.json +1535 -1535
- package/package.json +3 -3
|
@@ -109,10 +109,6 @@ var _moment = require('moment');
|
|
|
109
109
|
|
|
110
110
|
var _moment2 = _interopRequireDefault(_moment);
|
|
111
111
|
|
|
112
|
-
var _reduce2 = require('lodash/reduce');
|
|
113
|
-
|
|
114
|
-
var _reduce3 = _interopRequireDefault(_reduce2);
|
|
115
|
-
|
|
116
112
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
117
113
|
|
|
118
114
|
function _initDefineProp(target, property, descriptor, context) {
|
|
@@ -663,9 +659,6 @@ var SettlementStore = (_class = function () {
|
|
|
663
659
|
_this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
|
|
664
660
|
_this7.updateEvent();
|
|
665
661
|
var message = '';
|
|
666
|
-
var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
|
|
667
|
-
return total + cur.value;
|
|
668
|
-
}, 0);
|
|
669
662
|
if (global.CheckMemberStorageProcessorBlock) {
|
|
670
663
|
message = CheckMemberStorageProcessorBlock.execute(m);
|
|
671
664
|
}
|
|
@@ -673,7 +666,7 @@ var SettlementStore = (_class = function () {
|
|
|
673
666
|
_this7.paymode.currentMode.errinfo = message;
|
|
674
667
|
} else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
|
|
675
668
|
_this7.paymode.currentMode.errinfo = "余额不足";
|
|
676
|
-
} else if (_this7.paymode.amount > 0 &&
|
|
669
|
+
} else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
|
|
677
670
|
_this7.paymode.currentMode.errinfo = "实收金额必须录入";
|
|
678
671
|
} else {
|
|
679
672
|
// 查询成功后将焦点移入下一个输入框
|
|
@@ -1686,21 +1679,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1686
1679
|
detailDTO.isManualFreeGift = item.IsPresent;
|
|
1687
1680
|
detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
|
|
1688
1681
|
detailDTO.IsManualChangePrice = item.IsManualChangePrice;
|
|
1689
|
-
|
|
1690
|
-
// if(detailDTO.IsManualChangePrice)//如果是手工改价
|
|
1691
|
-
// {
|
|
1692
|
-
// detailDTO.listPrice = item.TaxPrice;
|
|
1693
|
-
// detailDTO.netAmountWithTax = item.TaxAmount;
|
|
1694
|
-
// }
|
|
1695
|
-
// else
|
|
1696
|
-
// {
|
|
1697
1682
|
var bookingQuantity = 0;
|
|
1698
1683
|
if (item.BookingQuantity) {
|
|
1699
1684
|
bookingQuantity = item.BookingQuantity;
|
|
1700
1685
|
}
|
|
1701
1686
|
detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
|
|
1702
1687
|
detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
1703
|
-
//}
|
|
1704
1688
|
detailDTO.taxRate = item.TaxRate;
|
|
1705
1689
|
detailDTO.quantity = item.Quantity;
|
|
1706
1690
|
|
|
@@ -1854,13 +1838,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1854
1838
|
var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
|
|
1855
1839
|
PayStyle = _enumController$getEn17.PayStyle;
|
|
1856
1840
|
|
|
1857
|
-
this.thePaymodes && this.thePaymodes.forEach(function (mode) {
|
|
1841
|
+
this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
|
|
1858
1842
|
if (mode.paymentType === PayStyle.hyczk) {
|
|
1859
1843
|
sum -= mode.value;
|
|
1860
1844
|
}
|
|
1861
1845
|
});
|
|
1862
1846
|
|
|
1863
|
-
if (this.amount > 0 && (v === '' || v === '0.00')
|
|
1847
|
+
if (this.amount > 0 && (v === '' || v === '0.00')) {
|
|
1864
1848
|
this.currentMode.errinfo = "实收金额必须录入";
|
|
1865
1849
|
} else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
|
|
1866
1850
|
this.currentMode.errinfo = "实收不应大于应收";
|