tplus-components-touch 3.37.2 → 3.38.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 (39) 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 +12 -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/scanInput.less +4 -1
  12. package/dist/components/keyboard/index.less +39 -23
  13. package/dist/components/keyboard/letterKeyboard.js +33 -16
  14. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  15. package/dist/components/keyboard/numKeyboard.js +13 -8
  16. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  17. package/dist/components/keyboard/numKeyboardScan.js +32 -24
  18. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  19. package/dist/components/keyboard/numkeyboardPassword.js +19 -9
  20. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  21. package/dist/components/keyboard/onlyLetterButton2.less +1 -1
  22. package/dist/components/layout/sider.js +3 -1
  23. package/dist/components/layout/sider.js.map +1 -1
  24. package/dist/components/modalWraper/index.js +11 -4
  25. package/dist/components/modalWraper/index.js.map +1 -1
  26. package/dist/components/settlement/index.js +1 -1
  27. package/dist/components/settlement/index.js.map +1 -1
  28. package/dist/components/settlement/prototypeTable/index.js +3 -1
  29. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  30. package/dist/components/settlement/settlement.js +72 -542
  31. package/dist/components/settlement/settlement.js.map +1 -1
  32. package/dist/components/settlement/settlement.less +9 -4
  33. package/dist/components/settlement/settlementStore.js +1 -24
  34. package/dist/components/settlement/settlementStore.js.map +1 -1
  35. package/dist/components/ticon/iconfont/demo.css +539 -539
  36. package/dist/components/touchTable/index.js +11 -1
  37. package/dist/components/touchTable/index.js.map +1 -1
  38. package/dist/components/touchTable/index.less +1 -1
  39. package/package.json +2 -2
@@ -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');
@@ -217,7 +217,6 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
217
217
  var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
218
218
  (0, _inherits3.default)(Settlement, _React$Component);
219
219
 
220
- // 复核结算方式快捷键列表
221
220
  function Settlement(props) {
222
221
  var _this3 = this;
223
222
 
@@ -259,14 +258,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
259
258
  storageValue: '0.00',
260
259
  czkValue: null,
261
260
  isInputMember: false,
262
- selectedRowIndex: 0 };
261
+ selectedRowIndex: 0
262
+ // 复核结算方式快捷键列表
263
+ };
263
264
  _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
264
265
  return key.toLocaleUpperCase();
265
266
  });
266
267
  _this2.hotkeydebounced = null;
267
268
  _this2.hotkeydebouncedPayMode = "";
268
269
  _this2.currentInput = null;
269
- _this2.store = _mutantsMicrofx.stores.settlementStore;
270
270
 
271
271
  _this2.resizeSettlementToolBtns = function () {
272
272
  var newStyle = _this2.store.newStyle;
@@ -1051,7 +1051,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1051
1051
  setTimeout(function () {
1052
1052
  _this2.inputJfdxAmount.input.focus();
1053
1053
  _this2.inputJfdxAmount.input.setSelectionRange(0, _this2.inputJfdxAmount.input.value.length);
1054
- }, 300);
1054
+ }, 200);
1055
1055
  };
1056
1056
 
1057
1057
  _this2.handleJfdxOk = function (e) {
@@ -1296,7 +1296,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1296
1296
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1297
1297
  PayStyle = _enumController$getEn12.PayStyle;
1298
1298
 
1299
- if (boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1299
+ var storeType = _this2.props.type;
1300
+
1301
+ if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1300
1302
  _message2.default.info('原单退货时,该结算方式不可以删除。');
1301
1303
  } else {
1302
1304
  _this2.store.delPay(index);
@@ -1349,6 +1351,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1349
1351
  }
1350
1352
  }
1351
1353
  }
1354
+ // let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
1352
1355
  _this2.store.paymode.setCurrentModeValue(val, max);
1353
1356
  };
1354
1357
 
@@ -2899,6 +2902,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2899
2902
  id: 'paymentAmount',
2900
2903
  className: 'content',
2901
2904
  type: 'text',
2905
+ bordered: true,
2902
2906
  placeholder: '\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D',
2903
2907
  disabled: paymode.value < 0,
