tplus-components-touch 3.27.40 → 3.27.44

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.
Files changed (40) hide show
  1. package/dist/components/autoCompleteWithKeyboard/index.js +31 -9
  2. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  3. package/dist/components/autoCompleteWithKeyboard/index.less +11 -0
  4. package/dist/components/billSearch/index.js +13 -0
  5. package/dist/components/billSearch/index.js.map +1 -1
  6. package/dist/components/billSearch/index.less +8 -0
  7. package/dist/components/commonForm/autoComplete/index.js +35 -16
  8. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  9. package/dist/components/hotKey/localConfig.js +14 -16
  10. package/dist/components/hotKey/localConfig.js.map +1 -1
  11. package/dist/components/input/index.js +4 -1
  12. package/dist/components/input/index.js.map +1 -1
  13. package/dist/components/input/scanInput.less +4 -1
  14. package/dist/components/keyboard/index.js +5 -1
  15. package/dist/components/keyboard/index.js.map +1 -1
  16. package/dist/components/keyboard/index.less +39 -23
  17. package/dist/components/keyboard/letterKeyboard.js +33 -16
  18. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  19. package/dist/components/keyboard/numKeyboard.js +23 -13
  20. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  21. package/dist/components/keyboard/numKeyboardScan.js +32 -24
  22. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  23. package/dist/components/keyboard/numkeyboardPassword.js +31 -14
  24. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  25. package/dist/components/keyboard/onlyLetterButton2.less +1 -1
  26. package/dist/components/layout/sider.js +3 -1
  27. package/dist/components/layout/sider.js.map +1 -1
  28. package/dist/components/settlement/index.js +1 -1
  29. package/dist/components/settlement/index.js.map +1 -1
  30. package/dist/components/settlement/prototypeTable/index.js +3 -1
  31. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  32. package/dist/components/settlement/settlement.js +79 -543
  33. package/dist/components/settlement/settlement.js.map +1 -1
  34. package/dist/components/settlement/settlement.less +5 -1
  35. package/dist/components/settlement/settlementStore.js +92 -74
  36. package/dist/components/settlement/settlementStore.js.map +1 -1
  37. package/dist/components/touchTable/index.js +11 -1
  38. package/dist/components/touchTable/index.js.map +1 -1
  39. package/dist/components/touchTable/index.less +1 -1
  40. package/package.json +1 -1
package/dist/components/settlement/settlement.js CHANGED
@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
 
7
- var _input = require('antd/es/input');
8
-
9
- var _input2 = _interopRequireDefault(_input);
10
-
11
7
  var _modal = require('antd/es/modal');
12
8
 
13
9
  var _modal2 = _interopRequireDefault(_modal);
14
10
 
11
+ var _input = require('antd/es/input');
12
+
13
+ var _input2 = _interopRequireDefault(_input);
14
+
15
15
  var _drawer = require('antd/es/drawer');
16
16
 
17
17
  var _drawer2 = _interopRequireDefault(_drawer);
@@ -90,10 +90,10 @@ var _inherits3 = _interopRequireDefault(_inherits2);
90
90
 
91
91
  var _class, _class2, _temp;
92
92
 
93
- require('antd/es/input/style');
94
-
95
93
  require('antd/es/modal/style');
96
94
 
95
+ require('antd/es/input/style');
96
+
97
97
  require('antd/es/drawer/style');
98
98
 
99
99
  require('antd/es/table/style');
@@ -227,7 +227,6 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
227
227
  var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
228
228
  (0, _inherits3.default)(Settlement, _React$Component);
229
229
 
230
- // 复核结算方式快捷键列表
231
230
  function Settlement(props) {
232
231
  var _this3 = this;
233
232
 
@@ -269,14 +268,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
269
268
  storageValue: '0.00',
270
269
  czkValue: null,
271
270
  isInputMember: false,
272
- selectedRowIndex: 0 };
271
+ selectedRowIndex: 0,
272
+ isNotAutoFocus: true
273
+ // 复核结算方式快捷键列表
274
+ };
273
275
  _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
274
276
  return key.toLocaleUpperCase();
275
277
  });
276
278
  _this2.hotkeydebounced = null;
277
279
  _this2.hotkeydebouncedPayMode = "";
