tplus-components-touch 3.38.2 → 3.38.5

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 (192) hide show
  1. package/README.md +16 -16
  2. package/dist/components/acCitySelect/CitySelect.js +18 -18
  3. package/dist/components/acCitySelect/CitySelect.js.map +1 -1
  4. package/dist/components/acCitySelect/CitySelect.less +9 -9
  5. package/dist/components/acCitySelect/citys.js.map +1 -1
  6. package/dist/components/acCitySelect/index.js.map +1 -1
  7. package/dist/components/acCitySelect/provinceData.js +7 -7
  8. package/dist/components/acCitySelect/provinceData.js.map +1 -1
  9. package/dist/components/addLog/AddLogProcessor.js +6 -6
  10. package/dist/components/addLog/AddLogProcessor.js.map +1 -1
  11. package/dist/components/addLog/OperationLogApi.js +3 -3
  12. package/dist/components/addLog/OperationLogApi.js.map +1 -1
  13. package/dist/components/autoComplete/index.js +14 -14
  14. package/dist/components/autoComplete/index.js.map +1 -1
  15. package/dist/components/autoComplete/index.less +89 -89
  16. package/dist/components/autoComplete/option.js.map +1 -1
  17. package/dist/components/autoCompleteWithKeyboard/index.js +45 -23
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +18 -7
  20. package/dist/components/billSearch/api.js +29 -29
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +19 -6
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +384 -376
  25. package/dist/components/cloudPrint/BTPrintFormatUtil.js +17 -17
  26. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  27. package/dist/components/cloudPrint/api.js.map +1 -1
  28. package/dist/components/cloudPrint/index.js.map +1 -1
  29. package/dist/components/cloudPrint/printDispatch.js +7 -7
  30. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  31. package/dist/components/commonForm/addressPicker/index.js +7 -7
  32. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  33. package/dist/components/commonForm/addressPicker/style.less +10 -10
  34. package/dist/components/commonForm/autoComplete/index.js +35 -16
  35. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  36. package/dist/components/commonForm/autoComplete/style.less +2 -2
  37. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  38. package/dist/components/commonForm/datePicker/style.less +4 -4
  39. package/dist/components/commonForm/formControl/index.js.map +1 -1
  40. package/dist/components/commonForm/index.js +4 -4
  41. package/dist/components/commonForm/index.js.map +1 -1
  42. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  43. package/dist/components/commonForm/inputNumber/style.less +10 -10
  44. package/dist/components/commonForm/radio/index.js.map +1 -1
  45. package/dist/components/commonForm/style.less +1 -1
  46. package/dist/components/deliverySearch/api.js +21 -21
  47. package/dist/components/deliverySearch/api.js.map +1 -1
  48. package/dist/components/deliverySearch/index.js +6 -6
  49. package/dist/components/deliverySearch/index.js.map +1 -1
  50. package/dist/components/deliverySearch/index.less +553 -553
  51. package/dist/components/form/index.js.map +1 -1
  52. package/dist/components/hardwareAPI/index.js.map +1 -1
  53. package/dist/components/hotKey/config.js +23 -23
  54. package/dist/components/hotKey/config.js.map +1 -1
  55. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  56. package/dist/components/hotKey/index.js +26 -26
  57. package/dist/components/hotKey/index.js.map +1 -1
  58. package/dist/components/hotKey/localConfig.js.map +1 -1
  59. package/dist/components/hotKey/style.less +96 -96
  60. package/dist/components/hotKey/utils.js.map +1 -1
  61. package/dist/components/input/index.js +6 -6
  62. package/dist/components/input/index.js.map +1 -1
  63. package/dist/components/input/scanInput.js.map +1 -1
  64. package/dist/components/input/scanInput.less +30 -27
  65. package/dist/components/input/style.less +99 -99
  66. package/dist/components/input/tplusInput/index.js +30 -30
  67. package/dist/components/input/tplusInput/index.js.map +1 -1
  68. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  69. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  70. package/dist/components/input/tplusInput/style.less +132 -132
  71. package/dist/components/input/utils/index.js.map +1 -1
  72. package/dist/components/inventorySearch/api.js +58 -58
  73. package/dist/components/inventorySearch/api.js.map +1 -1
  74. package/dist/components/inventorySearch/index.js +3 -3
  75. package/dist/components/inventorySearch/index.js.map +1 -1
  76. package/dist/components/inventorySearch/index.less +119 -119
  77. package/dist/components/inventorySearch/store.js.map +1 -1
  78. package/dist/components/inventorySearch/tab.js.map +1 -1
  79. package/dist/components/keyboard/index.js +5 -1
  80. package/dist/components/keyboard/index.js.map +1 -1
  81. package/dist/components/keyboard/index.less +485 -469
  82. package/dist/components/keyboard/letterKeyboard.js +35 -18
  83. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  84. package/dist/components/keyboard/numKeyboard.js +27 -17
  85. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  86. package/dist/components/keyboard/numKeyboardScan.js +32 -24
  87. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  88. package/dist/components/keyboard/numberButton_input.js +5 -5
  89. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  90. package/dist/components/keyboard/numkeyboardPassword.js +23 -13
  91. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  92. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  93. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  94. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  95. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  96. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  97. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  98. package/dist/components/keyboard/onlyLetterButton2.less +156 -156
  99. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  100. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  101. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  102. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  103. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  104. package/dist/components/layout/hamburger.js.map +1 -1
  105. package/dist/components/layout/index.js +10 -10
  106. package/dist/components/layout/index.js.map +1 -1
  107. package/dist/components/layout/layout.js.map +1 -1
  108. package/dist/components/layout/sider.js +15 -13
  109. package/dist/components/layout/sider.js.map +1 -1
  110. package/dist/components/layout/style.less +82 -82
  111. package/dist/components/loading/index.js +15 -15
  112. package/dist/components/loading/index.js.map +1 -1
  113. package/dist/components/loading/loadingContent.js.map +1 -1
  114. package/dist/components/loading/style.less +72 -72
  115. package/dist/components/loading/utils.js.map +1 -1
  116. package/dist/components/message/index.js +8 -8
  117. package/dist/components/message/index.js.map +1 -1
  118. package/dist/components/message/index.less +101 -101
  119. package/dist/components/modal/index.js.map +1 -1
  120. package/dist/components/modal/index.less +19 -19
  121. package/dist/components/modalVertical/index.js +7 -7
  122. package/dist/components/modalVertical/index.js.map +1 -1
  123. package/dist/components/modalVertical/style.less +60 -60
  124. package/dist/components/modalWraper/index.js +15 -15
  125. package/dist/components/modalWraper/index.js.map +1 -1
  126. package/dist/components/modalWraper/style.less +257 -257
  127. package/dist/components/modalWraper/utils.js.map +1 -1
  128. package/dist/components/notification/index.js +4 -4
  129. package/dist/components/notification/index.js.map +1 -1
  130. package/dist/components/notification/index.less +51 -51
  131. package/dist/components/overflowTip/index.js +15 -15
  132. package/dist/components/overflowTip/index.js.map +1 -1
  133. package/dist/components/overflowTip/style.less +66 -66
  134. package/dist/components/page/index.js.map +1 -1
  135. package/dist/components/page/index.less +21 -21
  136. package/dist/components/product/detail.js +7 -7
  137. package/dist/components/product/detail.js.map +1 -1
  138. package/dist/components/product/getCard.js +5 -5
  139. package/dist/components/product/getCard.js.map +1 -1
  140. package/dist/components/product/index.less +128 -128
  141. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  142. package/dist/components/progressState/ProgressState.js +10 -10
  143. package/dist/components/progressState/ProgressState.js.map +1 -1
  144. package/dist/components/progressState/index.js.map +1 -1
  145. package/dist/components/progressState/style.less +65 -65
  146. package/dist/components/scan/index.js.map +1 -1
  147. package/dist/components/scan/index.less +33 -33
  148. package/dist/components/select/index.js.map +1 -1
  149. package/dist/components/select/index.less +11 -11
  150. package/dist/components/settlement/asyncModal.js.map +1 -1
  151. package/dist/components/settlement/index.js.map +1 -1
  152. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  153. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  154. package/dist/components/settlement/prototypeTable/index.js +3 -1
  155. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  156. package/dist/components/settlement/prototypeTable/style.less +58 -58
  157. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  158. package/dist/components/settlement/settlement.js +78 -544
  159. package/dist/components/settlement/settlement.js.map +1 -1
  160. package/dist/components/settlement/settlement.less +1690 -1686
  161. package/dist/components/settlement/settlementStore.js +95 -78
  162. package/dist/components/settlement/settlementStore.js.map +1 -1
  163. package/dist/components/settlement/utils.js.map +1 -1
  164. package/dist/components/socket/index.js +11 -11
  165. package/dist/components/socket/index.js.map +1 -1
  166. package/dist/components/spin/index.js +6 -6
  167. package/dist/components/spin/index.js.map +1 -1
  168. package/dist/components/spin/spin-style.less +436 -436
  169. package/dist/components/test/index.js +3 -3
  170. package/dist/components/test/index.js.map +1 -1
  171. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  172. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  173. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  174. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  175. package/dist/components/ticon/index.js.map +1 -1
  176. package/dist/components/touchScroll/index.js +9 -9
  177. package/dist/components/touchScroll/index.js.map +1 -1
  178. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  179. package/dist/components/touchTable/generateWater.js.map +1 -1
  180. package/dist/components/touchTable/index.js +20 -10
  181. package/dist/components/touchTable/index.js.map +1 -1
  182. package/dist/components/touchTable/index.less +376 -376
  183. package/dist/components/touchTable/utils.js.map +1 -1
  184. package/dist/demo/PopOverDemo.js.map +1 -1
  185. package/dist/index.js +7 -7
  186. package/dist/index.js.map +1 -1
  187. package/dist/util/tools.js.map +1 -1
  188. package/locales/zh/tplus-components-touch.json +1 -1
  189. package/locales/zh-CN/tplus-components-touch.json +1 -1
  190. package/mocks/memberInfo.json +79 -79
  191. package/package.json +35 -35
  192. package/tsconfig.json +26 -26