2904
2908
  defaultValue: that.getXianjinPayment(paymode.paymentType, paymode.value),
@@ -2970,6 +2974,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2970
2974
  _react2.default.createElement(_numKeyboardScan2.default, {
2971
2975
  className: 'content ',
2972
2976
  type: 'text',
2977
+ bordered: true,
2973
2978
  placeholder: '\u626B\u63CF\u6216\u8F93\u5165\u4ED8\u6B3E\u7801',
2974
2979
  ref: function ref(input) {
2975
2980
  return that['inputS' + paymode.paymethodId] = input;
@@ -3255,6 +3260,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3255
3260
  _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
3256
3261
  _this2.setTimer = null;
3257
3262
  _this2.keypressStime = null;
3263
+ _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
3258
3264
  return _this2;
3259
3265
  }
3260
3266
 
@@ -3717,10 +3723,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3717
3723
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3718
3724
  return _react2.default.createElement(
3719
3725
  _button2.default,
3720
- { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
3726
+ {
3727
+ className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }),
3728
+ key: 'paymentType_' + p.paymentType,
3729
+ onClick: function onClick() {
3721
3730
  _this8.btnDebounced(p.paymentType, true);
3722
3731
  },
3723
- disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
3732
+ disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
3733
+ },
3724
3734
  _react2.default.createElement(
3725
3735
  'div',
3726
3736
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3741,22 +3751,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3741
3751
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3742
3752
  )
3743
3753
  ),
3744
- type != 1 && !newStyle && _react2.default.createElement(
3754
+ !newStyle && _react2.default.createElement(
3745
3755
  _drawer2.default,
3746
3756
  {
3747
3757
  title: '\u590D\u5408\u7ED3\u7B97',
3748
3758
  width: '600px',
3749
3759
  placement: 'right',
3750
- maskClosable: false,
3760
+ maskClosable: true,
3751
3761
  closable: false,
3752
3762
  onClose: this.handleCancel,
3753
3763
  visible: this.state.visible,
3754
3764
  destroyOnClose: true,
3755
- className: 'settlement-wraper'
3765
+ className: 'settlement-wraper',
3766
+ style: { 'zIndex': 1006 }
3756
3767
  },
3757
3768
  _react2.default.createElement(
3758
3769
  'div',
3759
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3770
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3760
3771
  _react2.default.createElement(
3761
3772
  'div',
3762
3773
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3771,7 +3782,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3771
3782
  ),
3772
3783
  _react2.default.createElement(
3773
3784
  'div',
3774
- { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px' } },
3785
+ { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px', height: 'calc(100% - 198px)' } },
3775
3786
  _react2.default.createElement(
3776
3787
  'div',
3777
3788
  { className: 'left' },
@@ -3801,7 +3812,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3801
3812
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
3802
3813
  className: _index.hotKey.hotKeyNotFilter(),
3803
3814
  onClick: function onClick() {
3804
- _this8.editModal(index, mode.paymentType, boriginReturn);
3815
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
3805
3816
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
3806
3817
  className: _index.hotKey.hotKeyNotFilter(),
3807
3818
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -3865,7 +3876,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3865
3876
  (0, _utils.getFixedNumber)(mode.balance)
3866
3877
  ),
3867
3878
  _react2.default.createElement('br', null),
3868
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3879
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3869
3880
  _button2.default,
3870
3881
  { onClick: function onClick() {
3871
3882
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -3958,7 +3969,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3958
3969
  )
3959
3970
  )
3960
3971
  ),
3961
- !isReturn && _react2.default.createElement(
3972
+ type != 1 && !isReturn && _react2.default.createElement(
3962
3973
  'div',
3963
3974
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
3964
3975
  '\u4F18\u60E0\u660E\u7EC6',
@@ -3997,18 +4008,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3997
4008
  )
3998
4009
  )
3999
4010
  ),
4000
- type != 1 && newStyle && _react2.default.createElement(
4011
+ newStyle && _react2.default.createElement(
4001
4012
  _drawer2.default,
4002
4013
  {
4003
4014
  title: '\u590D\u5408\u7ED3\u7B97',
4004
4015
  width: '600px',
4005
4016
  placement: 'right',
4006
- maskClosable: false,
4017
+ maskClosable: true,
4007
4018
  closable: false,
4008
4019
  onClose: this.handleCancel,
4009
4020
  visible: this.state.visible,
4010
4021
  destroyOnClose: true,
4011
- className: 'settlement-wraper'
4022
+ className: 'settlement-wraper',
4023
+ style: { 'zIndex': 1006 }
4012
4024
  },
4013
4025
  _react2.default.createElement(
4014
4026
  'div',
@@ -4093,7 +4105,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4093
4105
  )
4094
4106
  )
4095
4107
  ),
4096
- !isReturn && _react2.default.createElement(
4108
+ type != 1 && !isReturn && _react2.default.createElement(
4097
4109
  'div',
4098
4110
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4099
4111
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4115,12 +4127,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4115
4127
  return m.paymentType === PayStyle.smzf;
4116
4128
  });
4117
4129
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式,在非退货模式下,隐藏微信、支付宝。
4118
- var hotkeyIndex = index;
4130
+ var hotkeyIndex = mindex;
4119
4131
  if (!isReturn && hasSMZF) {
4120
4132
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4121
4133
  return null;
4122
4134
  } else {
4123
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4135
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4124
4136
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4125
4137
  });
4126
4138
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4128,6 +4140,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4128
4140
  });
4129
4141
  }
4130
4142
  }
4143
+ var hyczkFindIndex = (0, _findIndex3.default)(thePaymodes, function (m) {
4144
+ return m.paymentType == PayStyle.hyczk;
4145
+ });
4146
+ var hyczkList = (0, _filter3.default)(thePaymodes, function (m) {
4147
+ return m.paymentType == PayStyle.hyczk;
4148
+ });
4149
+ var lastStorageCardIndex = 0;
4150
+ (0, _map3.default)(thePaymodes, function (m, i) {
4151
+ if (m.paymentType === PayStyle.hyczk) lastStorageCardIndex = i;
4152
+ });
4153
+ if (mindex > 0 && hyczkList.length > 1 && mindex > lastStorageCardIndex) {
4154
+ hotkeyIndex = hotkeyIndex - hyczkList.length + 1;
4155
+ }
4156
+
4157
+ console.log(thePaymodes);
4158
+
4131
4159
  var index = mode.paymethodId;
4132
4160
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4133
4161
  return m.paymentType == PayStyle.hyczk;
@@ -4164,16 +4192,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4164
4192
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4165
4193
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4166
4194
  onClick: function onClick() {
4167
- // let czkinput = document.getElementById('inputS' + index);
4168
- // if (mode.paymentType === PayStyle.hyczk) {
4169
- // const { isProhibitMeStorageCard } = this.props;
4170
- // if (isProhibitMeStorageCard) {
4171
- // Message.warn('储值卡不可键盘录入,请刷卡!');
4172
- // return;
4173
- // }
4174
- // }
4175
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4176
- if (mode.paymentType == PayStyle.hyczk) {
4195
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4177
4196
  if (themodeHyczk && themodeHyczk.length === 0) {
4178
4197
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4179
4198
  }
@@ -4229,10 +4248,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4229
4248
  null,
4230
4249
  '\u5361\u53F7\uFF1A'
4231
4250
  ),
4232
- _react2.default.createElement(
4251
+ type != 1 ? _react2.default.createElement(
4233
4252
  'span',
4234
4253
  null,
4235
4254
  m && m.storageCardNo
4255
+ ) : _react2.default.createElement(
4256
+ 'span',
4257
+ null,
4258
+ m.member && m.member.cardNo
4236
4259
  ),
4237
4260
  _react2.default.createElement(
4238
4261
  'span',
@@ -4245,7 +4268,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4245
4268
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4246
4269
  ),
4247
4270
  _react2.default.createElement('br', null),
4248
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4271
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4249
4272
  _button2.default,
4250
4273
  { onClick: function onClick() {
4251
4274
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4289,504 +4312,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4289
4312
  )
4290
4313
  )
4291
4314
  ),
4292
- type == 1 && !newStyle && _react2.default.createElement(
4293
- _modal2.default,
4294
- {
4295
- wrapClassName: 'settlement-wraper2',
4296
- width: '600px',
4297
- visible: this.state.visible,
4298
- maskClosable: false,
4299
- title: "复合结算",
4300
- footer: null,
4301
- maskStyle: { 'z-index': '1004' },
4302
- onCancel: this.handleCancel,
4303
- destroyOnClose: true
4304
- },
4305
- _react2.default.createElement(
4306
- 'div',
4307
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4308
- _react2.default.createElement(
4309
- 'div',
4310
- { className: 'settlementTop' },
4311
- _react2.default.createElement(
4312
- 'div',
4313
- { className: (0, _classnames4.default)({ "toolbar": true, "toolbar2": type == 1, "carousel": paymodes.length > carouselStart2 }) },
4314
- paymodes.length <= carouselStart2 && _react2.default.createElement(
4315
- 'div',
4316
- null,
4317
- (0, _map3.default)(paymodes, function (mode, index) {
4318
- return _this8.renderToolbtn(mode, index);
4319
- })
4320
- ),
4321
- paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
4322
- ),
4323
- _react2.default.createElement(
4324
- 'div',
4325
- { className: 'rightheader' },
4326
- paymode.onlineamount > 0 && _react2.default.createElement(
4327
- 'div',
4328
- { className: 'receivable' },
4329
- _react2.default.createElement(
4330
- 'span',
4331
- null,
4332
- '\u7EBF\u4E0A\u5DF2\u6536'
4333
- ),
4334
- _react2.default.createElement(
4335
- 'span',
4336
- null,
4337
- paymode.onlineamount
4338
- )
4339
- ),
4340
- _react2.default.createElement(
4341
- 'div',
4342
- { className: 'receivable' },
4343
- _react2.default.createElement(
4344
- 'span',
4345
- null,
4346
- '\u5E94\u6536\u91D1\u989D'
4347
- ),
4348
- _react2.default.createElement(
4349
- 'span',
4350
- null,
4351
- paymode.amount
4352
- )
4353
- ),
4354
- _react2.default.createElement(
4355
- 'div',
4356
- { className: 'receivable' },
4357
- _react2.default.createElement(
4358
- 'span',
4359
- null,
4360
- '\u5269\u4F59\u5E94\u6536'
4361
- ),
4362
- _react2.default.createElement(
4363
- 'span',
4364
- null,
4365
- paymode.receivable
4366
- )
4367
- ),
4368
- _react2.default.createElement(
4369
- 'div',
4370
- { className: 'receivable' },
4371
- _react2.default.createElement(
4372
- 'span',
4373
- null,
4374
- '\u5B9E\u6536\u91D1\u989D'
4375
- ),
4376
- _react2.default.createElement(
4377
- 'span',
4378
- { className: 'received' },
4379
- paymode.received
4380
- )
4381
- ),
4382
- _react2.default.createElement(
4383
- 'div',
4384
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4385
- _react2.default.createElement(
4386
- 'span',
4387
- null,
4388
- '\u627E\u96F6\u91D1\u989D'
4389
- ),
4390
- _react2.default.createElement(
4391
- 'span',
4392
- { className: 'received' },
4393
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4394
- )
4395
- )
4396
- )
4397
- ),
4398
- _react2.default.createElement(
4399
- 'div',
4400
- { className: 'paydetail' },
4401
- _react2.default.createElement(
4402
- 'div',
4403
- { className: 'left' },
4404
- thePaymodes.length == 0 && _react2.default.createElement(
4405
- 'div',
4406
- { className: 'emptydata detailempty2' },
4407
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4408
- ),
4409
-
4410
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4411
- (0, _map3.default)(thePaymodes, function (mode) {
4412
- var index = mode.paymethodId;
4413
- return _react2.default.createElement(
4414
- 'div',
4415
- { key: index + '', className: 'modeItem' },
4416
- _react2.default.createElement(
4417
- 'div',
4418
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4419
- _react2.default.createElement(
4420
- 'div',
4421
- { className: (0, _classnames4.default)({ "name": true }) },
4422
- mode.name
4423
- ),
4424
- _react2.default.createElement(
4425
- 'div',
4426
- { className: (0, _classnames4.default)({ "content": true }) },
4427
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4428
- onClick: function onClick() {
4429
- _this8.editModal(index, mode.paymentType);
4430
- }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4431
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4432
- onBlur: function onBlur(e) {
4433
- return _this8.onBlur(index, e);
4434
- },
4435
- onChange: function onChange(e) {
4436
- return _this8.handleChange(index, e);
4437
- },
4438
- onFocus: function onFocus(e) {
4439
- return _this8.onFocusHack(index, mode, paymode, e);
4440
- }
4441
- })
4442
- ),
4443
- _react2.default.createElement(
4444
- 'div',
4445
- { className: 'minus', onClick: function onClick() {
4446
- _this8.onDelPay(index);
4447
- } },
4448
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4449
- )
4450
- ),
4451
- mode.paymentType == PayStyle.djq ? _react2.default.createElement(
4452
- 'div',
4453
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4454
- _react2.default.createElement(
4455
- 'span',
4456
- { className: 'balance' },
4457
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4458
- ),
4459
- _react2.default.createElement(
4460
- 'span',
4461
- null,
4462
- mode.overchargesAmount
4463
- )
4464
- ) : _react2.default.createElement(
4465
- 'div',
4466
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4467
- _react2.default.createElement(
4468
- 'span',
4469
- { className: 'fl' },
4470
- '\u5361\u53F7\uFF1A'
4471
- ),
4472
- _react2.default.createElement(
4473
- 'span',
4474
- { className: 'fl' },
4475
- mode && mode.storageCardNo
4476
- ),
4477
- _react2.default.createElement('br', null),
4478
- _react2.default.createElement(
4479
- 'span',
4480
- { className: 'balance fl' },
4481
- '\u4F59\u989D\uFF1A'
4482
- ),
4483
- _react2.default.createElement(
4484
- 'span',
4485
- { className: 'fl' },
4486
- (0, _utils.getFixedNumber)(mode.balance)
4487
- )
4488
- )
4489
- );
4490
- })
4491
- ),
4492
- _react2.default.createElement(
4493
- 'div',
4494
- { className: 'right' },
4495
- _react2.default.createElement(
4496
- 'div',
4497
- { className: this.isHorizontalPad ? 'keyboard_ios' : 'keyboard' },
4498
- !this.isHorizontalPad && _react2.default.createElement(_keyboard2.default, { type: 'number', onChange: this.onKeyboardChange.bind(this) })
4499
- )
4500
- )
4501
- ),
4502
- _react2.default.createElement(
4503
- 'div',
4504
- { className: 'payfooter2' },
4505
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4506
- _react2.default.createElement(
4507
- 'span',
4508
- null,
4509
- _react2.default.createElement(
4510
- _button2.default,
4511
- { className: 'cancel', onClick: this.handleCancel },
4512
- '\u53D6\u6D88'
4513
- )
4514
- ),
4515
- _react2.default.createElement(
4516
- 'span',
4517
- null,
4518
- _react2.default.createElement(
4519
- _button2.default,
4520
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4521
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4522
- '\u7ED3\u7B97'
4523
- )
4524
- )
4525
- )
4526
- )
4527
- ),
4528
- type == 1 && newStyle && _react2.default.createElement(
4529
- _modal2.default,
4530
- {
4531
- wrapClassName: 'settlement-wraper2',
4532
- width: '600px',
4533
- visible: this.state.visible,
4534
- maskClosable: false,
4535
- title: "复合结算",
4536
- footer: null,
4537
- backdropStyle: { 'z-index': '1004' },
4538
- onCancel: this.handleCancel,
4539
- destroyOnClose: true
4540
- },
4541
- _react2.default.createElement(
4542
- 'div',
4543
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4544
- _react2.default.createElement(
4545
- 'div',
4546
- { className: 'paydetail newstyle newstyle2' },
4547
- _react2.default.createElement(
4548
- 'div',
4549
- { className: 'top' },
4550
- _react2.default.createElement(
4551
- 'div',
4552
- { className: 'righttop' },
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: 'bottom' },
4628
- thePaymodes.length == 0 && _react2.default.createElement(
4629
- 'div',
4630
- { className: 'emptydata detailempty' },
4631
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4632
- ),
4633
-
4634
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4635
- (0, _map3.default)(thePaymodes, function (mode, mindex) {
4636
- var isReturn = _this8.props.isReturn;
4637
-
4638
- var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
4639
- return m.paymentType === PayStyle.smzf;
4640
- });
4641
- var hotkeyIndex = mindex;
4642
- //同时存在微信、支付宝、扫码支付三种方式,在非退货模式下,隐藏微信、支付宝。
4643
- if (!isReturn && hasSMZF) {
4644
- if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4645
- return null;
4646
- } else {
4647
- var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4648
- return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4649
- });
4650
- hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
4651
- return m.paymentType == mode.paymentType;
4652
- });
4653
- }
4654
- }
4655
- var index = mode.paymethodId;
4656
- return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4657
- return m.paymentType == PayStyle.hyczk;
4658
- }) != mindex ? _react2.default.createElement('div', null) : _react2.default.createElement(
4659
- 'div',
4660
- { key: index + '', className: 'modeItem' },
4661
- _react2.default.createElement(
4662
- 'div',
4663
- { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4664
- _react2.default.createElement(
4665
- 'div',
4666
- { className: (0, _classnames4.default)({ "name": true }) },
4667
- _react2.default.createElement(
4668
- 'div',
4669
- { className: 'icon' },
4670
- _react2.default.createElement(_ticon2.default, { type: PayIcon[mode.paymentType] || PayIcon['default'] })
4671
- ),
4672
- _react2.default.createElement(
4673
- 'div',
4674
- { className: 'text' },
4675
- mode.name
4676
- ),
4677
- _react2.default.createElement(
4678
- 'div',
4679
- { className: 'hotkey' },
4680
- _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
4681
- )
4682
- ),
4683
- _react2.default.createElement(
4684
- 'div',
4685
- { className: (0, _classnames4.default)({ "content": true }) },
4686
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
4687
- // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
4688
- , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4689
- // className="paymode"
4690
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4691
- onClick: function onClick() {
4692
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4693
- },
4694
- value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4695
- return tm.paymentType == PayStyle.hyczk;
4696
- }), function (sum, m) {
4697
- return Math.Add(sum, m.value);
4698
- }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4699
- className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4700
- // className="paymode"
4701
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4702
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4703
- onClick: function onClick(e) {
4704
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4705
- },
4706
- onBlur: function onBlur(e) {
4707
- return _this8.onBlur(index, e);
4708
- },
4709
- onFocus: function onFocus(e) {
4710
- return _this8.onFocusHack(index, mode, paymode, e);
4711
- },
4712
- onChange: function onChange(e) {
4713
- return _this8.handleChange(index, e);
4714
- }
4715
- })
4716
- )
4717
- ),
4718
- mode.paymentType == PayStyle.djq && _react2.default.createElement(
4719
- 'div',
4720
- { className: 'append' },
4721
- _react2.default.createElement(
4722
- 'span',
4723
- { className: 'balance' },
4724
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4725
- ),
4726
- _react2.default.createElement(
4727
- 'span',
4728
- null,
4729
- mode.overchargesAmount
4730
- )
4731
- ),
4732
- (0, _map3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4733
- return mode.paymentType == PayStyle.hyczk && parseFloat(tm.value || 0) != 0 && tm.paymentType == PayStyle.hyczk;
4734
- }), function (m) {
4735
- return _react2.default.createElement(
4736
- 'div',
4737
- { className: 'append' },
4738
- _react2.default.createElement(
4739
- 'span',
4740
- null,
4741
- '\u5361\u53F7\uFF1A'
4742
- ),
4743
- _react2.default.createElement(
4744
- 'span',
4745
- null,
4746
- m.member && m.member.cardNo
4747
- ),
4748
- _react2.default.createElement(
4749
- 'span',
4750
- { className: 'fr' },
4751
- (0, _utils.getFixedNumber)(m.value)
4752
- ),
4753
- _react2.default.createElement(
4754
- 'span',
4755
- { className: 'balance fr' },
4756
- '\u652F\u4ED8\u91D1\u989D\uFF1A'
4757
- )
4758
- );
4759
- })
4760
- );
4761
- })
4762
- )
4763
- ),
4764
- _react2.default.createElement(
4765
- 'div',
4766
- { className: 'payfooter2' },
4767
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4768
- _react2.default.createElement(
4769
- 'span',
4770
- null,
4771
- _react2.default.createElement(
4772
- _button2.default,
4773
- { className: 'cancel', onClick: this.handleCancel },
4774
- '\u53D6\u6D88'
4775
- )
4776
- ),
4777
- _react2.default.createElement(
4778
- 'span',
4779
- null,
4780
- _react2.default.createElement(
4781
- _button2.default,
4782
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4783
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4784
- '\u7ED3\u7B97'
4785
- )
4786
- )
4787
- )
4788
- )
4789
- ),
4790
4315
  _react2.default.createElement(
4791
4316
  _modal2.default,
4792
4317
  {
@@ -4799,6 +4324,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4799
4324
  onCancel: this.handleCzkCancel,
4800
4325
  keyboard: false,
4801
4326
  centered: !this.isHorizontalPad ? true : false,
4327
+ zIndex: 1007,
4802
4328
  footer: _react2.default.createElement(
4803
4329
  'div',
4804
4330
  { className: 'action' },
@@ -5076,6 +4602,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5076
4602
  onCancel: this.handleMoreCzkCancel,
5077
4603
  keyboard: false,
5078
4604
  centered: !this.isHorizontalPad ? true : false,
4605
+ zIndex: 1007,
5079
4606
  footer: _react2.default.createElement(
5080
4607
  'div',
5081
4608
  { className: 'action' },
@@ -5117,7 +4644,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5117
4644
  onCancel: this.handleSetPwdCancel,
5118
4645
  keyboard: false,
5119
4646
  centered: !this.isHorizontalPad ? true : false,
5120
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4647
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4648
+ zIndex: 1007
5121
4649
  }, 'footer', _react2.default.createElement(
5122
4650
  'div',
5123
4651
  { className: 'action' },
@@ -5213,6 +4741,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5213
4741
  onCancel: this.handleDjqCancel,
5214
4742
  centered: !this.isHorizontalPad ? true : false,
5215
4743
  title: Differentiate.COUPON + '支付',
4744
+ zIndex: 1007,
5216
4745
  footer: _react2.default.createElement(
5217
4746
  'div',
5218
4747
  { className: 'action' },
@@ -5535,6 +5064,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5535
5064
  centered: !this.isHorizontalPad ? true : false,
5536
5065
  title: "积分抵现",
5537
5066
  destroyOnClose: true,
5067
+ zIndex: 1007,
5538
5068
  footer: _react2.default.createElement(
5539
5069
  'div',
5540
5070
  { className: 'action' },
@@ -5604,12 +5134,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5604
5134
  _react2.default.createElement(
5605
5135
  'div',
5606
5136
  { className: 'value' },
5607
- currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.steadCashIntegral)
5137
+ currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
5608
5138
  ),
5609
5139
  _react2.default.createElement(
5610
5140
  'div',
5611
5141
  { className: 'name' },
5612
- '\u672C\u5355\u4F7F\u7528\u79EF\u5206'
5142
+ '\u53EF\u62B5\u73B0\u91D1\u989D'
5613
5143
  )
5614
5144
  ),
5615
5145
  _react2.default.createElement(
@@ -5630,7 +5160,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5630
5160
  _react2.default.createElement(
5631
5161
  'div',
5632
5162
  { className: 'name' },
5633
- '\u672C\u5355\u53EF\u62B5\u73B0\u91D1\u989D'
5163
+ '\u672C\u5355\u53EF\u7528'
5634
5164
  )
5635
5165
  )
5636
5166
  ),
@@ -5707,7 +5237,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5707
5237
  ),
5708
5238
  _react2.default.createElement(_index3.default, { discount: {
5709
5239
  discountTotalAmount: discountTotalAmount, discountRetailTotalAount: discountRetailTotalAount, discountPrototypeTotalAmount: discountPrototypeTotalAmount
5710
- }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible })
5240
+ }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible, isSetInventoryFocus: false })
5711
5241
  );
5712
5242
  }
5713
5243
  }]);