tplus-components-touch 3.24.2 → 3.25.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/settlement.js +7 -2
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +5 -4
- package/dist/components/settlement/settlementStore.js +44 -27
- 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/dist/components/touchTable/index.js +2 -1
- package/dist/components/touchTable/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -450,8 +450,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
450
450
|
}
|
|
451
451
|
item.InventoryName = item.Inventory.Name;
|
|
452
452
|
item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
|
|
453
|
-
|
|
454
|
-
item.TotalDiscount = item.DetailDiscountAmount;
|
|
453
|
+
item.TotalDiscount = (0, _utils.getFixedNumber)(item.Discount * item.Quantity);
|
|
455
454
|
item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
|
|
456
455
|
item.UnitName = item.Unit.Name;
|
|
457
456
|
item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
|
|
@@ -607,6 +606,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
607
606
|
_this2.setState({
|
|
608
607
|
czkVisible: true
|
|
609
608
|
});
|
|
609
|
+
var brefund = _this2.store.brefund;
|
|
610
|
+
|
|
611
|
+
var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
|
|
612
|
+
_this2.setState({
|
|
613
|
+
storageValue: value11
|
|
614
|
+
});
|
|
610
615
|
if (currentMode.member.id) {
|
|
611
616
|
_this2.setState({
|
|
612
617
|
czkValue: currentMode.member.StorageCardNo
|