tplus-components-touch 3.33.15 → 3.34.3

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 (23) hide show
  1. package/dist/components/billSearch/index.js +9 -0
  2. package/dist/components/billSearch/index.js.map +1 -1
  3. package/dist/components/billSearch/index.less +8 -0
  4. package/dist/components/input/scanInput.less +1 -1
  5. package/dist/components/keyboard/index.less +29 -23
  6. package/dist/components/keyboard/numKeyboard.js +4 -0
  7. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  8. package/dist/components/keyboard/numkeyboardPassword.js +2 -0
  9. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  10. package/dist/components/keyboard/onlyLetterButton2.less +1 -1
  11. package/dist/components/layout/sider.js +3 -1
  12. package/dist/components/layout/sider.js.map +1 -1
  13. package/dist/components/modalWraper/index.js +1 -1
  14. package/dist/components/modalWraper/index.js.map +1 -1
  15. package/dist/components/settlement/settlement.js +78 -553
  16. package/dist/components/settlement/settlement.js.map +1 -1
  17. package/dist/components/settlement/settlement.less +4 -24
  18. package/dist/components/settlement/settlementCopy.js +5731 -0
  19. package/dist/components/settlement/settlementCopy.js.map +1 -0
  20. package/dist/components/settlement/settlementStore.js +357 -734
  21. package/dist/components/settlement/settlementStore.js.map +1 -1
  22. package/dist/components/touchTable/index.less +1 -1
  23. package/package.json +2 -2
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);
@@ -82,10 +82,10 @@ var _inherits3 = _interopRequireDefault(_inherits2);
82
82
 
83
83
  var _class, _class2, _temp;
84
84
 
85
- require('antd/es/input/style');
86
-
87
85
  require('antd/es/modal/style');
88
86
 
87
+ require('antd/es/input/style');
88
+
89
89
  require('antd/es/drawer/style');
90
90
 
91
91
  require('antd/es/carousel/style');
@@ -204,8 +204,6 @@ var _index = require('../../index');
204
204
 
205
205
  var _tplusPoslogin = require('tplus-poslogin');
206
206
 
207
- var _tplusApi = require('tplus-api');
208
-
209
207
  var _index2 = require('./prototypeTable/index');
210
208
 
211
209
  var _index3 = _interopRequireDefault(_index2);
@@ -367,7 +365,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
367
365
  isReturn = _this2$props.isReturn,
368
366
  type = _this2$props.type;
369
367
 
