tplus-components-touch 3.39.10 → 3.39.11

package/dist/components/settlement/settlement.js

@@ -1217,6 +1217,9 @@ 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,
@@ -1226,10 +1229,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           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;
 
@@ -1528,6 +1527,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("付订金时不可使用零售抵现类结算方式!");
       // }
@@ -3510,6 +3512,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;
+    }
 
     /**
      *
@@ -3600,8 +3616,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) {
@@ -3622,9 +3638,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,
@@ -3696,11 +3712,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,