tplus-components-touch 3.39.8 → 3.39.11

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.
@@ -1217,6 +1217,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1217
1217
  };
1218
1218
 
1219
1219
  _this2.onTabsClick = function (key, bookType) {
1220
+ if (!_this2.isDjqValidated(key)) {
1221
+ return;
1222
+ };
1223
+ var _this2$store3 = _this2.store,
1224
+ paymode = _this2$store3.paymode,
1225
+ brefund = _this2$store3.brefund,
1226
+ boriginReturn = _this2$store3.boriginReturn;
1227
+
1220
1228
  var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
1221
1229
  PayStyle = _enumController$getEn9.PayStyle,
1222
1230
  Differentiate = _enumController$getEn9.Differentiate;
@@ -1233,10 +1241,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1233
1241
  var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
1234
1242
  MultiPay = _enumController$getEn10.MultiPay;
1235
1243
 
1236
- var _this2$store3 = _this2.store,
1237
- paymode = _this2$store3.paymode,
1238
- brefund = _this2$store3.brefund,
1239
- boriginReturn = _this2$store3.boriginReturn;
1240
1244
  var noAlreadyWarn = _this2.state.noAlreadyWarn;
1241
1245
 
1242
1246
  if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
@@ -1523,6 +1527,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1523
1527
  };
1524
1528
 
1525
1529
  _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
1530
+ if (!_this2.isDjqValidated(mode.paymentType)) {
1531
+ return;
1532
+ };
1526
1533
  // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
1527
1534
  // return Message.error("付订金时不可使用零售抵现类结算方式!");
1528
1535
  // }
@@ -3505,6 +3512,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3505
3512
 
3506
3513
  //jfdx
3507
3514
 
3515
+ }, {
3516
+ key: 'isDjqValidated',
3517
+ value: function isDjqValidated(key) {
3518
+ var paymode = this.store.paymode;
3519
+
3520
+ var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3521
+ PayStyle = _enumController$getEn32.PayStyle;
3522
+
3523
+ if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
3524
+ _message2.default.warn('实收金额已大于应收金额,不允许使用优惠券');
3525
+ return false;
3526
+ }
3527
+ return true;
3528
+ }
3508
3529
 
3509
3530
  /**
3510
3531
  *
@@ -3595,8 +3616,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3595
3616
  }, {
3596
3617
  key: 'onKeyboardChange',
3597
3618
  value: function onKeyboardChange(key) {
3598
- var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3599
- PayStyle = _enumController$getEn32.PayStyle;
3619
+ var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3620
+ PayStyle = _enumController$getEn33.PayStyle;
3600
3621
 
3601
3622
  if (this.currentInput) {
3602
3623
  if (this.store.paymode.currentMode) {
@@ -3617,9 +3638,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3617
3638
  value: function renderToolbtn(mode, index, bookType) {
3618
3639
  var _this7 = this;
3619
3640
 
3620
- var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3621
- PayIcon = _enumController$getEn33.PayIcon,
3622
- PayStyle = _enumController$getEn33.PayStyle;
3641
+ var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3642
+ PayIcon = _enumController$getEn34.PayIcon,
3643
+ PayStyle = _enumController$getEn34.PayStyle;
3623
3644
 
3624
3645
  var isReturn = this.props.isReturn;
3625
3646
  var _store = this.store,
@@ -3691,11 +3712,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3691
3712
  value: function render() {
3692
3713
  var _this8 = this;
3693
3714
 
3694
- var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3695
- PayIcon = _enumController$getEn34.PayIcon,
3696
- PayIcon2 = _enumController$getEn34.PayIcon2,
3697
- PayStyle = _enumController$getEn34.PayStyle,
3698
- Differentiate = _enumController$getEn34.Differentiate;
3715
+ var _enumController$getEn35 = _mutantsUtil.enumController.getEnumOj(),
3716
+ PayIcon = _enumController$getEn35.PayIcon,
3717
+ PayIcon2 = _enumController$getEn35.PayIcon2,
3718
+ PayStyle = _enumController$getEn35.PayStyle,
3719
+ Differentiate = _enumController$getEn35.Differentiate;
3699
3720
 
3700
3721
  var _state2 = this.state,
3701
3722
  btnDissabled = _state2.btnDissabled,