tplus-components-touch 3.27.22 → 3.27.23

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.
@@ -1120,8 +1120,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1120
1120
  return;
1121
1121
  }
1122
1122
  var themode = (0, _find3.default)(paymode.paymodes, { 'paymentType': key });
1123
- //TODO需要跟后端确认是否为零售抵现类支付方式
1124
- if (bookType == 'multiPay' && _this2.store.paymode.isNotFullBook && themode.virtualPay) {
1123
+ //预订非全款不可使用零售抵现类支付方式
1124
+ if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && themode.virtualPay) {
1125
1125
  return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
1126
1126
  }
1127
1127
  if (themode.exchangeRate != 1) {
@@ -1208,8 +1208,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1208
1208
  };
1209
1209
 
1210
1210
  _this2.handleChange = function (index, e, type) {
1211
- console.log('zlf-change-1111');
1212
1211
  if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(_this2.store.paymode.currentFocus)) return;
1212
+ var mode = (0, _find3.default)(_this2.store.paymode.thePaymodes, { 'paymethodId': index });
1213
+ if (type == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
1214
+ return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
1215
+ }
1213
1216
  var currentInput = e.target;
1214
1217
  var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
1215
1218
  if (!isNaN(e.target.value) || e.target.value == '-') {
@@ -1217,7 +1220,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1217
1220
  _this2.store.changeValue(index, e.target.value, false, type);
1218
1221
  }
1219
1222
  }
1220
- console.log('zlf-change-2222');
1221
1223
  };
1222
1224
 
1223
1225
  _this2.setCurrentModeValue = function (val, max) {
@@ -1395,7 +1397,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1395
1397
  }, 2000);
1396
1398
  };
1397
1399
 
1398
- _this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
1400
+ _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
1401
+ if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
1402
+ return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
1403
+ }
1399
1404
  if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
1400
1405
  if (_this2.hotkeydebouncedPayMode == mode) {
1401
1406
  return;
@@ -1435,12 +1440,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1435
1440
  }
1436
1441
  };
1437
1442
 
1438
- _this2.onHotKeyClick2 = function (index, mode, paymode, e) {
1439
- console.log('zlf-click-1111');
1443
+ _this2.onHotKeyClick2 = function (index, mode, paymode, e, bookType) {
1440
1444
  if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
1441
1445
  if (_this2.hotkeydebouncedPayMode == mode) {
1442
1446
  return;
1443
1447
  }
1448
+ if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
1449
+ return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
1450
+ }
1444
1451
  _this2.store.changeClickFocusOnly(mode.paymentType);
1445
1452
  _this2.setCurrentFocusOnly(mode.paymentType);
1446
1453
  if (_this2.hotkeydebounced) {
@@ -1460,7 +1467,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1460
1467
  _this2.hotkeydebounced = null;
1461
1468
  _this2.hotkeydebouncedPayMode = "";
1462
1469
  }, 1000);
1463
- console.log('zlf-click-2222');
1464
1470
  };
1465
1471
 
1466
1472
  _this2.onHotKeyEnter = function (e, notsettle) {
@@ -2979,7 +2985,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2979
2985
  settleDisabled: false
2980
2986
  });
2981
2987
  that.store.bquick && that.props.onCancelSettle && that.props.onCancelSettle();
2982
- that.store.delPay(paymode.paymethodId, !isQuickPay ? 'multiPay' : '');
2988
+ that.store.delPay(paymode.paymethodId, !isQuickPay ? 'bookPay' : '');
2983
2989
  reject('\u652F\u4ED8\u65B9\u5F0F: ' + paymode.name + '\u5931\u8D25');
2984
2990
  } },
2985
2991
  '\u53D6\u6D88'
@@ -3009,7 +3015,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3009
3015
  modal.destroy();
3010
3016
  setTimeout(function () {
3011
3017
  if (paymode.paymentType == PayStyle.xianjin) {
3012
- that.store.changeValue(paymode.paymethodId, v, false, 'xjQuick');
3018
+ that.store.changeValue(paymode.paymethodId, v, false, 'bookPay');
3013
3019
  } else {
3014
3020
  paymode.authCode = v;
3015
3021
  }
@@ -3165,7 +3171,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3165
3171
  'div',
3166
3172
  null,
3167
3173
  (0, _map3.default)(modeList, function (mode, modeIndex) {
3168
- return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, type !== 1 ? 'multiPay' : '');
3174
+ return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, type !== 1 ? 'bookPay' : '');
3169
3175
  })
3170
3176
  );
3171
3177
  })
@@ -3812,7 +3818,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3812
3818
  'div',
3813
3819
  null,
3814
3820
  (0, _map3.default)(paymodes, function (mode, index) {
3815
- return _this8.renderToolbtn(mode, index, 'multiPay');
3821
+ return _this8.renderToolbtn(mode, index, 'bookPay');
3816
3822
  })
3817
3823
  ),
3818
3824
  paymodes.length > carouselStart && this.paymodesCarouselList(params, paymodes, carouselStart)
@@ -3841,7 +3847,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3841
3847
  _react2.default.createElement(
3842
3848
  'div',
3843
3849
  { className: 'lefticon primary-color', onClick: function onClick() {
3844
- _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType, 'multiPay');
3850
+ _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType, 'bookPay');
3845
3851
  } },
3846
3852
  _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
3847
3853
  ),
@@ -3864,13 +3870,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3864
3870
  return _this8.onHotKeyClick2(index, mode, paymode, e);
3865
3871
  },
3866
3872
  onBlur: function onBlur(e) {
3867
- return _this8.onBlur(index, e, 'multiPay');
3873
+ return _this8.onBlur(index, e, 'bookPay');
3868
3874
  },
3869
3875
  onFocus: function onFocus(e) {
3870
3876
  return _this8.onFocusHack(index, mode, paymode, e);
3871
3877
  },
3872
3878
  onChange: function onChange(e) {
3873
- return _this8.handleChange(index, e, 'multiPay');
3879
+ return _this8.handleChange(index, e, 'bookPay');
3874
3880
  }
3875
3881
  })
3876
3882
  ),
@@ -4230,7 +4236,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4230
4236
  // }
4231
4237
  // }
4232
4238
  // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4233
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4239
+ _this8.onHotKeyClick1(mode, index, boriginReturn, 'bookPay');
4234
4240
  },
4235
4241
  value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4236
4242
  return tm.paymentType == PayStyle.hyczk;
@@ -4241,16 +4247,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4241
4247
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4242
4248
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4243
4249
  onClick: function onClick(e) {
4244
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4250
+ return _this8.onHotKeyClick2(index, mode, paymode, e, 'bookPay');
4245
4251
  },
4246
4252
  onBlur: function onBlur(e) {
4247
- return _this8.onBlur(index, e);
4253
+ return _this8.onBlur(index, e, 'bookPay');
4248
4254
  },
4249
4255
  onFocus: function onFocus(e) {
4250
4256
  return _this8.onFocusHack(index, mode, paymode, e);
4251
4257
  },
4252
4258
  onChange: function onChange(e) {
4253
- return _this8.handleChange(index, e);
4259
+ return _this8.handleChange(index, e, 'bookPay');
4254
4260
  }
4255
4261
  })
4256
4262
  )