tplus-components-touch 3.41.4 → 3.41.5

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;
     };
@@ -1212,6 +1213,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onTabsClick = function (key, bookType) {
+      if (!_this2.isDjqValidated(key)) {
+        return;
+      };
+      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;
@@ -1228,10 +1237,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;
@@ -1510,6 +1515,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
+      if (!_this2.isDjqValidated(mode.paymentType)) {
+        return;
+      };
       // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
       //   return Message.error("付订金时不可使用零售抵现类结算方式!");
       // }
@@ -3485,6 +3493,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     //jfdx
 
+  }, {
+    key: 'isDjqValidated',
+    value: function isDjqValidated(key) {
+      var paymode = this.store.paymode;
+
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
+      if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
+        _message2.default.warn('实收金额已大于应收金额，不允许使用优惠券');
+        return false;
+      }
+      return true;
+    }
 
     /**
      *
@@ -3575,8 +3597,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'onKeyboardChange',
     value: function onKeyboardChange(key) {
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn32.PayStyle;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn33.PayStyle;
 
       if (this.currentInput) {
         if (this.store.paymode.currentMode) {
@@ -3597,9 +3619,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index, bookType) {
       var _this7 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayStyle = _enumController$getEn33.PayStyle;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayStyle = _enumController$getEn34.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3671,11 +3693,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn34.PayIcon,
-          PayIcon2 = _enumController$getEn34.PayIcon2,
-          PayStyle = _enumController$getEn34.PayStyle,
-          Differentiate = _enumController$getEn34.Differentiate;
+      var _enumController$getEn35 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn35.PayIcon,
+          PayIcon2 = _enumController$getEn35.PayIcon2,
+          PayStyle = _enumController$getEn35.PayStyle,
+          Differentiate = _enumController$getEn35.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,