278
280
  _this2.currentInput = null;
279
- _this2.store = _mutantsMicrofx.stores.settlementStore;
280
281
 
281
282
  _this2.resizeSettlementToolBtns = function () {
282
283
  var newStyle = _this2.store.newStyle;
@@ -382,7 +383,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
382
383
  var count = _this2.handleShowPrototype();
383
384
  if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
384
385
  _this2.setState({
385
- prototypeVisible: true
386
+ prototypeVisible: true,
387
+ isNotAutoFocus: false
386
388
  });
387
389
  } else {
388
390
  _this2.payQuick();
@@ -504,7 +506,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
504
506
  var count = _this2.handleShowPrototype();
505
507
  if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
506
508
  _this2.setState({
507
- prototypeVisible: true
509
+ prototypeVisible: true,
510
+ isNotAutoFocus: false
508
511
  });
509
512
  } else {
510
513
  _this2.payFun();
@@ -1314,7 +1317,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1314
1317
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1315
1318
  PayStyle = _enumController$getEn12.PayStyle;
1316
1319
 
1317
- if (boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1320
+ var storeType = _this2.props.type;
1321
+
1322
+ if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1318
1323
  _message2.default.info('原单退货时，该结算方式不可以删除。');
1319
1324
  } else {
1320
1325
  _this2.store.delPay(index, bookType);
@@ -2551,6 +2556,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2551
2556
  null,
2552
2557
  _react2.default.createElement(_numkeyboardPassword2.default, {
2553
2558
  className: 'content',
2559
+ placement: 'rightBottom',
2554
2560
  newType: 'positive',
2555
2561
  bordered: true,
2556
2562
  placeholder: '\u8BF7\u8F93\u51656\u4F4D\u6570\u5B57\u5BC6\u7801',
@@ -2999,6 +3005,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2999
3005
  id: 'paymentAmount',
3000
3006
  className: 'content',
3001
3007
  type: 'text',
3008
+ bordered: true,
3009
+ placement: 'rightBottom',
3002
3010
  placeholder: '\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D',
3003
3011
  disabled: paymode.value < 0,
3004
3012
  defaultValue: that.getXianjinPayment(paymode.paymentType, paymode.value),
@@ -3070,6 +3078,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3070
3078
  _react2.default.createElement(_numKeyboardScan2.default, {
3071
3079
  className: 'content ',
3072
3080
  type: 'text',
3081
+ bordered: true,
3073
3082
  placeholder: '\u626B\u63CF\u6216\u8F93\u5165\u4ED8\u6B3E\u7801',
3074
3083
  ref: function ref(input) {
3075
3084
  return that['inputS' + paymode.paymethodId] = input;
@@ -3298,6 +3307,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3298
3307
  _this2.handleShowPrototype();
3299
3308
  _this2.setState({
3300
3309
  prototypeVisible: true,
3310
+ isNotAutoFocus: true,
3301
3311
  isPrototypeClick: true
3302
3312
  });
3303
3313
  };
@@ -3361,6 +3371,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3361
3371
  _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
3362
3372
  _this2.setTimer = null;
3363
3373
  _this2.keypressStime = null;
3374
+ _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
3364
3375
  return _this2;
3365
3376
  }
3366
3377
 
@@ -3670,7 +3681,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3670
3681
  storageValue = _state2.storageValue,
3671
3682
  czkValue = _state2.czkValue,
3672
3683
  newPassConfirm = _state2.newPassConfirm,
3673
- newPass = _state2.newPass;
3684
+ newPass = _state2.newPass,
3685
+ isNotAutoFocus = _state2.isNotAutoFocus;
3674
3686
 
3675
3687
  var _ref32 = _mutantsUtil.platform || {},
3676
3688
  isNewRetailBCPos = _ref32.isNewRetailBCPos;
@@ -3916,10 +3928,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3916
3928
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3917
3929
  return _react2.default.createElement(
3918
3930
  _button2.default,
3919
- { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
3931
+ {
3932
+ className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }),
3933
+ key: 'paymentType_' + p.paymentType,
3934
+ onClick: function onClick() {
3920
3935
  _this8.btnDebounced(p.paymentType, true);
3921
3936
  },
3922
- disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
3937
+ disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
3938
+ },
3923
3939
  _react2.default.createElement(
3924
3940
  'div',
3925
3941
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3940,22 +3956,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3940
3956
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3941
3957
  )
3942
3958
  ),
3943
- type != 1 && !newStyle && _react2.default.createElement(
3959
+ !newStyle && _react2.default.createElement(
3944
3960
  _drawer2.default,
3945
3961
  {
3946
3962
  title: '\u590D\u5408\u7ED3\u7B97',
3947
3963
  width: '600px',
3948
3964
  placement: 'right',
3949
- maskClosable: false,
3965
+ maskClosable: true,
3950
3966
  closable: false,
3951
3967
  onClose: this.handleCancel,
3952
3968
  visible: this.state.visible,
3953
3969
  destroyOnClose: true,
3954
- className: 'settlement-wraper'
3970
+ className: 'settlement-wraper',
3971
+ style: { 'zIndex': 1006 }
3955
3972
  },
3956
3973
  _react2.default.createElement(
3957
3974
  'div',
3958
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3975
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3959
3976
  _react2.default.createElement(
3960
3977
  'div',
3961
3978
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3970,7 +3987,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3970
3987
  ),
3971
3988
  _react2.default.createElement(
3972
3989
  'div',
3973
- { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px' } },
3990
+ { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px', height: 'calc(100% - 198px)' } },
3974
3991
  _react2.default.createElement(
3975
3992
  'div',
3976
3993
  { className: 'left' },
@@ -4000,7 +4017,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4000
4017
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4001
4018
  className: _index.hotKey.hotKeyNotFilter(),
4002
4019
  onClick: function onClick() {
4003
- _this8.editModal(index, mode.paymentType, boriginReturn);
4020
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
4004
4021
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4005
4022
  className: _index.hotKey.hotKeyNotFilter(),
4006
4023
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -4064,7 +4081,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4064
4081
  (0, _utils.getFixedNumber)(mode.balance)
4065
4082
  ),
4066
4083
  _react2.default.createElement('br', null),
4067
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
4084
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
4068
4085
  _button2.default,
4069
4086
  { onClick: function onClick() {
4070
4087
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -4158,7 +4175,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4158
4175
  ),
4159
4176
  _react2.default.createElement(
4160
4177
  'div',
4161
- { className: 'receivable', style: { display: (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
4178
+ { className: 'receivable', style: { display: DistributionMode && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
4162
4179
  _react2.default.createElement(
4163
4180
  'span',
4164
4181
  null,
@@ -4171,7 +4188,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4171
4188
  )
4172
4189
  )
4173
4190
  ),
4174
- !isReturn && _react2.default.createElement(
4191
+ type != 1 && !isReturn && _react2.default.createElement(
4175
4192
  'div',
4176
4193
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4177
4194
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4210,18 +4227,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4210
4227
  )
4211
4228
  )
4212
4229
  ),
4213
- type != 1 && newStyle && _react2.default.createElement(
4230
+ newStyle && _react2.default.createElement(
4214
4231
  _drawer2.default,
4215
4232
  {
4216
4233
  title: '\u590D\u5408\u7ED3\u7B97',
4217
4234
  width: '600px',
4218
4235
  placement: 'right',
4219
- maskClosable: false,
4236
+ maskClosable: true,
4220
4237
  closable: false,
4221
4238
  onClose: this.handleCancel,
4222
4239
  visible: this.state.visible,
4223
4240
  destroyOnClose: true,
4224
- className: 'settlement-wraper'
4241
+ className: 'settlement-wraper',
4242
+ style: { 'zIndex': 1006 }
4225
4243
  },
4226
4244
  _react2.default.createElement(
4227
4245
  'div',
@@ -4307,7 +4325,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4307
4325
  ),
4308
4326
  _react2.default.createElement(
4309
4327
  'div',
4310
- { className: 'receivable', style: { display: (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
4328
+ { className: 'receivable', style: { display: DistributionMode && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
4311
4329
  _react2.default.createElement(
4312
4330
  'span',
4313
4331
  null,
@@ -4320,7 +4338,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4320
4338
  )
4321
4339
  )
4322
4340
  ),
4323
- !isReturn && _react2.default.createElement(
4341
+ type != 1 && !isReturn && _react2.default.createElement(
4324
4342
  'div',
4325
4343
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4326
4344
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4342,12 +4360,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4342
4360
  return m.paymentType === PayStyle.smzf;
4343
4361
  });
4344
4362
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4345
- var hotkeyIndex = index;
4363
+ var hotkeyIndex = mindex;
4346
4364
  if (!isReturn && hasSMZF) {
4347
4365
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4348
4366
  return null;
4349
4367
  } else {
4350
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4368
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4351
4369
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4352
4370
  });
4353
4371
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4355,6 +4373,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4355
4373
  });
4356
4374
  }
4357
4375
  }
4376
+ var hyczkFindIndex = (0, _findIndex3.default)(thePaymodes, function (m) {
4377
+ return m.paymentType == PayStyle.hyczk;
4378
+ });
4379
+ var hyczkList = (0, _filter3.default)(thePaymodes, function (m) {
4380
+ return m.paymentType == PayStyle.hyczk;
4381
+ });
4382
+ var lastStorageCardIndex = 0;
4383
+ (0, _map3.default)(thePaymodes, function (m, i) {
4384
+ if (m.paymentType === PayStyle.hyczk) lastStorageCardIndex = i;
4385
+ });
4386
+ if (mindex > 0 && hyczkList.length > 1 && mindex > lastStorageCardIndex) {
4387
+ hotkeyIndex = hotkeyIndex - hyczkList.length + 1;
4388
+ }
4389
+
4390
+ console.log(thePaymodes);
4391
+
4358
4392
  var index = mode.paymethodId;
4359
4393
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4360
4394
  return m.paymentType == PayStyle.hyczk;
@@ -4391,16 +4425,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4391
4425
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4392
4426
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4393
4427
  onClick: function onClick() {
4394
- // let czkinput = document.getElementById('inputS' + index);
4395
- // if (mode.paymentType === PayStyle.hyczk) {
4396
- // const { isProhibitMeStorageCard } = this.props;
4397
- // if (isProhibitMeStorageCard) {
4398
- // Message.warn('储值卡不可键盘录入，请刷卡!');
4399
- // return;
4400
- // }
4401
- // }
4402
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4403
- if (mode.paymentType == PayStyle.hyczk) {
4428
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4404
4429
  if (themodeHyczk && themodeHyczk.length === 0) {
4405
4430
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4406
4431
  }
@@ -4456,10 +4481,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4456
4481
  null,
4457
4482
  '\u5361\u53F7\uFF1A'
4458
4483
  ),
4459
- _react2.default.createElement(
4484
+ type != 1 ? _react2.default.createElement(
4460
4485
  'span',
4461
4486
  null,
4462
4487
  m && m.storageCardNo
4488
+ ) : _react2.default.createElement(
4489
+ 'span',
4490
+ null,
4491
+ m.member && m.member.cardNo
4463
4492
  ),
4464
4493
  _react2.default.createElement(
4465
4494
  'span',
@@ -4472,7 +4501,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4472
4501
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4473
4502
  ),
4474
4503
  _react2.default.createElement('br', null),
4475
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4504
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4476
4505
  _button2.default,
4477
4506
  { onClick: function onClick() {
4478
4507
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4516,504 +4545,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4516
4545
  )
4517
4546
  )
4518
4547
  ),
4519
- type == 1 && !newStyle && _react2.default.createElement(
4520
- _modal2.default,
4521
- {
4522
- wrapClassName: 'settlement-wraper2',
4523
- width: '600px',
4524
- visible: this.state.visible,
4525
- maskClosable: false,
4526
- title: "复合结算",
4527
- footer: null,
4528
- maskStyle: { 'z-index': '1004' },
4529
- onCancel: this.handleCancel,
4530
- destroyOnClose: true
4531
- },
4532
- _react2.default.createElement(
4533
- 'div',
4534
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4535
- _react2.default.createElement(
4536
- 'div',
4537
- { className: 'settlementTop' },
4538
- _react2.default.createElement(
4539
- 'div',
4540
- { className: (0, _classnames4.default)({ "toolbar": true, "toolbar2": type == 1, "carousel": paymodes.length > carouselStart2 }) },
4541
- paymodes.length <= carouselStart2 && _react2.default.createElement(
4542
- 'div',
4543
- null,
4544
- (0, _map3.default)(paymodes, function (mode, index) {
4545
- return _this8.renderToolbtn(mode, index);
4546
- })
4547
- ),
4548
- paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
4549
- ),
4550
- _react2.default.createElement(
4551
- 'div',
4552
- { className: 'rightheader' },
4553
- paymode.onlineamount > 0 && _react2.default.createElement(
4554
- 'div',
4555
- { className: 'receivable' },
4556
- _react2.default.createElement(
4557
- 'span',
4558
- null,
4559
- '\u7EBF\u4E0A\u5DF2\u6536'
4560
- ),
4561
- _react2.default.createElement(
4562
- 'span',
4563
- null,
4564
- paymode.onlineamount
4565
- )
4566
- ),
4567
- _react2.default.createElement(
4568
- 'div',
4569
- { className: 'receivable' },
4570
- _react2.default.createElement(
4571
- 'span',
4572
- null,
4573
- '\u5E94\u6536\u91D1\u989D'
4574
- ),
4575
- _react2.default.createElement(
4576
- 'span',
4577
- null,
4578
- paymode.amount
4579
- )
4580
- ),
4581
- _react2.default.createElement(
4582
- 'div',
4583
- { className: 'receivable' },
4584
- _react2.default.createElement(
4585
- 'span',
4586
- null,
4587
- '\u5269\u4F59\u5E94\u6536'
4588
- ),
4589
- _react2.default.createElement(
4590
- 'span',
4591
- null,
4592
- paymode.receivable
4593
- )
4594
- ),
4595
- _react2.default.createElement(
4596
- 'div',
4597
- { className: 'receivable' },
4598
- _react2.default.createElement(
4599
- 'span',
4600
- null,
4601
- '\u5B9E\u6536\u91D1\u989D'
4602
- ),
4603
- _react2.default.createElement(
4604
- 'span',
4605
- { className: 'received' },
4606
- paymode.received
4607
- )
4608
- ),
4609
- _react2.default.createElement(
4610
- 'div',
4611
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4612
- _react2.default.createElement(
4613
- 'span',
4614
- null,
4615
- '\u627E\u96F6\u91D1\u989D'
4616
- ),
4617
- _react2.default.createElement(
4618
- 'span',
4619
- { className: 'received' },
4620
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4621
- )
4622
- )
4623
- )
4624
- ),
4625
- _react2.default.createElement(
4626
- 'div',
4627
- { className: 'paydetail' },
4628
- _react2.default.createElement(
4629
- 'div',
4630
- { className: 'left' },
4631
- thePaymodes.length == 0 && _react2.default.createElement(
4632
- 'div',
4633
- { className: 'emptydata detailempty2' },
4634
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4635
- ),
4636
-
4637
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4638
- (0, _map3.default)(thePaymodes, function (mode) {
4639
- var index = mode.paymethodId;
4640
- return _react2.default.createElement(
4641
- 'div',
4642
- { key: index + '', className: 'modeItem' },
4643
- _react2.default.createElement(
4644
- 'div',
4645
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4646
- _react2.default.createElement(
4647
- 'div',
4648
- { className: (0, _classnames4.default)({ "name": true }) },
4649
- mode.name
4650
- ),
4651
- _react2.default.createElement(
4652
- 'div',
4653
- { className: (0, _classnames4.default)({ "content": true }) },
4654
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4655
- onClick: function onClick() {
4656
- _this8.editModal(index, mode.paymentType);
4657
- }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4658
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4659
- onBlur: function onBlur(e) {
4660
- return _this8.onBlur(index, e);
4661
- },
4662
- onChange: function onChange(e) {
4663
- return _this8.handleChange(index, e);
4664
- },
4665
- onFocus: function onFocus(e) {
4666
- return _this8.onFocusHack(index, mode, paymode, e);
4667
- }
4668
- })
4669
- ),
4670
- _react2.default.createElement(
4671
- 'div',
4672
- { className: 'minus', onClick: function onClick() {
4673
- _this8.onDelPay(index);
4674
- } },
4675
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4676
- )
4677
- ),
4678
- mode.paymentType == PayStyle.djq ? _react2.default.createElement(
4679
- 'div',
4680
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4681
- _react2.default.createElement(
4682
- 'span',
4683
- { className: 'balance' },
4684
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4685
- ),
4686
- _react2.default.createElement(
4687
- 'span',
4688
- null,
4689
- mode.overchargesAmount
4690
- )
4691
- ) : _react2.default.createElement(
4692
- 'div',
4693
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4694
- _react2.default.createElement(
4695
- 'span',
4696
- { className: 'fl' },
4697
- '\u5361\u53F7\uFF1A'
4698
- ),
4699
- _react2.default.createElement(
4700
- 'span',
4701
- { className: 'fl' },
4702
- mode && mode.storageCardNo
4703
- ),
4704
- _react2.default.createElement('br', null),
4705
- _react2.default.createElement(
4706
- 'span',
4707
- { className: 'balance fl' },
4708
- '\u4F59\u989D\uFF1A'
4709
- ),
4710
- _react2.default.createElement(
4711
- 'span',
4712
- { className: 'fl' },
4713
- (0, _utils.getFixedNumber)(mode.balance)
4714
- )
4715
- )
4716
- );
4717
- })
4718
- ),
4719
- _react2.default.createElement(
4720
- 'div',
4721
- { className: 'right' },
4722
- _react2.default.createElement(
4723
- 'div',
4724
- { className: this.isHorizontalPad ? 'keyboard_ios' : 'keyboard' },
4725
- !this.isHorizontalPad && _react2.default.createElement(_keyboard2.default, { type: 'number', onChange: this.onKeyboardChange.bind(this) })
4726
- )
4727
- )
4728
- ),
4729
- _react2.default.createElement(
4730
- 'div',
4731
- { className: 'payfooter2' },
4732
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4733
- _react2.default.createElement(
4734
- 'span',
4735
- null,
4736
- _react2.default.createElement(
4737
- _button2.default,
4738
- { className: 'cancel', onClick: this.handleCancel },
4739
- '\u53D6\u6D88'
4740
- )
4741
- ),
4742
- _react2.default.createElement(
4743
- 'span',
4744
- null,
4745
- _react2.default.createElement(
4746
- _button2.default,
4747
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4748
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4749
- '\u7ED3\u7B97'
4750
- )
4751
- )
4752
- )
4753
- )
4754
- ),
4755
- type == 1 && newStyle && _react2.default.createElement(
4756
- _modal2.default,
4757
- {
4758
- wrapClassName: 'settlement-wraper2',
4759
- width: '600px',
4760
- visible: this.state.visible,
4761
- maskClosable: false,
4762
- title: "复合结算",
4763
- footer: null,
4764
- backdropStyle: { 'z-index': '1004' },
4765
- onCancel: this.handleCancel,
4766
- destroyOnClose: true
4767
- },
4768
- _react2.default.createElement(
4769
- 'div',
4770
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4771
- _react2.default.createElement(
4772
- 'div',
4773
- { className: 'paydetail newstyle newstyle2' },
4774
- _react2.default.createElement(
4775
- 'div',
4776
- { className: 'top' },
4777
- _react2.default.createElement(
4778
- 'div',
4779
- { className: 'righttop' },
4780
- paymode.onlineamount > 0 && _react2.default.createElement(
4781
- 'div',
4782
- { className: 'receivable' },
4783
- _react2.default.createElement(
4784
- 'span',
4785
- null,
4786
- '\u7EBF\u4E0A\u5DF2\u6536'
4787
- ),
4788
- _react2.default.createElement(
4789
- 'span',
4790
- null,
4791
- paymode.onlineamount
4792
- )
4793
- ),
4794
- _react2.default.createElement(
4795
- 'div',
4796
- { className: 'receivable' },
4797
- _react2.default.createElement(
4798
- 'span',
4799
- null,
4800
- '\u5E94\u6536\u91D1\u989D'
4801
- ),
4802
- _react2.default.createElement(
4803
- 'span',
4804
- null,
4805
- paymode.amount
4806
- )
4807
- ),
4808
- _react2.default.createElement(
4809
- 'div',
4810
- { className: 'receivable' },
4811
- _react2.default.createElement(
4812
- 'span',
4813
- null,
4814
- '\u5269\u4F59\u5E94\u6536'
4815
- ),
4816
- _react2.default.createElement(
4817
- 'span',
4818
- null,
4819
- paymode.receivable
4820
- )
4821
- ),
4822
- _react2.default.createElement(
4823
- 'div',
4824
- { className: 'receivable' },
4825
- _react2.default.createElement(
4826
- 'span',
4827
- null,
4828
- '\u5B9E\u6536\u91D1\u989D'
4829
- ),
4830
- _react2.default.createElement(
4831
- 'span',
4832
- { className: 'received' },
4833
- paymode.received
4834
- )
4835
- ),
4836
- _react2.default.createElement(
4837
- 'div',
4838
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4839
- _react2.default.createElement(
4840
- 'span',
4841
- null,
4842
- '\u627E\u96F6\u91D1\u989D'
4843
- ),
4844
- _react2.default.createElement(
4845
- 'span',
4846
- { className: 'received' },
4847
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4848
- )
4849
- )
4850
- )
4851
- ),
4852
- _react2.default.createElement(
4853
- 'div',
4854
- { className: 'bottom' },
4855
- thePaymodes.length == 0 && _react2.default.createElement(
4856
- 'div',
4857
- { className: 'emptydata detailempty' },
4858
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4859
- ),
4860
-
4861
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4862
- (0, _map3.default)(thePaymodes, function (mode, mindex) {
4863
- var isReturn = _this8.props.isReturn;
4864
-
4865
- var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
4866
- return m.paymentType === PayStyle.smzf;
4867
- });
4868
- var hotkeyIndex = mindex;
4869
- //同时存在微信、支付宝、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4870
- if (!isReturn && hasSMZF) {
4871
- if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4872
- return null;
4873
- } else {
4874
- var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4875
- return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4876
- });
4877
- hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
4878
- return m.paymentType == mode.paymentType;
4879
- });
4880
- }
4881
- }
4882
- var index = mode.paymethodId;
4883
- return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4884
- return m.paymentType == PayStyle.hyczk;
4885
- }) != mindex ? _react2.default.createElement('div', null) : _react2.default.createElement(
4886
- 'div',
4887
- { key: index + '', className: 'modeItem' },
4888
- _react2.default.createElement(
4889
- 'div',
4890
- { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4891
- _react2.default.createElement(
4892
- 'div',
4893
- { className: (0, _classnames4.default)({ "name": true }) },
4894
- _react2.default.createElement(
4895
- 'div',
4896
- { className: 'icon' },
4897
- _react2.default.createElement(_ticon2.default, { type: PayIcon[mode.paymentType] || PayIcon['default'] })
4898
- ),
4899
- _react2.default.createElement(
4900
- 'div',
4901
- { className: 'text' },
4902
- mode.name
4903
- ),
4904
- _react2.default.createElement(
4905
- 'div',
4906
- { className: 'hotkey' },
4907
- _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
4908
- )
4909
- ),
4910
- _react2.default.createElement(
4911
- 'div',
4912
- { className: (0, _classnames4.default)({ "content": true }) },
4913
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
4914
- // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
4915
- , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4916
- // className="paymode"
4917
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4918
- onClick: function onClick() {
4919
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4920
- },
4921
- value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4922
- return tm.paymentType == PayStyle.hyczk;
4923
- }), function (sum, m) {
4924
- return Math.Add(sum, m.value);
4925
- }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4926
- className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4927
- // className="paymode"
4928
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4929
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4930
- onClick: function onClick(e) {
4931
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4932
- },
4933
- onBlur: function onBlur(e) {
4934
- return _this8.onBlur(index, e);
4935
- },
4936
- onFocus: function onFocus(e) {
4937
- return _this8.onFocusHack(index, mode, paymode, e);
4938
- },
4939
- onChange: function onChange(e) {
4940
- return _this8.handleChange(index, e);
4941
- }
4942
- })
4943
- )
4944
- ),
4945
- mode.paymentType == PayStyle.djq && _react2.default.createElement(
4946
- 'div',
4947
- { className: 'append' },
4948
- _react2.default.createElement(
4949
- 'span',
4950
- { className: 'balance' },
4951
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4952
- ),
4953
- _react2.default.createElement(
4954
- 'span',
4955
- null,
4956
- mode.overchargesAmount
4957
- )
4958
- ),
4959
- (0, _map3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4960
- return mode.paymentType == PayStyle.hyczk && parseFloat(tm.value || 0) != 0 && tm.paymentType == PayStyle.hyczk;
4961
- }), function (m) {
4962
- return _react2.default.createElement(
4963
- 'div',
4964
- { className: 'append' },
4965
- _react2.default.createElement(
4966
- 'span',
4967
- null,
4968
- '\u5361\u53F7\uFF1A'
4969
- ),
4970
- _react2.default.createElement(
4971
- 'span',
4972
- null,
4973
- m.member && m.member.cardNo
4974
- ),
4975
- _react2.default.createElement(
4976
- 'span',
4977
- { className: 'fr' },
4978
- (0, _utils.getFixedNumber)(m.value)
4979
- ),
4980
- _react2.default.createElement(
4981
- 'span',
4982
- { className: 'balance fr' },
4983
- '\u652F\u4ED8\u91D1\u989D\uFF1A'
4984
- )
4985
- );
4986
- })
4987
- );
4988
- })
4989
- )
4990
- ),
4991
- _react2.default.createElement(
4992
- 'div',
4993
- { className: 'payfooter2' },
4994
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4995
- _react2.default.createElement(
4996
- 'span',
4997
- null,
4998
- _react2.default.createElement(
4999
- _button2.default,
5000
- { className: 'cancel', onClick: this.handleCancel },
5001
- '\u53D6\u6D88'
5002
- )
5003
- ),
5004
- _react2.default.createElement(
5005
- 'span',
5006
- null,
5007
- _react2.default.createElement(
5008
- _button2.default,
5009
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
5010
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
5011
- '\u7ED3\u7B97'
5012
- )
5013
- )
5014
- )
5015
- )
5016
- ),
5017
4548
  _react2.default.createElement(
5018
4549
  _modal2.default,
5019
4550
  {
@@ -5026,6 +4557,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5026
4557
  onCancel: this.handleCzkCancel,
5027
4558
  keyboard: false,
5028
4559
  centered: !this.isHorizontalPad ? true : false,
4560
+ zIndex: 1007,
5029
4561
  footer: _react2.default.createElement(
5030
4562
  'div',
5031
4563
  { className: 'action' },
@@ -5303,6 +4835,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5303
4835
  onCancel: this.handleMoreCzkCancel,
5304
4836
  keyboard: false,
5305
4837
  centered: !this.isHorizontalPad ? true : false,
4838
+ zIndex: 1007,
5306
4839
  footer: _react2.default.createElement(
5307
4840
  'div',
5308
4841
  { className: 'action' },
@@ -5344,7 +4877,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5344
4877
  onCancel: this.handleSetPwdCancel,
5345
4878
  keyboard: false,
5346
4879
  centered: !this.isHorizontalPad ? true : false,
5347
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4880
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4881
+ zIndex: 1007
5348
4882
  }, 'footer', _react2.default.createElement(
5349
4883
  'div',
5350
4884
  { className: 'action' },
@@ -5440,6 +4974,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5440
4974
  onCancel: this.handleDjqCancel,
5441
4975
  centered: !this.isHorizontalPad ? true : false,
5442
4976
  title: Differentiate.COUPON + '支付',
4977
+ zIndex: 1007,
5443
4978
  footer: _react2.default.createElement(
5444
4979
  'div',
5445
4980
  { className: 'action' },
@@ -5762,6 +5297,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5762
5297
  centered: !this.isHorizontalPad ? true : false,
5763
5298
  title: "积分抵现",
5764
5299
  destroyOnClose: true,
5300
+ zIndex: 1007,
5765
5301
  footer: _react2.default.createElement(
5766
5302
  'div',
5767
5303
  { className: 'action' },
@@ -5934,7 +5470,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5934
5470
  ),
5935
5471
  _react2.default.createElement(_index3.default, { discount: {
5936
5472
  discountTotalAmount: discountTotalAmount, discountRetailTotalAount: discountRetailTotalAount, discountPrototypeTotalAmount: discountPrototypeTotalAmount
5937
- }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible })
5473
+ }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible, isNotAutoFocus: isNotAutoFocus })
5938
5474
  );
5939
5475
  }
5940
5476
  }]);