tplus-components-touch 3.33.17 → 3.34.4

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 (29) 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 +39 -23
  6. package/dist/components/keyboard/letterKeyboard.js +33 -16
  7. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  8. package/dist/components/keyboard/numKeyboard.js +4 -0
  9. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  10. package/dist/components/keyboard/numkeyboardPassword.js +19 -9
  11. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  12. package/dist/components/keyboard/onlyLetterButton2.less +1 -1
  13. package/dist/components/layout/sider.js +3 -1
  14. package/dist/components/layout/sider.js.map +1 -1
  15. package/dist/components/modalWraper/index.js +1 -1
  16. package/dist/components/modalWraper/index.js.map +1 -1
  17. package/dist/components/settlement/index.js +0 -9
  18. package/dist/components/settlement/index.js.map +1 -1
  19. package/dist/components/settlement/settlement.js +85 -552
  20. package/dist/components/settlement/settlement.js.map +1 -1
  21. package/dist/components/settlement/settlement.less +4 -24
  22. package/dist/components/settlement/settlementCopy.js +5731 -0
  23. package/dist/components/settlement/settlementCopy.js.map +1 -0
  24. package/dist/components/settlement/settlementStore.js +358 -738
  25. package/dist/components/settlement/settlementStore.js.map +1 -1
  26. package/dist/components/touchTable/index.js +11 -1
  27. package/dist/components/touchTable/index.js.map +1 -1
  28. package/dist/components/touchTable/index.less +1 -1
  29. 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');
@@ -160,6 +160,10 @@ var _modalWraper2 = _interopRequireDefault(_modalWraper);
160
160
 
161
161
  var _utils = require('./utils');
162
162
 
163
+ var _settlementStore = require('./settlementStore');
164
+
165
+ var _settlementStore2 = _interopRequireDefault(_settlementStore);
166
+
163
167
  var _keyboard = require('../keyboard');
164
168
 
165
169
  var _keyboard2 = _interopRequireDefault(_keyboard);
@@ -266,7 +270,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
266
270
  _this2.hotkeydebounced = null;
267
271
  _this2.hotkeydebouncedPayMode = "";
268
272
  _this2.currentInput = null;
269
- _this2.store = _mutantsMicrofx.stores.settlementStore;
273
+ _this2.store = new _settlementStore2.default();
270
274
 
271
275
  _this2.resizeSettlementToolBtns = function () {
272
276
  var newStyle = _this2.store.newStyle;
@@ -361,7 +365,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
361
365
  isReturn = _this2$props.isReturn,
362
366
  type = _this2$props.type;
363
367
 
364
- _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) {
365
369
  if (result) {
366
370
  _this2.setState({
367
371
  settleDisabled: false
@@ -1296,7 +1300,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1296
1300
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1297
1301
  PayStyle = _enumController$getEn12.PayStyle;
1298
1302
 
1299
- 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)) {
1300
1306
  _message2.default.info('原单退货时，该结算方式不可以删除。');
1301
1307
  } else {
1302
1308
  _this2.store.delPay(index);
@@ -2045,6 +2051,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2045
2051
  settleDisabled: true
2046
2052
  });
2047
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);
2048
2064
  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
2049
2065
  _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
2050
2066
  isQuickPay = args === 'quickPay';