@@ -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');
@@ -258,7 +258,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
258
258
  storageValue: '0.00',
259
259
  czkValue: null,
260
260
  isInputMember: false,
261
- selectedRowIndex: 0
261
+ selectedRowIndex: 0,
262
+ isNotAutoFocus: true
262
263
  // 复核结算方式快捷键列表
263
264
  };
264
265
  _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
@@ -370,7 +371,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
370
371
  var count = _this2.handleShowPrototype();
371
372
  if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
372
373
  _this2.setState({
373
- prototypeVisible: true
374
+ prototypeVisible: true,
375
+ isNotAutoFocus: false
374
376
  });
375
377
  } else {
376
378
  _this2.payQuick();
@@ -490,7 +492,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
490
492
  var count = _this2.handleShowPrototype();
491
493
  if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
492
494
  _this2.setState({
493
- prototypeVisible: true
495
+ prototypeVisible: true,
496
+ isNotAutoFocus: false
494
497
  });
495
498
  } else {
496
499
  _this2.payFun();
@@ -1296,7 +1299,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1296
1299
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1297
1300
  PayStyle = _enumController$getEn12.PayStyle;
1298
1301
 
1299
- if (boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1302
+ var storeType = _this2.props.type;
1303
+
1304
+ if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1300
1305
  _message2.default.info('原单退货时,该结算方式不可以删除。');
1301
1306
  } else {
1302
1307
  _this2.store.delPay(index);
@@ -2900,6 +2905,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2900
2905
  id: 'paymentAmount',
2901
2906
  className: 'content',
2902
2907
  type: 'text',
2908
+ bordered: true,
2909
+ placement: 'rightBottom',
2903
2910
  placeholder: '\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D',
2904
2911
  disabled: paymode.value < 0,
2905
2912
  defaultValue: that.getXianjinPayment(paymode.paymentType, paymode.value),
@@ -2971,6 +2978,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2971
2978
  _react2.default.createElement(_numKeyboardScan2.default, {
2972
2979
  className: 'content ',
2973
2980
  type: 'text',
2981
+ bordered: true,
2974
2982
  placeholder: '\u626B\u63CF\u6216\u8F93\u5165\u4ED8\u6B3E\u7801',
2975
2983
  ref: function ref(input) {
2976
2984
  return that['inputS' + paymode.paymethodId] = input;
@@ -3197,6 +3205,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3197
3205
  _this2.handleShowPrototype();
3198
3206
  _this2.setState({
3199
3207
  prototypeVisible: true,
3208
+ isNotAutoFocus: true,
3200
3209
  isPrototypeClick: true
3201
3210
  });
3202
3211
  };
@@ -3366,11 +3375,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3366
3375
  //jfdx
3367
3376
 
3368
3377
 
3369
- /**
3370
- *
3371
- * @param {*} thePaymodes 支付方式列表
3372
- * @param {*} currenIndex 当前支付方式下标
3373
- * @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
3378
+ /**
3379
+ *
3380
+ * @param {*} thePaymodes 支付方式列表
3381
+ * @param {*} currenIndex 当前支付方式下标
3382
+ * @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
3374
3383
  */
3375
3384
 
3376
3385
  // 处理客显显示功能
@@ -3496,7 +3505,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3496
3505
  storageValue = _state2.storageValue,
3497
3506
  czkValue = _state2.czkValue,
3498
3507
  newPassConfirm = _state2.newPassConfirm,
3499
- newPass = _state2.newPass;
3508
+ newPass = _state2.newPass,
3509
+ isNotAutoFocus = _state2.isNotAutoFocus;
3500
3510
 
3501
3511
  var _ref30 = _mutantsUtil.platform || {},
3502
3512
  isNewRetailBCPos = _ref30.isNewRetailBCPos;
@@ -3719,10 +3729,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3719
3729
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3720
3730
  return _react2.default.createElement(
3721
3731
  _button2.default,
3722
- { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
3732
+ {
3733
+ className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }),
3734
+ key: 'paymentType_' + p.paymentType,
3735
+ onClick: function onClick() {
3723
3736
  _this8.btnDebounced(p.paymentType, true);
3724
3737
  },
3725
- disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
3738
+ disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
3739
+ },
3726
3740
  _react2.default.createElement(
3727
3741
  'div',
3728
3742
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3743,22 +3757,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3743
3757
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3744
3758
  )
3745
3759
  ),
3746
- type != 1 && !newStyle && _react2.default.createElement(
3760
+ !newStyle && _react2.default.createElement(
3747
3761
  _drawer2.default,
3748
3762
  {
3749
3763
  title: '\u590D\u5408\u7ED3\u7B97',
3750
3764
  width: '600px',
3751
3765
  placement: 'right',
3752
- maskClosable: false,
3766
+ maskClosable: true,
3753
3767
  closable: false,
3754
3768
  onClose: this.handleCancel,
3755
3769
  visible: this.state.visible,
3756
3770
  destroyOnClose: true,
3757
- className: 'settlement-wraper'
3771
+ className: 'settlement-wraper',
3772
+ style: { 'zIndex': 1006 }
3758
3773
  },
3759
3774
  _react2.default.createElement(
3760
3775
  'div',
3761
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3776
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3762
3777
  _react2.default.createElement(
3763
3778
  'div',
3764
3779
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3773,7 +3788,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3773
3788
  ),
3774
3789
  _react2.default.createElement(
3775
3790
  'div',
3776
- { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px' } },
3791
+ { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px', height: 'calc(100% - 198px)' } },
3777
3792
  _react2.default.createElement(
3778
3793
  'div',
3779
3794
  { className: 'left' },
@@ -3803,7 +3818,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3803
3818
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
3804
3819
  className: _index.hotKey.hotKeyNotFilter(),
3805
3820
  onClick: function onClick() {
3806
- _this8.editModal(index, mode.paymentType, boriginReturn);
3821
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
3807
3822
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
3808
3823
  className: _index.hotKey.hotKeyNotFilter(),
3809
3824
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -3867,7 +3882,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3867
3882
  (0, _utils.getFixedNumber)(mode.balance)
3868
3883
  ),
3869
3884
  _react2.default.createElement('br', null),
3870
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3885
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3871
3886
  _button2.default,
3872
3887
  { onClick: function onClick() {
3873
3888
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -3960,7 +3975,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3960
3975
  )
3961
3976
  )
3962
3977
  ),
3963
- !isReturn && _react2.default.createElement(
3978
+ type != 1 && !isReturn && _react2.default.createElement(
3964
3979
  'div',
3965
3980
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
3966
3981
  '\u4F18\u60E0\u660E\u7EC6',
@@ -3999,18 +4014,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3999
4014
  )
4000
4015
  )
4001
4016
  ),
4002
- type != 1 && newStyle && _react2.default.createElement(
4017
+ newStyle && _react2.default.createElement(
4003
4018
  _drawer2.default,
4004
4019
  {
4005
4020
  title: '\u590D\u5408\u7ED3\u7B97',
4006
4021
  width: '600px',
4007
4022
  placement: 'right',
4008
- maskClosable: false,
4023
+ maskClosable: true,
4009
4024
  closable: false,
4010
4025
  onClose: this.handleCancel,
4011
4026
  visible: this.state.visible,
4012
4027
  destroyOnClose: true,
4013
- className: 'settlement-wraper'
4028
+ className: 'settlement-wraper',
4029
+ style: { 'zIndex': 1006 }
4014
4030
  },
4015
4031
  _react2.default.createElement(
4016
4032
  'div',
@@ -4095,7 +4111,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4095
4111
  )
4096
4112
  )
4097
4113
  ),
4098
- !isReturn && _react2.default.createElement(
4114
+ type != 1 && !isReturn && _react2.default.createElement(
4099
4115
  'div',
4100
4116
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4101
4117
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4117,12 +4133,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4117
4133
  return m.paymentType === PayStyle.smzf;
4118
4134
  });
4119
4135
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式,在非退货模式下,隐藏微信、支付宝。
4120
- var hotkeyIndex = index;
4136
+ var hotkeyIndex = mindex;
4121
4137
  if (!isReturn && hasSMZF) {
4122
4138
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4123
4139
  return null;
4124
4140
  } else {
4125
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4141
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4126
4142
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4127
4143
  });
4128
4144
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4130,6 +4146,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4130
4146
  });
4131
4147
  }
4132
4148
  }
4149
+ var hyczkFindIndex = (0, _findIndex3.default)(thePaymodes, function (m) {
4150
+ return m.paymentType == PayStyle.hyczk;
4151
+ });
4152
+ var hyczkList = (0, _filter3.default)(thePaymodes, function (m) {
4153
+ return m.paymentType == PayStyle.hyczk;
4154
+ });
4155
+ var lastStorageCardIndex = 0;
4156
+ (0, _map3.default)(thePaymodes, function (m, i) {
4157
+ if (m.paymentType === PayStyle.hyczk) lastStorageCardIndex = i;
4158
+ });
4159
+ if (mindex > 0 && hyczkList.length > 1 && mindex > lastStorageCardIndex) {
4160
+ hotkeyIndex = hotkeyIndex - hyczkList.length + 1;
4161
+ }
4162
+
4163
+ console.log(thePaymodes);
4164
+
4133
4165
  var index = mode.paymethodId;
4134
4166
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4135
4167
  return m.paymentType == PayStyle.hyczk;
@@ -4166,16 +4198,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4166
4198
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4167
4199
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4168
4200
  onClick: function onClick() {
4169
- // let czkinput = document.getElementById('inputS' + index);
4170
- // if (mode.paymentType === PayStyle.hyczk) {
4171
- // const { isProhibitMeStorageCard } = this.props;
4172
- // if (isProhibitMeStorageCard) {
4173
- // Message.warn('储值卡不可键盘录入,请刷卡!');
4174
- // return;
4175
- // }
4176
- // }
4177
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4178
- if (mode.paymentType == PayStyle.hyczk) {
4201
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4179
4202
  if (themodeHyczk && themodeHyczk.length === 0) {
4180
4203
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4181
4204
  }
@@ -4231,10 +4254,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4231
4254
  null,
4232
4255
  '\u5361\u53F7\uFF1A'
4233
4256
  ),
4234
- _react2.default.createElement(
4257
+ type != 1 ? _react2.default.createElement(
4235
4258
  'span',
4236
4259
  null,
4237
4260
  m && m.storageCardNo
4261
+ ) : _react2.default.createElement(
4262
+ 'span',
4263
+ null,
4264
+ m.member && m.member.cardNo
4238
4265
  ),
4239
4266
  _react2.default.createElement(
4240
4267
  'span',
@@ -4247,7 +4274,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4247
4274
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4248
4275
  ),
4249
4276
  _react2.default.createElement('br', null),
4250
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4277
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4251
4278
  _button2.default,
4252
4279
  { onClick: function onClick() {
4253
4280
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4291,504 +4318,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4291
4318
  )
4292
4319
  )
4293
4320
  ),
4294
- type == 1 && !newStyle && _react2.default.createElement(
4295
- _modal2.default,
4296
- {
4297
- wrapClassName: 'settlement-wraper2',
4298
- width: '600px',
4299
- visible: this.state.visible,
4300
- maskClosable: false,
4301
- title: "复合结算",
4302
- footer: null,
4303
- maskStyle: { 'z-index': '1004' },
4304
- onCancel: this.handleCancel,
4305
- destroyOnClose: true
4306
- },
4307
- _react2.default.createElement(
4308
- 'div',
4309
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4310
- _react2.default.createElement(
4311
- 'div',
4312
- { className: 'settlementTop' },
4313
- _react2.default.createElement(
4314
- 'div',
4315
- { className: (0, _classnames4.default)({ "toolbar": true, "toolbar2": type == 1, "carousel": paymodes.length > carouselStart2 }) },
4316
- paymodes.length <= carouselStart2 && _react2.default.createElement(
4317
- 'div',
4318
- null,
4319
- (0, _map3.default)(paymodes, function (mode, index) {
4320
- return _this8.renderToolbtn(mode, index);
4321
- })
4322
- ),
4323
- paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
4324
- ),
4325
- _react2.default.createElement(
4326
- 'div',
4327
- { className: 'rightheader' },
4328
- paymode.onlineamount > 0 && _react2.default.createElement(
4329
- 'div',
4330
- { className: 'receivable' },
4331
- _react2.default.createElement(
4332
- 'span',
4333
- null,
4334
- '\u7EBF\u4E0A\u5DF2\u6536'
4335
- ),
4336
- _react2.default.createElement(
4337
- 'span',
4338
- null,
4339
- paymode.onlineamount
4340
- )
4341
- ),
4342
- _react2.default.createElement(
4343
- 'div',
4344
- { className: 'receivable' },
4345
- _react2.default.createElement(
4346
- 'span',
4347
- null,
4348
- '\u5E94\u6536\u91D1\u989D'
4349
- ),
4350
- _react2.default.createElement(
4351
- 'span',
4352
- null,
4353
- paymode.amount
4354
- )
4355
- ),
4356
- _react2.default.createElement(
4357
- 'div',
4358
- { className: 'receivable' },
4359
- _react2.default.createElement(
4360
- 'span',
4361
- null,
4362
- '\u5269\u4F59\u5E94\u6536'
4363
- ),
4364
- _react2.default.createElement(
4365
- 'span',
4366
- null,
4367
- paymode.receivable
4368
- )
4369
- ),
4370
- _react2.default.createElement(
4371
- 'div',
4372
- { className: 'receivable' },
4373
- _react2.default.createElement(
4374
- 'span',
4375
- null,
4376
- '\u5B9E\u6536\u91D1\u989D'
4377
- ),
4378
- _react2.default.createElement(
4379
- 'span',
4380
- { className: 'received' },
4381
- paymode.received
4382
- )
4383
- ),
4384
- _react2.default.createElement(
4385
- 'div',
4386
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4387
- _react2.default.createElement(
4388
- 'span',
4389
- null,
4390
- '\u627E\u96F6\u91D1\u989D'
4391
- ),
4392
- _react2.default.createElement(
4393
- 'span',
4394
- { className: 'received' },
4395
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4396
- )
4397
- )
4398
- )
4399
- ),
4400
- _react2.default.createElement(
4401
- 'div',
4402
- { className: 'paydetail' },
4403
- _react2.default.createElement(
4404
- 'div',
4405
- { className: 'left' },
4406
- thePaymodes.length == 0 && _react2.default.createElement(
4407
- 'div',
4408
- { className: 'emptydata detailempty2' },
4409
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4410
- ),
4411
-
4412
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4413
- (0, _map3.default)(thePaymodes, function (mode) {
4414
- var index = mode.paymethodId;
4415
- return _react2.default.createElement(
4416
- 'div',
4417
- { key: index + '', className: 'modeItem' },
4418
- _react2.default.createElement(
4419
- 'div',
4420
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4421
- _react2.default.createElement(
4422
- 'div',
4423
- { className: (0, _classnames4.default)({ "name": true }) },
4424
- mode.name
4425
- ),
4426
- _react2.default.createElement(
4427
- 'div',
4428
- { className: (0, _classnames4.default)({ "content": true }) },
4429
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
4430
- onClick: function onClick() {
4431
- _this8.editModal(index, mode.paymentType);
4432
- }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4433
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4434
- onBlur: function onBlur(e) {
4435
- return _this8.onBlur(index, e);
4436
- },
4437
- onChange: function onChange(e) {
4438
- return _this8.handleChange(index, e);
4439
- },
4440
- onFocus: function onFocus(e) {
4441
- return _this8.onFocusHack(index, mode, paymode, e);
4442
- }
4443
- })
4444
- ),
4445
- _react2.default.createElement(
4446
- 'div',
4447
- { className: 'minus', onClick: function onClick() {
4448
- _this8.onDelPay(index);
4449
- } },
4450
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4451
- )
4452
- ),
4453
- mode.paymentType == PayStyle.djq ? _react2.default.createElement(
4454
- 'div',
4455
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4456
- _react2.default.createElement(
4457
- 'span',
4458
- { className: 'balance' },
4459
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4460
- ),
4461
- _react2.default.createElement(
4462
- 'span',
4463
- null,
4464
- mode.overchargesAmount
4465
- )
4466
- ) : _react2.default.createElement(
4467
- 'div',
4468
- { className: 'append', style: { display: mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.djq ? 'block' : 'none' } },
4469
- _react2.default.createElement(
4470
- 'span',
4471
- { className: 'fl' },
4472
- '\u5361\u53F7\uFF1A'
4473
- ),
4474
- _react2.default.createElement(
4475
- 'span',
4476
- { className: 'fl' },
4477
- mode && mode.storageCardNo
4478
- ),
4479
- _react2.default.createElement('br', null),
4480
- _react2.default.createElement(
4481
- 'span',
4482
- { className: 'balance fl' },
4483
- '\u4F59\u989D\uFF1A'
4484
- ),
4485
- _react2.default.createElement(
4486
- 'span',
4487
- { className: 'fl' },
4488
- (0, _utils.getFixedNumber)(mode.balance)
4489
- )
4490
- )
4491
- );
4492
- })
4493
- ),
4494
- _react2.default.createElement(
4495
- 'div',
4496
- { className: 'right' },
4497
- _react2.default.createElement(
4498
- 'div',
4499
- { className: this.isHorizontalPad ? 'keyboard_ios' : 'keyboard' },
4500
- !this.isHorizontalPad && _react2.default.createElement(_keyboard2.default, { type: 'number', onChange: this.onKeyboardChange.bind(this) })
4501
- )
4502
- )
4503
- ),
4504
- _react2.default.createElement(
4505
- 'div',
4506
- { className: 'payfooter2' },
4507
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4508
- _react2.default.createElement(
4509
- 'span',
4510
- null,
4511
- _react2.default.createElement(
4512
- _button2.default,
4513
- { className: 'cancel', onClick: this.handleCancel },
4514
- '\u53D6\u6D88'
4515
- )
4516
- ),
4517
- _react2.default.createElement(
4518
- 'span',
4519
- null,
4520
- _react2.default.createElement(
4521
- _button2.default,
4522
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4523
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4524
- '\u7ED3\u7B97'
4525
- )
4526
- )
4527
- )
4528
- )
4529
- ),
4530
- type == 1 && newStyle && _react2.default.createElement(
4531
- _modal2.default,
4532
- {
4533
- wrapClassName: 'settlement-wraper2',
4534
- width: '600px',
4535
- visible: this.state.visible,
4536
- maskClosable: false,
4537
- title: "复合结算",
4538
- footer: null,
4539
- backdropStyle: { 'z-index': '1004' },
4540
- onCancel: this.handleCancel,
4541
- destroyOnClose: true
4542
- },
4543
- _react2.default.createElement(
4544
- 'div',
4545
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
4546
- _react2.default.createElement(
4547
- 'div',
4548
- { className: 'paydetail newstyle newstyle2' },
4549
- _react2.default.createElement(
4550
- 'div',
4551
- { className: 'top' },
4552
- _react2.default.createElement(
4553
- 'div',
4554
- { className: 'righttop' },
4555
- paymode.onlineamount > 0 && _react2.default.createElement(
4556
- 'div',
4557
- { className: 'receivable' },
4558
- _react2.default.createElement(
4559
- 'span',
4560
- null,
4561
- '\u7EBF\u4E0A\u5DF2\u6536'
4562
- ),
4563
- _react2.default.createElement(
4564
- 'span',
4565
- null,
4566
- paymode.onlineamount
4567
- )
4568
- ),
4569
- _react2.default.createElement(
4570
- 'div',
4571
- { className: 'receivable' },
4572
- _react2.default.createElement(
4573
- 'span',
4574
- null,
4575
- '\u5E94\u6536\u91D1\u989D'
4576
- ),
4577
- _react2.default.createElement(
4578
- 'span',
4579
- null,
4580
- paymode.amount
4581
- )
4582
- ),
4583
- _react2.default.createElement(
4584
- 'div',
4585
- { className: 'receivable' },
4586
- _react2.default.createElement(
4587
- 'span',
4588
- null,
4589
- '\u5269\u4F59\u5E94\u6536'
4590
- ),
4591
- _react2.default.createElement(
4592
- 'span',
4593
- null,
4594
- paymode.receivable
4595
- )
4596
- ),
4597
- _react2.default.createElement(
4598
- 'div',
4599
- { className: 'receivable' },
4600
- _react2.default.createElement(
4601
- 'span',
4602
- null,
4603
- '\u5B9E\u6536\u91D1\u989D'
4604
- ),
4605
- _react2.default.createElement(
4606
- 'span',
4607
- { className: 'received' },
4608
- paymode.received
4609
- )
4610
- ),
4611
- _react2.default.createElement(
4612
- 'div',
4613
- { className: 'receivable', style: { display: this.checkCharge() ? 'block' : 'none' } },
4614
- _react2.default.createElement(
4615
- 'span',
4616
- null,
4617
- '\u627E\u96F6\u91D1\u989D'
4618
- ),
4619
- _react2.default.createElement(
4620
- 'span',
4621
- { className: 'received' },
4622
- (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
4623
- )
4624
- )
4625
- )
4626
- ),
4627
- _react2.default.createElement(
4628
- 'div',
4629
- { className: 'bottom' },
4630
- thePaymodes.length == 0 && _react2.default.createElement(
4631
- 'div',
4632
- { className: 'emptydata detailempty' },
4633
- '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
4634
- ),
4635
-
4636
- // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
4637
- (0, _map3.default)(thePaymodes, function (mode, mindex) {
4638
- var isReturn = _this8.props.isReturn;
4639
-
4640
- var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
4641
- return m.paymentType === PayStyle.smzf;
4642
- });
4643
- var hotkeyIndex = mindex;
4644
- //同时存在微信、支付宝、扫码支付三种方式,在非退货模式下,隐藏微信、支付宝。
4645
- if (!isReturn && hasSMZF) {
4646
- if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4647
- return null;
4648
- } else {
4649
- var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4650
- return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4651
- });
4652
- hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
4653
- return m.paymentType == mode.paymentType;
4654
- });
4655
- }
4656
- }
4657
- var index = mode.paymethodId;
4658
- return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4659
- return m.paymentType == PayStyle.hyczk;
4660
- }) != mindex ? _react2.default.createElement('div', null) : _react2.default.createElement(
4661
- 'div',
4662
- { key: index + '', className: 'modeItem' },
4663
- _react2.default.createElement(
4664
- 'div',
4665
- { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4666
- _react2.default.createElement(
4667
- 'div',
4668
- { className: (0, _classnames4.default)({ "name": true }) },
4669
- _react2.default.createElement(
4670
- 'div',
4671
- { className: 'icon' },
4672
- _react2.default.createElement(_ticon2.default, { type: PayIcon[mode.paymentType] || PayIcon['default'] })
4673
- ),
4674
- _react2.default.createElement(
4675
- 'div',
4676
- { className: 'text' },
4677
- mode.name
4678
- ),
4679
- _react2.default.createElement(
4680
- 'div',
4681
- { className: 'hotkey' },
4682
- _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
4683
- )
4684
- ),
4685
- _react2.default.createElement(
4686
- 'div',
4687
- { className: (0, _classnames4.default)({ "content": true }) },
4688
- mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
4689
- // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
4690
- , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4691
- // className="paymode"
4692
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4693
- onClick: function onClick() {
4694
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4695
- },
4696
- value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4697
- return tm.paymentType == PayStyle.hyczk;
4698
- }), function (sum, m) {
4699
- return Math.Add(sum, m.value);
4700
- }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
4701
- className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
4702
- // className="paymode"
4703
- , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
4704
- value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
4705
- onClick: function onClick(e) {
4706
- return _this8.onHotKeyClick2(index, mode, paymode, e);
4707
- },
4708
- onBlur: function onBlur(e) {
4709
- return _this8.onBlur(index, e);
4710
- },
4711
- onFocus: function onFocus(e) {
4712
- return _this8.onFocusHack(index, mode, paymode, e);
4713
- },
4714
- onChange: function onChange(e) {
4715
- return _this8.handleChange(index, e);
4716
- }
4717
- })
4718
- )
4719
- ),
4720
- mode.paymentType == PayStyle.djq && _react2.default.createElement(
4721
- 'div',
4722
- { className: 'append' },
4723
- _react2.default.createElement(
4724
- 'span',
4725
- { className: 'balance' },
4726
- '\u6EA2\u6536\u91D1\u989D\uFF1A'
4727
- ),
4728
- _react2.default.createElement(
4729
- 'span',
4730
- null,
4731
- mode.overchargesAmount
4732
- )
4733
- ),
4734
- (0, _map3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4735
- return mode.paymentType == PayStyle.hyczk && parseFloat(tm.value || 0) != 0 && tm.paymentType == PayStyle.hyczk;
4736
- }), function (m) {
4737
- return _react2.default.createElement(
4738
- 'div',
4739
- { className: 'append' },
4740
- _react2.default.createElement(
4741
- 'span',
4742
- null,
4743
- '\u5361\u53F7\uFF1A'
4744
- ),
4745
- _react2.default.createElement(
4746
- 'span',
4747
- null,
4748
- m.member && m.member.cardNo
4749
- ),
4750
- _react2.default.createElement(
4751
- 'span',
4752
- { className: 'fr' },
4753
- (0, _utils.getFixedNumber)(m.value)
4754
- ),
4755
- _react2.default.createElement(
4756
- 'span',
4757
- { className: 'balance fr' },
4758
- '\u652F\u4ED8\u91D1\u989D\uFF1A'
4759
- )
4760
- );
4761
- })
4762
- );
4763
- })
4764
- )
4765
- ),
4766
- _react2.default.createElement(
4767
- 'div',
4768
- { className: 'payfooter2' },
4769
- _react2.default.createElement('span', { className: 'hotKeyEnter', onClick: this.onHotKeyEnter }),
4770
- _react2.default.createElement(
4771
- 'span',
4772
- null,
4773
- _react2.default.createElement(
4774
- _button2.default,
4775
- { className: 'cancel', onClick: this.handleCancel },
4776
- '\u53D6\u6D88'
4777
- )
4778
- ),
4779
- _react2.default.createElement(
4780
- 'span',
4781
- null,
4782
- _react2.default.createElement(
4783
- _button2.default,
4784
- { type: 'primary', className: 'settle', onClick: this.handleSettle,
4785
- disabled: this.checkSettleDisabled(paymode, thePaymodes) },
4786
- '\u7ED3\u7B97'
4787
- )
4788
- )
4789
- )
4790
- )
4791
- ),
4792
4321
  _react2.default.createElement(
4793
4322
  _modal2.default,
4794
4323
  {
@@ -4801,6 +4330,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4801
4330
  onCancel: this.handleCzkCancel,
4802
4331
  keyboard: false,
4803
4332
  centered: !this.isHorizontalPad ? true : false,
4333
+ zIndex: 1007,
4804
4334
  footer: _react2.default.createElement(
4805
4335
  'div',
4806
4336
  { className: 'action' },
@@ -5078,6 +4608,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5078
4608
  onCancel: this.handleMoreCzkCancel,
5079
4609
  keyboard: false,
5080
4610
  centered: !this.isHorizontalPad ? true : false,
4611
+ zIndex: 1007,
5081
4612
  footer: _react2.default.createElement(
5082
4613
  'div',
5083
4614
  { className: 'action' },
@@ -5119,7 +4650,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5119
4650
  onCancel: this.handleSetPwdCancel,
5120
4651
  keyboard: false,
5121
4652
  centered: !this.isHorizontalPad ? true : false,
5122
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4653
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4654
+ zIndex: 1007
5123
4655
  }, 'footer', _react2.default.createElement(
5124
4656
  'div',
5125
4657
  { className: 'action' },
@@ -5215,6 +4747,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5215
4747
  onCancel: this.handleDjqCancel,
5216
4748
  centered: !this.isHorizontalPad ? true : false,
5217
4749
  title: Differentiate.COUPON + '支付',
4750
+ zIndex: 1007,
5218
4751
  footer: _react2.default.createElement(
5219
4752
  'div',
5220
4753
  { className: 'action' },
@@ -5537,6 +5070,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5537
5070
  centered: !this.isHorizontalPad ? true : false,
5538
5071
  title: "积分抵现",
5539
5072
  destroyOnClose: true,
5073
+ zIndex: 1007,
5540
5074
  footer: _react2.default.createElement(
5541
5075
  'div',
5542
5076
  { className: 'action' },
@@ -5709,7 +5243,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5709
5243
  ),
5710
5244
  _react2.default.createElement(_index3.default, { discount: {
5711
5245
  discountTotalAmount: discountTotalAmount, discountRetailTotalAount: discountRetailTotalAount, discountPrototypeTotalAmount: discountPrototypeTotalAmount
5712
- }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible })
5246
+ }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible, isNotAutoFocus: isNotAutoFocus })
5713
5247
  );
5714
5248
  }
5715
5249
  }]);