370
- _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true })).then(function (result) {
368
+ _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
371
369
  if (result) {
372
370
  _this2.setState({
373
371
  settleDisabled: false
@@ -1302,7 +1300,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1302
1300
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1303
1301
  PayStyle = _enumController$getEn12.PayStyle;
1304
1302
 
1305
- if (boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1303
+ var storeType = _this2.props.type;
1304
+
1305
+ if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1306
1306
  _message2.default.info('原单退货时，该结算方式不可以删除。');
1307
1307
  } else {
1308
1308
  _this2.store.delPay(index);
@@ -2051,6 +2051,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2051
2051
  settleDisabled: true
2052
2052
  });
2053
2053
  console.log("settlement.handleSettle开始执行，参数：", +args);
2054
+ // let p=new Promise((res,rej)=>{
2055
+ // res(args);
2056
+ // });
2057
+ //
2058
+ // const testAsync = async (p) => {
2059
+ // let result = await p;
2060
+ // console.log(result);
2061
+ // }
2062
+ //
2063
+ // testAsync(p);
2054
2064
  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
2055
2065
  _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
2056
2066
  isQuickPay = args === 'quickPay';
@@ -3392,16 +3402,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3392
3402
  }, {
3393
3403
  key: 'onKeyboardChange',
3394
3404
  value: function onKeyboardChange(key) {
3395
- var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3396
- PayStyle = _enumController$getEn32.PayStyle;
3397
-
3398
3405
  if (this.currentInput) {
3399
- if (this.store.paymode.currentMode) {
3400
- var paymentType1 = this.store.paymode.currentMode.paymentType;
3401
- if (paymentType1 === PayStyle.djq || paymentType1 === PayStyle.hyczk || paymentType1 === PayStyle.jfdx) {
3402
- return;
3403
- }
3404
- }
3405
3406
  var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
3406
3407
  if (!isNaN(value) || value == '-') {
3407
3408
  this.currentInput.value = value;
@@ -3414,9 +3415,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3414
3415
  value: function renderToolbtn(mode, index) {
3415
3416
  var _this7 = this;
3416
3417
 
3417
- var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3418
- PayIcon = _enumController$getEn33.PayIcon,
3419
- PayStyle = _enumController$getEn33.PayStyle;
3418
+ var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3419
+ PayIcon = _enumController$getEn32.PayIcon,
3420
+ PayStyle = _enumController$getEn32.PayStyle;
3420
3421
 
3421
3422
  var isReturn = this.props.isReturn;
3422
3423
  var _store = this.store,
@@ -3488,11 +3489,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3488
3489
  value: function render() {
3489
3490
  var _this8 = this;
3490
3491
 
3491
- var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3492
- PayIcon = _enumController$getEn34.PayIcon,
3493
- PayIcon2 = _enumController$getEn34.PayIcon2,
3494
- PayStyle = _enumController$getEn34.PayStyle,
3495
- Differentiate = _enumController$getEn34.Differentiate;
3492
+ var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3493
+ PayIcon = _enumController$getEn33.PayIcon,
3494
+ PayIcon2 = _enumController$getEn33.PayIcon2,
3495
+ PayStyle = _enumController$getEn33.PayStyle,
3496
+ Differentiate = _enumController$getEn33.Differentiate;
3496
3497
 
3497
3498
  var _state2 = this.state,
3498
3499
  btnDissabled = _state2.btnDissabled,
@@ -3726,10 +3727,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3726
3727
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3727
3728
  return _react2.default.createElement(
3728
3729
  _button2.default,
3729
- { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
3730
+ {
3731
+ className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }),
3732
+ key: 'paymentType_' + p.paymentType,
3733
+ onClick: function onClick() {
3730
3734
  _this8.btnDebounced(p.paymentType, true);
3731
3735
  },
3732
- disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
3736
+ disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
3737
+ },
3733
3738
  _react2.default.createElement(
3734
3739
  'div',
3735
3740
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3750,7 +3755,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3750
3755
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3751
3756
  )
3752
3757
  ),
3753
- type != 1 && !newStyle && _react2.default.createElement(
3758
+ !newStyle && _react2.default.createElement(
3754
3759
  _drawer2.default,
3755
3760
  {
3756
3761
  title: '\u590D\u5408\u7ED3\u7B97',
@@ -3761,11 +3766,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3761
3766
  onClose: this.handleCancel,
3762
3767
  visible: this.state.visible,
3763
3768
  destroyOnClose: true,
3764
- className: 'settlement-wraper'
3769
+ className: 'settlement-wraper',
3770
+ style: { 'zIndex': 1006 }
3765
3771
  },
3766
3772
  _react2.default.createElement(
3767
3773
  'div',
3768
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3774
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3769
3775
  _react2.default.createElement(
3770
3776
  'div',
3771
3777
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3780,7 +3786,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3780
3786
  ),
3781
3787
  _react2.default.createElement(
3782
3788
  'div',
3783
- { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px' } },
3789
+ { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px', height: 'calc(100% - 198px)' } },
3784
3790
  _react2.default.createElement(
3785
3791
  'div',
3786
3792
  { className: 'left' },
@@ -3810,7 +3816,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3810
3816
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
3811
3817
  className: _index.hotKey.hotKeyNotFilter(),
3812
3818
  onClick: function onClick() {
3813
- _this8.editModal(index, mode.paymentType, boriginReturn);
3819
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
3814
3820
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
3815
3821
  className: _index.hotKey.hotKeyNotFilter(),
3816
3822
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -3874,7 +3880,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3874
3880
  (0, _utils.getFixedNumber)(mode.balance)
3875
3881
  ),
3876
3882
  _react2.default.createElement('br', null),
3877
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3883
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3878
3884
  _button2.default,
3879
3885
  { onClick: function onClick() {
3880
3886
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -3967,7 +3973,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3967
3973
  )
3968
3974
  )
3969
3975
  ),
3970
- !isReturn && _react2.default.createElement(
3976
+ type != 1 && !isReturn && _react2.default.createElement(
3971
3977
  'div',
3972
3978
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
3973
3979
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4006,7 +4012,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4006
4012
  )
4007
4013
  )
4008
4014
  ),
4009
- type != 1 && newStyle && _react2.default.createElement(
4015
+ newStyle && _react2.default.createElement(
4010
4016
  _drawer2.default,
4011
4017
  {
4012
4018
  title: '\u590D\u5408\u7ED3\u7B97',
@@ -4017,7 +4023,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4017
4023
  onClose: this.handleCancel,
4018
4024
  visible: this.state.visible,
4019
4025
  destroyOnClose: true,
4020
- className: 'settlement-wraper'
4026
+ className: 'settlement-wraper',
4027
+ style: { 'zIndex': 1006 }
4021
4028
  },
4022
4029
  _react2.default.createElement(
4023
4030
  'div',
@@ -4102,7 +4109,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4102
4109
  )
4103
4110
  )
4104
4111
  ),
4105
- !isReturn && _react2.default.createElement(
4112
+ type != 1 && !isReturn && _react2.default.createElement(
4106
4113
  'div',
4107
4114
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4108
4115
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4124,12 +4131,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4124
4131
  return m.paymentType === PayStyle.smzf;
4125
4132
  });
4126
4133
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4127
- var hotkeyIndex = index;
4134
+ var hotkeyIndex = mindex;
4128
4135
  if (!isReturn && hasSMZF) {
4129
4136
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4130
4137
  return null;
4131
4138
  } else {
4132
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4139
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4133
4140
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4134
4141
  });
4135
4142
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4137,6 +4144,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4137
4144
  });
4138
4145
  }
4139
4146
  }
4147
+ var hyczkFindIndex = (0, _findIndex3.default)(thePaymodes, function (m) {
4148
+ return m.paymentType == PayStyle.hyczk;
4149
+ });
4150
+ var hyczkList = (0, _filter3.default)(thePaymodes, function (m) {
4151
+ return m.paymentType == PayStyle.hyczk;
4152
+ });
4153
+ var lastStorageCardIndex = 0;
4154
+ (0, _map3.default)(thePaymodes, function (m, i) {
4155
+ if (m.paymentType === PayStyle.hyczk) lastStorageCardIndex = i;
4156
+ });
4157
+ if (mindex > 0 && hyczkList.length > 1 && mindex > lastStorageCardIndex) {
4158
+ hotkeyIndex = hotkeyIndex - hyczkList.length + 1;
4159
+ }
4160
+
4161
+ console.log(thePaymodes);
4162
+
4140
4163
  var index = mode.paymethodId;
4141
4164
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4142
4165
  return m.paymentType == PayStyle.hyczk;
@@ -4173,16 +4196,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4173
4196
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4174
4197
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4175
4198
  onClick: function onClick() {
4176
- // let czkinput = document.getElementById('inputS' + index);
4177
- // if (mode.paymentType === PayStyle.hyczk) {
4178
- // const { isProhibitMeStorageCard } = this.props;
4179
- // if (isProhibitMeStorageCard) {
4180
- // Message.warn('储值卡不可键盘录入，请刷卡!');
4181
- // return;
4182
- // }
4183
- // }
4184
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4185
- if (mode.paymentType == PayStyle.hyczk) {
4199
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4186
4200
  if (themodeHyczk && themodeHyczk.length === 0) {
4187
4201
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4188
4202
  }
@@ -4238,10 +4252,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4238
4252
  null,
4239
4253
  '\u5361\u53F7\uFF1A'
4240
4254
  ),
4241
- _react2.default.createElement(
4255
+ type != 1 ? _react2.default.createElement(
4242
4256
  'span',
4243
4257
  null,
4244
4258
  m && m.storageCardNo
4259
+ ) : _react2.default.createElement(
4260
+ 'span',
4261
+ null,
4262
+ m.member && m.member.cardNo
4245
4263
  ),
4246
4264
  _react2.default.createElement(
4247
4265
  'span',
@@ -4254,7 +4272,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4254
4272
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4255
4273
  ),
4256
4274
  _react2.default.createElement('br', null),
4257
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4275
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4258
4276
  _button2.default,
4259
4277
  { onClick: function onClick() {
4260
4278
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4298,504 +4316,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4298
4316
  )
4299
4317
  )
4300
4318
  ),
4301
- type == 1 && !newStyle && _react2.default.createElement(
4302
- _modal2.default,
4303
- {
4304
- wrapClassName: 'settlement-wraper2',
4305
- width: '600px',
4306
- visible: this.state.visible,
4307
- maskClosable: false,
4308
- title: "复合结算",
4309
- footer: null,
4310
- maskStyle: { 'z-index': '1004' },
4311
- onCancel: this.handleCancel,
4312
- destroyOnClose: true
4313
- },
4314
- _react2.default.createElement(
4315
- 'div',
4316
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4317
- _react2.default.createElement(
4318
- 'div',
4319
- { className: 'settlementTop' },
4320
- _react2.default.createElement(
4321
- 'div',
4322
- { className: (0, _classnames4.default)({ "toolbar": true, "toolbar2": type == 1, "carousel": paymodes.length > carouselStart2 }) },
4323
- paymodes.length <= carouselStart2 && _react2.default.createElement(
4324
- 'div',
4325
- null,
4326
- (0, _map3.default)(paymodes, function (mode, index) {
4327
- return _this8.renderToolbtn(mode, index);
4328
- })
4329
- ),
4330
- paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
4331
- ),
4332
- _react2.default.createElement(
4333
- 'div',
4334
- { className: 'rightheader' },
4335
- paymode.onlineamount > 0 && _react2.default.createElement(
4336
- 'div',
4337
- { className: 'receivable' },
4338
- _react2.default.createElement(
4339
- 'span',
4340
- null,
4341
- '\u7EBF\u4E0A\u5DF2\u6536'
4342
- ),
4343
- _react2.default.createElement(
4344
- 'span',
4345
- null,
4346
- paymode.onlineamount
4347
- )
4348
- ),
4349
- _react2.default.createElement(
4350
- 'div',
4351
- { className: 'receivable' },
4352
- _react2.default.createElement(
4353
- 'span',
4354
- null,
4355
- '\u5E94\u6536\u91D1\u989D'
4356
- ),
4357
- _react2.default.createElement(
4358
- 'span',
4359
- null,
4360
- paymode.amount
4361
- )
4362
- ),
4363
- _react2.default.createElement(
4364
- 'div',
4365
- { className: 'receivable' },
4366
- _react2.default.createElement(
4367
- 'span',
4368
- null,
4369
- '\u5269\u4F59\u5E94\u6536'
4370
- ),
4371
- _react2.default.createElement(
4372
- 'span',
4373
- null,
4374
- paymode.receivable
4375
- )
4376
- ),
4377
- _react2.default.createElement(
4378
- 'div',
4379
- { className: 'receivable' },
4380
- _react2.default.createElement(
4381
- 'span',
4382
- null,
4383
- '\u5B9E\u6536\u91D1\u989D'
4384
- ),
4385
- _react2.default.createElement(
4386
- 'span',
4387
- { className: 'received' },
4388
- paymode.received
4389
- )
4390
- ),
4391
- _react2.default.createElement(
4392
- 'div',
4393
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4394
- _react2.default.createElement(
4395
- 'span',
4396
- null,
4397
- '\u627E\u96F6\u91D1\u989D'
4398
- ),
4399
- _react2.default.createElement(
4400
- 'span',
4401
- { className: 'received' },
4402
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4403
- )
4404
- )
4405
- )
4406
- ),
4407
- _react2.default.createElement(
4408
- 'div',
4409
- { className: 'paydetail' },
4410
- _react2.default.createElement(
4411
- 'div',
4412
- { className: 'left' },
4413
- thePaymodes.length == 0 && _react2.default.createElement(
4414
- 'div',
4415
- { className: 'emptydata detailempty2' },
4416
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4417
- ),
4418
-
4419
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4420
- (0, _map3.default)(thePaymodes, function (mode) {
4421
- var index = mode.paymethodId;
4422
- return _react2.default.createElement(
4423
- 'div',
4424
- { key: index + '', className: 'modeItem' },
4425
- _react2.default.createElement(
4426
- 'div',
4427
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4428
- _react2.default.createElement(
4429
- 'div',
4430
- { className: (0, _classnames4.default)({ "name": true }) },
4431
- mode.name
4432
- ),
4433
- _react2.default.createElement(
4434
- 'div',
4435
- { className: (0, _classnames4.default)({ "content": true }) },
4436
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4437
- onClick: function onClick() {
4438
- _this8.editModal(index, mode.paymentType);
4439
- }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4440
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4441
- onBlur: function onBlur(e) {
4442
- return _this8.onBlur(index, e);
4443
- },
4444
- onChange: function onChange(e) {
4445
- return _this8.handleChange(index, e);
4446
- },
4447
- onFocus: function onFocus(e) {
4448
- return _this8.onFocusHack(index, mode, paymode, e);
4449
- }
4450
- })
4451
- ),
4452
- _react2.default.createElement(
4453
- 'div',
4454
- { className: 'minus', onClick: function onClick() {
4455
- _this8.onDelPay(index);
4456
- } },
4457
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4458
- )
4459
- ),
4460
- mode.paymentType == PayStyle.djq ? _react2.default.createElement(
4461
- 'div',
4462
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4463
- _react2.default.createElement(
4464
- 'span',
4465
- { className: 'balance' },
4466
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4467
- ),
4468
- _react2.default.createElement(
4469
- 'span',
4470
- null,
4471
- mode.overchargesAmount
4472
- )
4473
- ) : _react2.default.createElement(
4474
- 'div',
4475
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4476
- _react2.default.createElement(
4477
- 'span',
4478
- { className: 'fl' },
4479
- '\u5361\u53F7\uFF1A'
4480
- ),
4481
- _react2.default.createElement(
4482
- 'span',
4483
- { className: 'fl' },
4484
- mode && mode.storageCardNo
4485
- ),
4486
- _react2.default.createElement('br', null),
4487
- _react2.default.createElement(
4488
- 'span',
4489
- { className: 'balance fl' },
4490
- '\u4F59\u989D\uFF1A'
4491
- ),
4492
- _react2.default.createElement(
4493
- 'span',
4494
- { className: 'fl' },
4495
- (0, _utils.getFixedNumber)(mode.balance)
4496
- )
4497
- )
4498
- );
4499
- })
4500
- ),
4501
- _react2.default.createElement(
4502
- 'div',
4503
- { className: 'right' },
4504
- _react2.default.createElement(
4505
- 'div',
4506
- { className: this.isHorizontalPad ? 'keyboard_ios' : 'keyboard' },
4507
- !this.isHorizontalPad && _react2.default.createElement(_keyboard2.default, { type: 'number', onChange: this.onKeyboardChange.bind(this) })
4508
- )
4509
- )
4510
- ),
4511
- _react2.default.createElement(
4512
- 'div',
4513
- { className: 'payfooter2' },
4514
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4515
- _react2.default.createElement(
4516
- 'span',
4517
- null,
4518
- _react2.default.createElement(
4519
- _button2.default,
4520
- { className: 'cancel', onClick: this.handleCancel },
4521
- '\u53D6\u6D88'
4522
- )
4523
- ),
4524
- _react2.default.createElement(
4525
- 'span',
4526
- null,
4527
- _react2.default.createElement(
4528
- _button2.default,
4529
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4530
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4531
- '\u7ED3\u7B97'
4532
- )
4533
- )
4534
- )
4535
- )
4536
- ),
4537
- type == 1 && newStyle && _react2.default.createElement(
4538
- _modal2.default,
4539
- {
4540
- wrapClassName: 'settlement-wraper2',
4541
- width: '600px',
4542
- visible: this.state.visible,
4543
- maskClosable: false,
4544
- title: "复合结算",
4545
- footer: null,
4546
- backdropStyle: { 'z-index': '1004' },
4547
- onCancel: this.handleCancel,
4548
- destroyOnClose: true
4549
- },
4550
- _react2.default.createElement(
4551
- 'div',
4552
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4553
- _react2.default.createElement(
4554
- 'div',
4555
- { className: 'paydetail newstyle newstyle2' },
4556
- _react2.default.createElement(
4557
- 'div',
4558
- { className: 'top' },
4559
- _react2.default.createElement(
4560
- 'div',
4561
- { className: 'righttop' },
4562
- paymode.onlineamount > 0 && _react2.default.createElement(
4563
- 'div',
4564
- { className: 'receivable' },
4565
- _react2.default.createElement(
4566
- 'span',
4567
- null,
4568
- '\u7EBF\u4E0A\u5DF2\u6536'
4569
- ),
4570
- _react2.default.createElement(
4571
- 'span',
4572
- null,
4573
- paymode.onlineamount
4574
- )
4575
- ),
4576
- _react2.default.createElement(
4577
- 'div',
4578
- { className: 'receivable' },
4579
- _react2.default.createElement(
4580
- 'span',
4581
- null,
4582
- '\u5E94\u6536\u91D1\u989D'
4583
- ),
4584
- _react2.default.createElement(
4585
- 'span',
4586
- null,
4587
- paymode.amount
4588
- )
4589
- ),
4590
- _react2.default.createElement(
4591
- 'div',
4592
- { className: 'receivable' },
4593
- _react2.default.createElement(
4594
- 'span',
4595
- null,
4596
- '\u5269\u4F59\u5E94\u6536'
4597
- ),
4598
- _react2.default.createElement(
4599
- 'span',
4600
- null,
4601
- paymode.receivable
4602
- )
4603
- ),
4604
- _react2.default.createElement(
4605
- 'div',
4606
- { className: 'receivable' },
4607
- _react2.default.createElement(
4608
- 'span',
4609
- null,
4610
- '\u5B9E\u6536\u91D1\u989D'
4611
- ),
4612
- _react2.default.createElement(
4613
- 'span',
4614
- { className: 'received' },
4615
- paymode.received
4616
- )
4617
- ),
4618
- _react2.default.createElement(
4619
- 'div',
4620
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4621
- _react2.default.createElement(
4622
- 'span',
4623
- null,
4624
- '\u627E\u96F6\u91D1\u989D'
4625
- ),
4626
- _react2.default.createElement(
4627
- 'span',
4628
- { className: 'received' },
4629
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4630
- )
4631
- )
4632
- )
4633
- ),
4634
- _react2.default.createElement(
4635
- 'div',
4636
- { className: 'bottom' },
4637
- thePaymodes.length == 0 && _react2.default.createElement(
4638
- 'div',
4639
- { className: 'emptydata detailempty' },
4640
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4641
- ),
4642
-
4643
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4644
- (0, _map3.default)(thePaymodes, function (mode, mindex) {
4645
- var isReturn = _this8.props.isReturn;
4646
-
4647
- var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
4648
- return m.paymentType === PayStyle.smzf;
4649
- });
4650
- var hotkeyIndex = mindex;
4651
- //同时存在微信、支付宝、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4652
- if (!isReturn && hasSMZF) {
4653
- if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4654
- return null;
4655
- } else {
4656
- var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4657
- return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4658
- });
4659
- hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
4660
- return m.paymentType == mode.paymentType;
4661
- });
4662
- }
4663
- }
4664
- var index = mode.paymethodId;
4665
- return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4666
- return m.paymentType == PayStyle.hyczk;
4667
- }) != mindex ? _react2.default.createElement('div', null) : _react2.default.createElement(
4668
- 'div',
4669
- { key: index + '', className: 'modeItem' },
4670
- _react2.default.createElement(
4671
- 'div',
4672
- { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4673
- _react2.default.createElement(
4674
- 'div',
4675
- { className: (0, _classnames4.default)({ "name": true }) },
4676
- _react2.default.createElement(
4677
- 'div',
4678
- { className: 'icon' },
4679
- _react2.default.createElement(_ticon2.default, { type: PayIcon[mode.paymentType] || PayIcon['default'] })
4680
- ),
4681
- _react2.default.createElement(
4682
- 'div',
4683
- { className: 'text' },
4684
- mode.name
4685
- ),
4686
- _react2.default.createElement(
4687
- 'div',
4688
- { className: 'hotkey' },
4689
- _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
4690
- )
4691
- ),
4692
- _react2.default.createElement(
4693
- 'div',
4694
- { className: (0, _classnames4.default)({ "content": true }) },
4695
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
4696
- // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
4697
- , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4698
- // className="paymode"
4699
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4700
- onClick: function onClick() {
4701
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4702
- },
4703
- value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4704
- return tm.paymentType == PayStyle.hyczk;
4705
- }), function (sum, m) {
4706
- return Math.Add(sum, m.value);
4707
- }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4708
- className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4709
- // className="paymode"
4710
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4711
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4712
- onClick: function onClick(e) {
4713
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4714
- },
4715
- onBlur: function onBlur(e) {
4716
- return _this8.onBlur(index, e);
4717
- },
4718
- onFocus: function onFocus(e) {
4719
- return _this8.onFocusHack(index, mode, paymode, e);
4720
- },
4721
- onChange: function onChange(e) {
4722
- return _this8.handleChange(index, e);
4723
- }
4724
- })
4725
- )
4726
- ),
4727
- mode.paymentType == PayStyle.djq && _react2.default.createElement(
4728
- 'div',
4729
- { className: 'append' },
4730
- _react2.default.createElement(
4731
- 'span',
4732
- { className: 'balance' },
4733
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4734
- ),
4735
- _react2.default.createElement(
4736
- 'span',
4737
- null,
4738
- mode.overchargesAmount
4739
- )
4740
- ),
4741
- (0, _map3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4742
- return mode.paymentType == PayStyle.hyczk && parseFloat(tm.value || 0) != 0 && tm.paymentType == PayStyle.hyczk;
4743
- }), function (m) {
4744
- return _react2.default.createElement(
4745
- 'div',
4746
- { className: 'append' },
4747
- _react2.default.createElement(
4748
- 'span',
4749
- null,
4750
- '\u5361\u53F7\uFF1A'
4751
- ),
4752
- _react2.default.createElement(
4753
- 'span',
4754
- null,
4755
- m.member && m.member.cardNo
4756
- ),
4757
- _react2.default.createElement(
4758
- 'span',
4759
- { className: 'fr' },
4760
- (0, _utils.getFixedNumber)(m.value)
4761
- ),
4762
- _react2.default.createElement(
4763
- 'span',
4764
- { className: 'balance fr' },
4765
- '\u652F\u4ED8\u91D1\u989D\uFF1A'
4766
- )
4767
- );
4768
- })
4769
- );
4770
- })
4771
- )
4772
- ),
4773
- _react2.default.createElement(
4774
- 'div',
4775
- { className: 'payfooter2' },
4776
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4777
- _react2.default.createElement(
4778
- 'span',
4779
- null,
4780
- _react2.default.createElement(
4781
- _button2.default,
4782
- { className: 'cancel', onClick: this.handleCancel },
4783
- '\u53D6\u6D88'
4784
- )
4785
- ),
4786
- _react2.default.createElement(
4787
- 'span',
4788
- null,
4789
- _react2.default.createElement(
4790
- _button2.default,
4791
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4792
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4793
- '\u7ED3\u7B97'
4794
- )
4795
- )
4796
- )
4797
- )
4798
- ),
4799
4319
  _react2.default.createElement(
4800
4320
  _modal2.default,
4801
4321
  {
@@ -4808,6 +4328,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4808
4328
  onCancel: this.handleCzkCancel,
4809
4329
  keyboard: false,
4810
4330
  centered: !this.isHorizontalPad ? true : false,
4331
+ zIndex: 1007,
4811
4332
  footer: _react2.default.createElement(
4812
4333
  'div',
4813
4334
  { className: 'action' },
@@ -5085,6 +4606,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5085
4606
  onCancel: this.handleMoreCzkCancel,
5086
4607
  keyboard: false,
5087
4608
  centered: !this.isHorizontalPad ? true : false,
4609
+ zIndex: 1007,
5088
4610
  footer: _react2.default.createElement(
5089
4611
  'div',
5090
4612
  { className: 'action' },
@@ -5126,7 +4648,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5126
4648
  onCancel: this.handleSetPwdCancel,
5127
4649
  keyboard: false,
5128
4650
  centered: !this.isHorizontalPad ? true : false,
5129
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4651
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4652
+ zIndex: 1007
5130
4653
  }, 'footer', _react2.default.createElement(
5131
4654
  'div',
5132
4655
  { className: 'action' },
@@ -5222,6 +4745,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5222
4745
  onCancel: this.handleDjqCancel,
5223
4746
  centered: !this.isHorizontalPad ? true : false,
5224
4747
  title: Differentiate.COUPON + '支付',
4748
+ zIndex: 1007,
5225
4749
  footer: _react2.default.createElement(
5226
4750
  'div',
5227
4751
  { className: 'action' },
@@ -5341,7 +4865,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5341
4865
  _react2.default.createElement(
5342
4866
  'span',
5343
4867
  null,
5344
- q.nominalAmount
4868
+ q.amount
5345
4869
  ),
5346
4870
  _react2.default.createElement(
5347
4871
  'span',
@@ -5544,6 +5068,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5544
5068
  centered: !this.isHorizontalPad ? true : false,
5545
5069
  title: "积分抵现",
5546
5070
  destroyOnClose: true,
5071
+ zIndex: 1007,
5547
5072
  footer: _react2.default.createElement(
5548
5073
  'div',
5549
5074
  { className: 'action' },