@@ -3262,6 +3278,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3262
3278
  (0, _createClass3.default)(Settlement, [{
3263
3279
  key: 'componentDidMount',
3264
3280
  value: function componentDidMount() {
3281
+ //let retailDetails=this.context.viewModel.data.RetailDetails;//明细
3282
+ //let totalRetailAmount=this.context.viewModel.data.TotalRetailAmount;//零售金额合计
3265
3283
  this.store.initPaymodes(this.updateInput, this.props.type, this.props.MemberPoints);
3266
3284
  }
3267
3285
  }, {
@@ -3384,16 +3402,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3384
3402
  }, {
3385
3403
  key: 'onKeyboardChange',
3386
3404
  value: function onKeyboardChange(key) {
3387
- var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3388
- PayStyle = _enumController$getEn32.PayStyle;
3389
-
3390
3405
  if (this.currentInput) {
3391
- if (this.store.paymode.currentMode) {
3392
- var paymentType1 = this.store.paymode.currentMode.paymentType;
3393
- if (paymentType1 === PayStyle.djq || paymentType1 === PayStyle.hyczk || paymentType1 === PayStyle.jfdx) {
3394
- return;
3395
- }
3396
- }
3397
3406
  var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
3398
3407
  if (!isNaN(value) || value == '-') {
3399
3408
  this.currentInput.value = value;
@@ -3406,9 +3415,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3406
3415
  value: function renderToolbtn(mode, index) {
3407
3416
  var _this7 = this;
3408
3417
 
3409
- var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3410
- PayIcon = _enumController$getEn33.PayIcon,
3411
- PayStyle = _enumController$getEn33.PayStyle;
3418
+ var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3419
+ PayIcon = _enumController$getEn32.PayIcon,
3420
+ PayStyle = _enumController$getEn32.PayStyle;
3412
3421
 
3413
3422
  var isReturn = this.props.isReturn;
3414
3423
  var _store = this.store,
@@ -3480,11 +3489,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3480
3489
  value: function render() {
3481
3490
  var _this8 = this;
3482
3491
 
3483
- var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3484
- PayIcon = _enumController$getEn34.PayIcon,
3485
- PayIcon2 = _enumController$getEn34.PayIcon2,
3486
- PayStyle = _enumController$getEn34.PayStyle,
3487
- 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;
3488
3497
 
3489
3498
  var _state2 = this.state,
3490
3499
  btnDissabled = _state2.btnDissabled,
@@ -3718,10 +3727,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3718
3727
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3719
3728
  return _react2.default.createElement(
3720
3729
  _button2.default,
3721
- { 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() {
3722
3734
  _this8.btnDebounced(p.paymentType, true);
3723
3735
  },
3724
- 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
+ },
3725
3738
  _react2.default.createElement(
3726
3739
  'div',
3727
3740
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3742,7 +3755,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3742
3755
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3743
3756
  )
3744
3757
  ),
3745
- type != 1 && !newStyle && _react2.default.createElement(
3758
+ !newStyle && _react2.default.createElement(
3746
3759
  _drawer2.default,
3747
3760
  {
3748
3761
  title: '\u590D\u5408\u7ED3\u7B97',
@@ -3753,11 +3766,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3753
3766
  onClose: this.handleCancel,
3754
3767
  visible: this.state.visible,
3755
3768
  destroyOnClose: true,
3756
- className: 'settlement-wraper'
3769
+ className: 'settlement-wraper',
3770
+ style: { 'zIndex': 1006 }
3757
3771
  },
3758
3772
  _react2.default.createElement(
3759
3773
  'div',
3760
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3774
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3761
3775
  _react2.default.createElement(
3762
3776
  'div',
3763
3777
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3772,7 +3786,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3772
3786
  ),
3773
3787
  _react2.default.createElement(
3774
3788
  'div',
3775
- { 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)' } },
3776
3790
  _react2.default.createElement(
3777
3791
  'div',
3778
3792
  { className: 'left' },
@@ -3802,7 +3816,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3802
3816
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
3803
3817
  className: _index.hotKey.hotKeyNotFilter(),
3804
3818
  onClick: function onClick() {
3805
- _this8.editModal(index, mode.paymentType, boriginReturn);
3819
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
3806
3820
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
3807
3821
  className: _index.hotKey.hotKeyNotFilter(),
3808
3822
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -3866,7 +3880,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3866
3880
  (0, _utils.getFixedNumber)(mode.balance)
3867
3881
  ),
3868
3882
  _react2.default.createElement('br', null),
3869
- 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(
3870
3884
  _button2.default,
3871
3885
  { onClick: function onClick() {
3872
3886
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -3959,7 +3973,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3959
3973
  )
3960
3974
  )
3961
3975
  ),
3962
- !isReturn && _react2.default.createElement(
3976
+ type != 1 && !isReturn && _react2.default.createElement(
3963
3977
  'div',
3964
3978
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
3965
3979
  '\u4F18\u60E0\u660E\u7EC6',
@@ -3998,7 +4012,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3998
4012
  )
3999
4013
  )
4000
4014
  ),
4001
- type != 1 && newStyle && _react2.default.createElement(
4015
+ newStyle && _react2.default.createElement(
4002
4016
  _drawer2.default,
4003
4017
  {
4004
4018
  title: '\u590D\u5408\u7ED3\u7B97',
@@ -4009,7 +4023,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4009
4023
  onClose: this.handleCancel,
4010
4024
  visible: this.state.visible,
4011
4025
  destroyOnClose: true,
4012
- className: 'settlement-wraper'
4026
+ className: 'settlement-wraper',
4027
+ style: { 'zIndex': 1006 }
4013
4028
  },
4014
4029
  _react2.default.createElement(
4015
4030
  'div',
@@ -4094,7 +4109,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4094
4109
  )
4095
4110
  )
4096
4111
  ),
4097
- !isReturn && _react2.default.createElement(
4112
+ type != 1 && !isReturn && _react2.default.createElement(
4098
4113
  'div',
4099
4114
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4100
4115
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4116,12 +4131,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4116
4131
  return m.paymentType === PayStyle.smzf;
4117
4132
  });
4118
4133
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4119
- var hotkeyIndex = index;
4134
+ var hotkeyIndex = mindex;
4120
4135
  if (!isReturn && hasSMZF) {
4121
4136
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4122
4137
  return null;
4123
4138
  } else {
4124
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4139
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4125
4140
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4126
4141
  });
4127
4142
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4129,6 +4144,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4129
4144
  });
4130
4145
  }
4131
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
+
4132
4163
  var index = mode.paymethodId;
4133
4164
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4134
4165
  return m.paymentType == PayStyle.hyczk;
@@ -4165,16 +4196,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4165
4196
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4166
4197
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4167
4198
  onClick: function onClick() {
4168
- // let czkinput = document.getElementById('inputS' + index);
4169
- // if (mode.paymentType === PayStyle.hyczk) {
4170
- // const { isProhibitMeStorageCard } = this.props;
4171
- // if (isProhibitMeStorageCard) {
4172
- // Message.warn('储值卡不可键盘录入，请刷卡!');
4173
- // return;
4174
- // }
4175
- // }
4176
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4177
- if (mode.paymentType == PayStyle.hyczk) {
4199
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4178
4200
  if (themodeHyczk && themodeHyczk.length === 0) {
4179
4201
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4180
4202
  }
@@ -4230,10 +4252,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4230
4252
  null,
4231
4253
  '\u5361\u53F7\uFF1A'
4232
4254
  ),
4233
- _react2.default.createElement(
4255
+ type != 1 ? _react2.default.createElement(
4234
4256
  'span',
4235
4257
  null,
4236
4258
  m && m.storageCardNo
4259
+ ) : _react2.default.createElement(
4260
+ 'span',
4261
+ null,
4262
+ m.member && m.member.cardNo
4237
4263
  ),
4238
4264
  _react2.default.createElement(
4239
4265
  'span',
@@ -4246,7 +4272,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4246
4272
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4247
4273
  ),
4248
4274
  _react2.default.createElement('br', null),
4249
- 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(
4250
4276
  _button2.default,
4251
4277
  { onClick: function onClick() {
4252
4278
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4290,504 +4316,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4290
4316
  )
4291
4317
  )
4292
4318
  ),
4293
- type == 1 && !newStyle && _react2.default.createElement(
4294
- _modal2.default,
4295
- {
4296
- wrapClassName: 'settlement-wraper2',
4297
- width: '600px',
4298
- visible: this.state.visible,
4299
- maskClosable: false,
4300
- title: "复合结算",
4301
- footer: null,
4302
- maskStyle: { 'z-index': '1004' },
4303
- onCancel: this.handleCancel,
4304
- destroyOnClose: true
4305
- },
4306
- _react2.default.createElement(
4307
- 'div',
4308
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4309
- _react2.default.createElement(
4310
- 'div',
4311
- { className: 'settlementTop' },
4312
- _react2.default.createElement(
4313
- 'div',
4314
- { className: (0, _classnames4.default)({ "toolbar": true, "toolbar2": type == 1, "carousel": paymodes.length > carouselStart2 }) },
4315
- paymodes.length <= carouselStart2 && _react2.default.createElement(
4316
- 'div',
4317
- null,
4318
- (0, _map3.default)(paymodes, function (mode, index) {
4319
- return _this8.renderToolbtn(mode, index);
4320
- })
4321
- ),
4322
- paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
4323
- ),
4324
- _react2.default.createElement(
4325
- 'div',
4326
- { className: 'rightheader' },
4327
- paymode.onlineamount > 0 && _react2.default.createElement(
4328
- 'div',
4329
- { className: 'receivable' },
4330
- _react2.default.createElement(
4331
- 'span',
4332
- null,
4333
- '\u7EBF\u4E0A\u5DF2\u6536'
4334
- ),
4335
- _react2.default.createElement(
4336
- 'span',
4337
- null,
4338
- paymode.onlineamount
4339
- )
4340
- ),
4341
- _react2.default.createElement(
4342
- 'div',
4343
- { className: 'receivable' },
4344
- _react2.default.createElement(
4345
- 'span',
4346
- null,
4347
- '\u5E94\u6536\u91D1\u989D'
4348
- ),
4349
- _react2.default.createElement(
4350
- 'span',
4351
- null,
4352
- paymode.amount
4353
- )
4354
- ),
4355
- _react2.default.createElement(
4356
- 'div',
4357
- { className: 'receivable' },
4358
- _react2.default.createElement(
4359
- 'span',
4360
- null,
4361
- '\u5269\u4F59\u5E94\u6536'
4362
- ),
4363
- _react2.default.createElement(
4364
- 'span',
4365
- null,
4366
- paymode.receivable
4367
- )
4368
- ),
4369
- _react2.default.createElement(
4370
- 'div',
4371
- { className: 'receivable' },
4372
- _react2.default.createElement(
4373
- 'span',
4374
- null,
4375
- '\u5B9E\u6536\u91D1\u989D'
4376
- ),
4377
- _react2.default.createElement(
4378
- 'span',
4379
- { className: 'received' },
4380
- paymode.received
4381
- )
4382
- ),
4383
- _react2.default.createElement(
4384
- 'div',
4385
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4386
- _react2.default.createElement(
4387
- 'span',
4388
- null,
4389
- '\u627E\u96F6\u91D1\u989D'
4390
- ),
4391
- _react2.default.createElement(
4392
- 'span',
4393
- { className: 'received' },
4394
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4395
- )
4396
- )
4397
- )
4398
- ),
4399
- _react2.default.createElement(
4400
- 'div',
4401
- { className: 'paydetail' },
4402
- _react2.default.createElement(
4403
- 'div',
4404
- { className: 'left' },
4405
- thePaymodes.length == 0 && _react2.default.createElement(
4406
- 'div',
4407
- { className: 'emptydata detailempty2' },
4408
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4409
- ),
4410
-
4411
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4412
- (0, _map3.default)(thePaymodes, function (mode) {
4413
- var index = mode.paymethodId;
4414
- return _react2.default.createElement(
4415
- 'div',
4416
- { key: index + '', className: 'modeItem' },
4417
- _react2.default.createElement(
4418
- 'div',
4419
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4420
- _react2.default.createElement(
4421
- 'div',
4422
- { className: (0, _classnames4.default)({ "name": true }) },
4423
- mode.name
4424
- ),
4425
- _react2.default.createElement(
4426
- 'div',
4427
- { className: (0, _classnames4.default)({ "content": true }) },
4428
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4429
- onClick: function onClick() {
4430
- _this8.editModal(index, mode.paymentType);
4431
- }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4432
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4433
- onBlur: function onBlur(e) {
4434
- return _this8.onBlur(index, e);
4435
- },
4436
- onChange: function onChange(e) {
4437
- return _this8.handleChange(index, e);
4438
- },
4439
- onFocus: function onFocus(e) {
4440
- return _this8.onFocusHack(index, mode, paymode, e);
4441
- }
4442
- })
4443
- ),
4444
- _react2.default.createElement(
4445
- 'div',
4446
- { className: 'minus', onClick: function onClick() {
4447
- _this8.onDelPay(index);
4448
- } },
4449
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4450
- )
4451
- ),
4452
- mode.paymentType == PayStyle.djq ? _react2.default.createElement(
4453
- 'div',
4454
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4455
- _react2.default.createElement(
4456
- 'span',
4457
- { className: 'balance' },
4458
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4459
- ),
4460
- _react2.default.createElement(
4461
- 'span',
4462
- null,
4463
- mode.overchargesAmount
4464
- )
4465
- ) : _react2.default.createElement(
4466
- 'div',
4467
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4468
- _react2.default.createElement(
4469
- 'span',
4470
- { className: 'fl' },
4471
- '\u5361\u53F7\uFF1A'
4472
- ),
4473
- _react2.default.createElement(
4474
- 'span',
4475
- { className: 'fl' },
4476
- mode && mode.storageCardNo
4477
- ),
4478
- _react2.default.createElement('br', null),
4479
- _react2.default.createElement(
4480
- 'span',
4481
- { className: 'balance fl' },
4482
- '\u4F59\u989D\uFF1A'
4483
- ),
4484
- _react2.default.createElement(
4485
- 'span',
4486
- { className: 'fl' },
4487
- (0, _utils.getFixedNumber)(mode.balance)
4488
- )
4489
- )
4490
- );
4491
- })
4492
- ),
4493
- _react2.default.createElement(
4494
- 'div',
4495
- { className: 'right' },
4496
- _react2.default.createElement(
4497
- 'div',
4498
- { className: this.isHorizontalPad ? 'keyboard_ios' : 'keyboard' },
4499
- !this.isHorizontalPad && _react2.default.createElement(_keyboard2.default, { type: 'number', onChange: this.onKeyboardChange.bind(this) })
4500
- )
4501
- )
4502
- ),
4503
- _react2.default.createElement(
4504
- 'div',
4505
- { className: 'payfooter2' },
4506
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4507
- _react2.default.createElement(
4508
- 'span',
4509
- null,
4510
- _react2.default.createElement(
4511
- _button2.default,
4512
- { className: 'cancel', onClick: this.handleCancel },
4513
- '\u53D6\u6D88'
4514
- )
4515
- ),
4516
- _react2.default.createElement(
4517
- 'span',
4518
- null,
4519
- _react2.default.createElement(
4520
- _button2.default,
4521
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4522
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4523
- '\u7ED3\u7B97'
4524
- )
4525
- )
4526
- )
4527
- )
4528
- ),
4529
- type == 1 && newStyle && _react2.default.createElement(
4530
- _modal2.default,
4531
- {
4532
- wrapClassName: 'settlement-wraper2',
4533
- width: '600px',
4534
- visible: this.state.visible,
4535
- maskClosable: false,
4536
- title: "复合结算",
4537
- footer: null,
4538
- backdropStyle: { 'z-index': '1004' },
4539
- onCancel: this.handleCancel,
4540
- destroyOnClose: true
4541
- },
4542
- _react2.default.createElement(
4543
- 'div',
4544
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4545
- _react2.default.createElement(
4546
- 'div',
4547
- { className: 'paydetail newstyle newstyle2' },
4548
- _react2.default.createElement(
4549
- 'div',
4550
- { className: 'top' },
4551
- _react2.default.createElement(
4552
- 'div',
4553
- { className: 'righttop' },
4554
- paymode.onlineamount > 0 && _react2.default.createElement(
4555
- 'div',
4556
- { className: 'receivable' },
4557
- _react2.default.createElement(
4558
- 'span',
4559
- null,
4560
- '\u7EBF\u4E0A\u5DF2\u6536'
4561
- ),
4562
- _react2.default.createElement(
4563
- 'span',
4564
- null,
4565
- paymode.onlineamount
4566
- )
4567
- ),
4568
- _react2.default.createElement(
4569
- 'div',
4570
- { className: 'receivable' },
4571
- _react2.default.createElement(
4572
- 'span',
4573
- null,
4574
- '\u5E94\u6536\u91D1\u989D'
4575
- ),
4576
- _react2.default.createElement(
4577
- 'span',
4578
- null,
4579
- paymode.amount
4580
- )
4581
- ),
4582
- _react2.default.createElement(
4583
- 'div',
4584
- { className: 'receivable' },
4585
- _react2.default.createElement(
4586
- 'span',
4587
- null,
4588
- '\u5269\u4F59\u5E94\u6536'
4589
- ),
4590
- _react2.default.createElement(
4591
- 'span',
4592
- null,
4593
- paymode.receivable
4594
- )
4595
- ),
4596
- _react2.default.createElement(
4597
- 'div',
4598
- { className: 'receivable' },
4599
- _react2.default.createElement(
4600
- 'span',
4601
- null,
4602
- '\u5B9E\u6536\u91D1\u989D'
4603
- ),
4604
- _react2.default.createElement(
4605
- 'span',
4606
- { className: 'received' },
4607
- paymode.received
4608
- )
4609
- ),
4610
- _react2.default.createElement(
4611
- 'div',
4612
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4613
- _react2.default.createElement(
4614
- 'span',
4615
- null,
4616
- '\u627E\u96F6\u91D1\u989D'
4617
- ),
4618
- _react2.default.createElement(
4619
- 'span',
4620
- { className: 'received' },
4621
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4622
- )
4623
- )
4624
- )
4625
- ),
4626
- _react2.default.createElement(
4627
- 'div',
4628
- { className: 'bottom' },
4629
- thePaymodes.length == 0 && _react2.default.createElement(
4630
- 'div',
4631
- { className: 'emptydata detailempty' },
4632
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4633
- ),
4634
-
4635
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4636
- (0, _map3.default)(thePaymodes, function (mode, mindex) {
4637
- var isReturn = _this8.props.isReturn;
4638
-
4639
- var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
4640
- return m.paymentType === PayStyle.smzf;
4641
- });
4642
- var hotkeyIndex = mindex;
4643
- //同时存在微信、支付宝、扫码支付三种方式，在非退货模式下，隐藏微信、支付宝。
4644
- if (!isReturn && hasSMZF) {
4645
- if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4646
- return null;
4647
- } else {
4648
- var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4649
- return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4650
- });
4651
- hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
4652
- return m.paymentType == mode.paymentType;
4653
- });
4654
- }
4655
- }
4656
- var index = mode.paymethodId;
4657
- return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4658
- return m.paymentType == PayStyle.hyczk;
4659
- }) != mindex ? _react2.default.createElement('div', null) : _react2.default.createElement(
4660
- 'div',
4661
- { key: index + '', className: 'modeItem' },
4662
- _react2.default.createElement(
4663
- 'div',
4664
- { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4665
- _react2.default.createElement(
4666
- 'div',
4667
- { className: (0, _classnames4.default)({ "name": true }) },
4668
- _react2.default.createElement(
4669
- 'div',
4670
- { className: 'icon' },
4671
- _react2.default.createElement(_ticon2.default, { type: PayIcon[mode.paymentType] || PayIcon['default'] })
4672
- ),
4673
- _react2.default.createElement(
4674
- 'div',
4675
- { className: 'text' },
4676
- mode.name
4677
- ),
4678
- _react2.default.createElement(
4679
- 'div',
4680
- { className: 'hotkey' },
4681
- _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
4682
- )
4683
- ),
4684
- _react2.default.createElement(
4685
- 'div',
4686
- { className: (0, _classnames4.default)({ "content": true }) },
4687
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
4688
- // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
4689
- , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4690
- // className="paymode"
4691
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4692
- onClick: function onClick() {
4693
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4694
- },
4695
- value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4696
- return tm.paymentType == PayStyle.hyczk;
4697
- }), function (sum, m) {
4698
- return Math.Add(sum, m.value);
4699
- }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4700
- className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4701
- // className="paymode"
4702
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4703
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4704
- onClick: function onClick(e) {
4705
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4706
- },
4707
- onBlur: function onBlur(e) {
4708
- return _this8.onBlur(index, e);
4709
- },
4710
- onFocus: function onFocus(e) {
4711
- return _this8.onFocusHack(index, mode, paymode, e);
4712
- },
4713
- onChange: function onChange(e) {
4714
- return _this8.handleChange(index, e);
4715
- }
4716
- })
4717
- )
4718
- ),
4719
- mode.paymentType == PayStyle.djq && _react2.default.createElement(
4720
- 'div',
4721
- { className: 'append' },
4722
- _react2.default.createElement(
4723
- 'span',
4724
- { className: 'balance' },
4725
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4726
- ),
4727
- _react2.default.createElement(
4728
- 'span',
4729
- null,
4730
- mode.overchargesAmount
4731
- )
4732
- ),
4733
- (0, _map3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4734
- return mode.paymentType == PayStyle.hyczk && parseFloat(tm.value || 0) != 0 && tm.paymentType == PayStyle.hyczk;
4735
- }), function (m) {
4736
- return _react2.default.createElement(
4737
- 'div',
4738
- { className: 'append' },
4739
- _react2.default.createElement(
4740
- 'span',
4741
- null,
4742
- '\u5361\u53F7\uFF1A'
4743
- ),
4744
- _react2.default.createElement(
4745
- 'span',
4746
- null,
4747
- m.member && m.member.cardNo
4748
- ),
4749
- _react2.default.createElement(
4750
- 'span',
4751
- { className: 'fr' },
4752
- (0, _utils.getFixedNumber)(m.value)
4753
- ),
4754
- _react2.default.createElement(
4755
- 'span',
4756
- { className: 'balance fr' },
4757
- '\u652F\u4ED8\u91D1\u989D\uFF1A'
4758
- )
4759
- );
4760
- })
4761
- );
4762
- })
4763
- )
4764
- ),
4765
- _react2.default.createElement(
4766
- 'div',
4767
- { className: 'payfooter2' },
4768
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4769
- _react2.default.createElement(
4770
- 'span',
4771
- null,
4772
- _react2.default.createElement(
4773
- _button2.default,
4774
- { className: 'cancel', onClick: this.handleCancel },
4775
- '\u53D6\u6D88'
4776
- )
4777
- ),
4778
- _react2.default.createElement(
4779
- 'span',
4780
- null,
4781
- _react2.default.createElement(
4782
- _button2.default,
4783
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4784
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4785
- '\u7ED3\u7B97'
4786
- )
4787
- )
4788
- )
4789
- )
4790
- ),
4791
4319
  _react2.default.createElement(
4792
4320
  _modal2.default,
4793
4321
  {
@@ -4800,6 +4328,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4800
4328
  onCancel: this.handleCzkCancel,
4801
4329
  keyboard: false,
4802
4330
  centered: !this.isHorizontalPad ? true : false,
4331
+ zIndex: 1007,
4803
4332
  footer: _react2.default.createElement(
4804
4333
  'div',
4805
4334
  { className: 'action' },
@@ -5077,6 +4606,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5077
4606
  onCancel: this.handleMoreCzkCancel,
5078
4607
  keyboard: false,
5079
4608
  centered: !this.isHorizontalPad ? true : false,
4609
+ zIndex: 1007,
5080
4610
  footer: _react2.default.createElement(
5081
4611
  'div',
5082
4612
  { className: 'action' },
@@ -5118,7 +4648,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5118
4648
  onCancel: this.handleSetPwdCancel,
5119
4649
  keyboard: false,
5120
4650
  centered: !this.isHorizontalPad ? true : false,
5121
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4651
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4652
+ zIndex: 1007
5122
4653
  }, 'footer', _react2.default.createElement(
5123
4654
  'div',
5124
4655
  { className: 'action' },
@@ -5214,6 +4745,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5214
4745
  onCancel: this.handleDjqCancel,
5215
4746
  centered: !this.isHorizontalPad ? true : false,
5216
4747
  title: Differentiate.COUPON + '支付',
4748
+ zIndex: 1007,
5217
4749
  footer: _react2.default.createElement(
5218
4750
  'div',
5219
4751
  { className: 'action' },
@@ -5333,7 +4865,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5333
4865
  _react2.default.createElement(
5334
4866
  'span',
5335
4867
  null,
5336
- q.nominalAmount
4868
+ q.amount
5337
4869
  ),
5338
4870
  _react2.default.createElement(
5339
4871
  'span',
@@ -5536,6 +5068,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5536
5068
  centered: !this.isHorizontalPad ? true : false,
5537
5069
  title: "积分抵现",
5538
5070
  destroyOnClose: true,
5071
+ zIndex: 1007,
5539
5072
  footer: _react2.default.createElement(
5540
5073
  'div',
5541
5074
  { className: 'action' },