tplus-components-touch 3.39.7 → 3.39.10

package/dist/components/settlement/settlement.js

@@ -463,17 +463,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         } else {
           item.badge = { text: '', position: '', className: '' };
         }
-        if (!item.IsPresent) {
-          discountRetailTotalAount += item.RetailPrice * item.Quantity;
-        }
         if (item.PromotionDetails && item.PromotionDetails.length > 0) {
           count++;
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
-        discountPrototypeTotalAmount += item.DetailDiscountAmount;
+        if (!item.IsPresent) {
+          discountPrototypeTotalAmount += item.DetailDiscountAmount;
+          item.TotalDiscount = item.DetailDiscountAmount;
+        } else {
+          item.TotalDiscount = 0;
+        }
         //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
-        item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
         item.UnitName = item.Unit.Name;
         item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -484,7 +485,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         dataSource: dataSource,
         discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
         discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
-        discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
+        discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + parseFloat(discountPrototypeTotalAmount))
       });
       return count;
     };
@@ -1216,10 +1217,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onTabsClick = function (key, bookType) {
+      var _this2$store3 = _this2.store,
+          paymode = _this2$store3.paymode,
+          brefund = _this2$store3.brefund,
+          boriginReturn = _this2$store3.boriginReturn;
+
       var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn9.PayStyle,
           Differentiate = _enumController$getEn9.Differentiate;
 
+      if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
+        _message2.default.warn('实收金额已大于应收金额，不允许使用优惠券');
+        return;
+      }
       if (key === PayStyle.hyczk) {
         var isProhibitMeStorageCard = _this2.props.isProhibitMeStorageCard;
 
@@ -1232,10 +1242,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
           MultiPay = _enumController$getEn10.MultiPay;
 
-      var _this2$store3 = _this2.store,
-          paymode = _this2$store3.paymode,
-          brefund = _this2$store3.brefund,
-          boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;