tplus-components-touch 3.36.2 → 3.36.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 (195) 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 +14 -16
  59. package/dist/components/hotKey/localConfig.js.map +1 -1
  60. package/dist/components/hotKey/style.less +96 -96
  61. package/dist/components/hotKey/utils.js.map +1 -1
  62. package/dist/components/input/index.js +10 -7
  63. package/dist/components/input/index.js.map +1 -1
  64. package/dist/components/input/scanInput.js.map +1 -1
  65. package/dist/components/input/scanInput.less +30 -27
  66. package/dist/components/input/style.less +99 -99
  67. package/dist/components/input/tplusInput/index.js +30 -30
  68. package/dist/components/input/tplusInput/index.js.map +1 -1
  69. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  70. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  71. package/dist/components/input/tplusInput/style.less +132 -132
  72. package/dist/components/input/utils/index.js.map +1 -1
  73. package/dist/components/inventorySearch/api.js +58 -58
  74. package/dist/components/inventorySearch/api.js.map +1 -1
  75. package/dist/components/inventorySearch/index.js +3 -3
  76. package/dist/components/inventorySearch/index.js.map +1 -1
  77. package/dist/components/inventorySearch/index.less +119 -119
  78. package/dist/components/inventorySearch/store.js.map +1 -1
  79. package/dist/components/inventorySearch/tab.js.map +1 -1
  80. package/dist/components/keyboard/index.js +5 -1
  81. package/dist/components/keyboard/index.js.map +1 -1
  82. package/dist/components/keyboard/index.less +485 -469
  83. package/dist/components/keyboard/letterKeyboard.js +35 -18
  84. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  85. package/dist/components/keyboard/numKeyboard.js +27 -17
  86. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  87. package/dist/components/keyboard/numKeyboardScan.js +32 -24
  88. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  89. package/dist/components/keyboard/numberButton_input.js +5 -5
  90. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  91. package/dist/components/keyboard/numkeyboardPassword.js +35 -18
  92. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  93. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  94. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  95. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  96. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  97. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  98. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  99. package/dist/components/keyboard/onlyLetterButton2.less +156 -156
  100. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  101. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  102. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  103. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  104. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  105. package/dist/components/layout/hamburger.js.map +1 -1
  106. package/dist/components/layout/index.js +10 -10
  107. package/dist/components/layout/index.js.map +1 -1
  108. package/dist/components/layout/layout.js.map +1 -1
  109. package/dist/components/layout/sider.js +15 -13
  110. package/dist/components/layout/sider.js.map +1 -1
  111. package/dist/components/layout/style.less +82 -82
  112. package/dist/components/loading/index.js +15 -15
  113. package/dist/components/loading/index.js.map +1 -1
  114. package/dist/components/loading/loadingContent.js.map +1 -1
  115. package/dist/components/loading/style.less +72 -72
  116. package/dist/components/loading/utils.js.map +1 -1
  117. package/dist/components/message/index.js +8 -8
  118. package/dist/components/message/index.js.map +1 -1
  119. package/dist/components/message/index.less +101 -101
  120. package/dist/components/modal/index.js.map +1 -1
  121. package/dist/components/modal/index.less +19 -19
  122. package/dist/components/modalVertical/index.js +7 -7
  123. package/dist/components/modalVertical/index.js.map +1 -1
  124. package/dist/components/modalVertical/style.less +60 -60
  125. package/dist/components/modalWraper/index.js +15 -15
  126. package/dist/components/modalWraper/index.js.map +1 -1
  127. package/dist/components/modalWraper/style.less +257 -257
  128. package/dist/components/modalWraper/utils.js.map +1 -1
  129. package/dist/components/notification/index.js +4 -4
  130. package/dist/components/notification/index.js.map +1 -1
  131. package/dist/components/notification/index.less +51 -51
  132. package/dist/components/overflowTip/index.js +15 -15
  133. package/dist/components/overflowTip/index.js.map +1 -1
  134. package/dist/components/overflowTip/style.less +66 -66
  135. package/dist/components/page/index.js.map +1 -1
  136. package/dist/components/page/index.less +21 -21
  137. package/dist/components/product/detail.js +7 -7
  138. package/dist/components/product/detail.js.map +1 -1
  139. package/dist/components/product/getCard.js +5 -5
  140. package/dist/components/product/getCard.js.map +1 -1
  141. package/dist/components/product/index.less +128 -128
  142. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  143. package/dist/components/progressState/ProgressState.js +10 -10
  144. package/dist/components/progressState/ProgressState.js.map +1 -1
  145. package/dist/components/progressState/index.js.map +1 -1
  146. package/dist/components/progressState/style.less +65 -65
  147. package/dist/components/scan/index.js.map +1 -1
  148. package/dist/components/scan/index.less +33 -33
  149. package/dist/components/select/index.js.map +1 -1
  150. package/dist/components/select/index.less +11 -11
  151. package/dist/components/settlement/asyncModal.js.map +1 -1
  152. package/dist/components/settlement/index.js +1 -1
  153. package/dist/components/settlement/index.js.map +1 -1
  154. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  155. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  156. package/dist/components/settlement/prototypeTable/index.js +6 -2
  157. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  158. package/dist/components/settlement/prototypeTable/style.less +58 -58
  159. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  160. package/dist/components/settlement/settlement.js +87 -553
  161. package/dist/components/settlement/settlement.js.map +1 -1
  162. package/dist/components/settlement/settlement.less +1690 -1686
  163. package/dist/components/settlement/settlementStore.js +95 -78
  164. package/dist/components/settlement/settlementStore.js.map +1 -1
  165. package/dist/components/settlement/utils.js.map +1 -1
  166. package/dist/components/socket/index.js +11 -11
  167. package/dist/components/socket/index.js.map +1 -1
  168. package/dist/components/spin/index.js +6 -6
  169. package/dist/components/spin/index.js.map +1 -1
  170. package/dist/components/spin/spin-style.less +436 -436
  171. package/dist/components/test/index.js +3 -3
  172. package/dist/components/test/index.js.map +1 -1
  173. package/dist/components/ticon/iconfont/demo.css +539 -539
  174. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  175. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  176. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  177. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  178. package/dist/components/ticon/index.js.map +1 -1
  179. package/dist/components/touchScroll/index.js +9 -9
  180. package/dist/components/touchScroll/index.js.map +1 -1
  181. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  182. package/dist/components/touchTable/generateWater.js.map +1 -1
  183. package/dist/components/touchTable/index.js +20 -10
  184. package/dist/components/touchTable/index.js.map +1 -1
  185. package/dist/components/touchTable/index.less +376 -376
  186. package/dist/components/touchTable/utils.js.map +1 -1
  187. package/dist/demo/PopOverDemo.js.map +1 -1
  188. package/dist/index.js +7 -7
  189. package/dist/index.js.map +1 -1
  190. package/dist/util/tools.js.map +1 -1
  191. package/locales/zh/tplus-components-touch.json +1 -1
  192. package/locales/zh-CN/tplus-components-touch.json +1 -1
  193. package/mocks/memberInfo.json +79 -79
  194. package/package.json +35 -35
  195. 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');
@@ -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,16 @@ 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
+ isNotAutoFocus: true
263
+ // 复核结算方式快捷键列表
264
+ };
263
265
  _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
264
266
  return key.toLocaleUpperCase();
265
267
  });
266
268
  _this2.hotkeydebounced = null;
267
269
  _this2.hotkeydebouncedPayMode = "";
268
270
  _this2.currentInput = null;
269
- _this2.store = _mutantsMicrofx.stores.settlementStore;
270
271
 
271
272
  _this2.resizeSettlementToolBtns = function () {
272
273
  var newStyle = _this2.store.newStyle;
@@ -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();
@@ -425,6 +427,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
425
427
  return (0, _assign2.default)({}, o);
426
428
  });
427
429
  var discountRetailTotalAount = null;
430
+ var discountPrototypeTotalAmount = 0;
428
431
  var count = 0;
429
432
  dataSource && dataSource.forEach(function (item) {
430
433
  var count1 = 0;
@@ -448,14 +451,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
448
451
  } else {
449
452
  item.badge = { text: '', position: '', className: '' };
450
453
  }
451
- if (!item.IsPresent) {
452
- discountRetailTotalAount += item.RetailPrice * item.Quantity;
453
- }
454
454
  if (item.PromotionDetails && item.PromotionDetails.length > 0) {
455
455
  count++;
456
456
  }
457
457
  item.InventoryName = item.Inventory.Name;
458
458
  item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
459
+ discountPrototypeTotalAmount += item.DetailDiscountAmount;
459
460
  //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
460
461
  item.TotalDiscount = item.DetailDiscountAmount;
461
462
  item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
@@ -466,11 +467,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
466
467
  });
467
468
  _this2.setState({
468
469
  dataSource: dataSource,
469
- discountTotalAmount: (0, _utils.getFixedNumber)(TotalTaxAmount),
470
- discountRetailTotalAount: (0, _utils.getFixedNumber)(discountRetailTotalAount),
471
- discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountRetailTotalAount - TotalTaxAmount)
470
+ discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
471
+ discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
472
+ discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
472
473
  });
473
- console.log(RetailDetails, 'RetailDetails-----');
474
474
  return count;
475
475
  };
476
476
 
@@ -490,7 +490,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
490
490
  var count = _this2.handleShowPrototype();
491
491
  if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
492
492
  _this2.setState({
493
- prototypeVisible: true
493
+ prototypeVisible: true,
494
+ isNotAutoFocus: false
494
495
  });
495
496
  } else {
496
497
  _this2.payFun();
@@ -1296,7 +1297,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1296
1297
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1297
1298
  PayStyle = _enumController$getEn12.PayStyle;
1298
1299
 
1299
- if (boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1300
+ var storeType = _this2.props.type;
1301
+
1302
+ if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
1300
1303
  _message2.default.info('原单退货时,该结算方式不可以删除。');
1301
1304
  } else {
1302
1305
  _this2.store.delPay(index);
@@ -2523,6 +2526,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2523
2526
  null,
2524
2527
  _react2.default.createElement(_numkeyboardPassword2.default, {
2525
2528
  className: 'content',
2529
+ placement: 'rightBottom',
2526
2530
  newType: 'positive',
2527
2531
  bordered: true,
2528
2532
  placeholder: '\u8BF7\u8F93\u51656\u4F4D\u6570\u5B57\u5BC6\u7801',
@@ -2900,6 +2904,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2900
2904
  id: 'paymentAmount',
2901
2905
  className: 'content',
2902
2906
  type: 'text',
2907
+ bordered: true,
2908
+ placement: 'rightBottom',
2903
2909
  placeholder: '\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D',
2904
2910
  disabled: paymode.value < 0,
2905
2911
  defaultValue: that.getXianjinPayment(paymode.paymentType, paymode.value),
@@ -2971,6 +2977,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2971
2977
  _react2.default.createElement(_numKeyboardScan2.default, {
2972
2978
  className: 'content ',
2973
2979
  type: 'text',
2980
+ bordered: true,
2974
2981
  placeholder: '\u626B\u63CF\u6216\u8F93\u5165\u4ED8\u6B3E\u7801',
2975
2982
  ref: function ref(input) {
2976
2983
  return that['inputS' + paymode.paymethodId] = input;
@@ -3197,6 +3204,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3197
3204
  _this2.handleShowPrototype();
3198
3205
  _this2.setState({
3199
3206
  prototypeVisible: true,
3207
+ isNotAutoFocus: true,
3200
3208
  isPrototypeClick: true
3201
3209
  });
3202
3210
  };
@@ -3256,6 +3264,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3256
3264
  _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
3257
3265
  _this2.setTimer = null;
3258
3266
  _this2.keypressStime = null;
3267
+ _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
3259
3268
  return _this2;
3260
3269
  }
3261
3270
 
@@ -3365,11 +3374,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3365
3374
  //jfdx
3366
3375
 
3367
3376
 
3368
- /**
3369
- *
3370
- * @param {*} thePaymodes 支付方式列表
3371
- * @param {*} currenIndex 当前支付方式下标
3372
- * @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
3377
+ /**
3378
+ *
3379
+ * @param {*} thePaymodes 支付方式列表
3380
+ * @param {*} currenIndex 当前支付方式下标
3381
+ * @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
3373
3382
  */
3374
3383
 
3375
3384
  // 处理客显显示功能
@@ -3495,7 +3504,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3495
3504
  storageValue = _state2.storageValue,
3496
3505
  czkValue = _state2.czkValue,
3497
3506
  newPassConfirm = _state2.newPassConfirm,
3498
- newPass = _state2.newPass;
3507
+ newPass = _state2.newPass,
3508
+ isNotAutoFocus = _state2.isNotAutoFocus;
3499
3509
 
3500
3510
  var _ref30 = _mutantsUtil.platform || {},
3501
3511
  isNewRetailBCPos = _ref30.isNewRetailBCPos;
@@ -3718,10 +3728,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3718
3728
  var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
3719
3729
  return _react2.default.createElement(
3720
3730
  _button2.default,
3721
- { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
3731
+ {
3732
+ className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }),
3733
+ key: 'paymentType_' + p.paymentType,
3734
+ onClick: function onClick() {
3722
3735
  _this8.btnDebounced(p.paymentType, true);
3723
3736
  },
3724
- disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
3737
+ disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
3738
+ },
3725
3739
  _react2.default.createElement(
3726
3740
  'div',
3727
3741
  { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3742,22 +3756,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3742
3756
  this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
3743
3757
  )
3744
3758
  ),
3745
- type != 1 && !newStyle && _react2.default.createElement(
3759
+ !newStyle && _react2.default.createElement(
3746
3760
  _drawer2.default,
3747
3761
  {
3748
3762
  title: '\u590D\u5408\u7ED3\u7B97',
3749
3763
  width: '600px',
3750
3764
  placement: 'right',
3751
- maskClosable: false,
3765
+ maskClosable: true,
3752
3766
  closable: false,
3753
3767
  onClose: this.handleCancel,
3754
3768
  visible: this.state.visible,
3755
3769
  destroyOnClose: true,
3756
- className: 'settlement-wraper'
3770
+ className: 'settlement-wraper',
3771
+ style: { 'zIndex': 1006 }
3757
3772
  },
3758
3773
  _react2.default.createElement(
3759
3774
  'div',
3760
- { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5') },
3775
+ { className: 'settlement ' + _index.hotKey.hotKeyBindClass('5'), style: { height: '100%', paddingBottom: '68px' } },
3761
3776
  _react2.default.createElement(
3762
3777
  'div',
3763
3778
  { className: (0, _classnames4.default)({ "toolbar bg-subsidiary-gray-color4": true, "carousel": paymodes.length > carouselStart }) },
@@ -3772,7 +3787,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3772
3787
  ),
3773
3788
  _react2.default.createElement(
3774
3789
  'div',
3775
- { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px' } },
3790
+ { className: 'paydetail', style: { maxHeight: document.body.clientHeight - (paymodes.length > 6 ? 275 : 200) + 'px', height: 'calc(100% - 198px)' } },
3776
3791
  _react2.default.createElement(
3777
3792
  'div',
3778
3793
  { className: 'left' },
@@ -3802,7 +3817,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3802
3817
  mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
3803
3818
  className: _index.hotKey.hotKeyNotFilter(),
3804
3819
  onClick: function onClick() {
3805
- _this8.editModal(index, mode.paymentType, boriginReturn);
3820
+ _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
3806
3821
  }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
3807
3822
  className: _index.hotKey.hotKeyNotFilter(),
3808
3823
  value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -3866,7 +3881,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3866
3881
  (0, _utils.getFixedNumber)(mode.balance)
3867
3882
  ),
3868
3883
  _react2.default.createElement('br', null),
3869
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3884
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
3870
3885
  _button2.default,
3871
3886
  { onClick: function onClick() {
3872
3887
  _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -3959,7 +3974,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3959
3974
  )
3960
3975
  )
3961
3976
  ),
3962
- !isReturn && _react2.default.createElement(
3977
+ type != 1 && !isReturn && _react2.default.createElement(
3963
3978
  'div',
3964
3979
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
3965
3980
  '\u4F18\u60E0\u660E\u7EC6',
@@ -3998,18 +4013,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3998
4013
  )
3999
4014
  )
4000
4015
  ),
4001
- type != 1 && newStyle && _react2.default.createElement(
4016
+ newStyle && _react2.default.createElement(
4002
4017
  _drawer2.default,
4003
4018
  {
4004
4019
  title: '\u590D\u5408\u7ED3\u7B97',
4005
4020
  width: '600px',
4006
4021
  placement: 'right',
4007
- maskClosable: false,
4022
+ maskClosable: true,
4008
4023
  closable: false,
4009
4024
  onClose: this.handleCancel,
4010
4025
  visible: this.state.visible,
4011
4026
  destroyOnClose: true,
4012
- className: 'settlement-wraper'
4027
+ className: 'settlement-wraper',
4028
+ style: { 'zIndex': 1006 }
4013
4029
  },
4014
4030
  _react2.default.createElement(
4015
4031
  'div',
@@ -4094,7 +4110,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4094
4110
  )
4095
4111
  )
4096
4112
  ),
4097
- !isReturn && _react2.default.createElement(
4113
+ type != 1 && !isReturn && _react2.default.createElement(
4098
4114
  'div',
4099
4115
  { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
4100
4116
  '\u4F18\u60E0\u660E\u7EC6',
@@ -4116,12 +4132,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4116
4132
  return m.paymentType === PayStyle.smzf;
4117
4133
  });
4118
4134
  //同时存在微信、支付宝(或者收钱吧)、扫码支付三种方式,在非退货模式下,隐藏微信、支付宝。
4119
- var hotkeyIndex = index;
4135
+ var hotkeyIndex = mindex;
4120
4136
  if (!isReturn && hasSMZF) {
4121
4137
  if (mode.paymentType == PayStyle.wx || mode.paymentType == PayStyle.zfb) {
4122
4138
  return null;
4123
4139
  } else {
4124
- var theArr = (0, _filter3.default)(paymode.paymodes, function (t) {
4140
+ var theArr = (0, _filter3.default)(thePaymodes, function (t) {
4125
4141
  return t.paymentType != PayStyle.wx && t.paymentType != PayStyle.zfb;
4126
4142
  });
4127
4143
  hotkeyIndex = (0, _findIndex3.default)(theArr, function (m) {
@@ -4129,6 +4145,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4129
4145
  });
4130
4146
  }
4131
4147
  }
4148
+ var hyczkFindIndex = (0, _findIndex3.default)(thePaymodes, function (m) {
4149
+ return m.paymentType == PayStyle.hyczk;
4150
+ });
4151
+ var hyczkList = (0, _filter3.default)(thePaymodes, function (m) {
4152
+ return m.paymentType == PayStyle.hyczk;
4153
+ });
4154
+ var lastStorageCardIndex = 0;
4155
+ (0, _map3.default)(thePaymodes, function (m, i) {
4156
+ if (m.paymentType === PayStyle.hyczk) lastStorageCardIndex = i;
4157
+ });
4158
+ if (mindex > 0 && hyczkList.length > 1 && mindex > lastStorageCardIndex) {
4159
+ hotkeyIndex = hotkeyIndex - hyczkList.length + 1;
4160
+ }
4161
+
4162
+ console.log(thePaymodes);
4163
+
4132
4164
  var index = mode.paymethodId;
4133
4165
  return mode.paymentType == PayStyle.hyczk && (0, _findIndex3.default)(thePaymodes, function (m) {
4134
4166
  return m.paymentType == PayStyle.hyczk;
@@ -4165,16 +4197,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4165
4197
  className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
4166
4198
  disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
4167
4199
  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) {
4200
+ if (type != 1 && mode.paymentType == PayStyle.hyczk) {
4178
4201
  if (themodeHyczk && themodeHyczk.length === 0) {
4179
4202
  _this8.onHotKeyClick1(mode, index, boriginReturn);
4180
4203
  }
@@ -4230,10 +4253,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4230
4253
  null,
4231
4254
  '\u5361\u53F7\uFF1A'
4232
4255
  ),
4233
- _react2.default.createElement(
4256
+ type != 1 ? _react2.default.createElement(
4234
4257
  'span',
4235
4258
  null,
4236
4259
  m && m.storageCardNo
4260
+ ) : _react2.default.createElement(
4261
+ 'span',
4262
+ null,
4263
+ m.member && m.member.cardNo
4237
4264
  ),
4238
4265
  _react2.default.createElement(
4239
4266
  'span',
@@ -4246,7 +4273,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4246
4273
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4247
4274
  ),
4248
4275
  _react2.default.createElement('br', null),
4249
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4276
+ type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4250
4277
  _button2.default,
4251
4278
  { onClick: function onClick() {
4252
4279
  return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4290,504 +4317,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4290
4317
  )
4291
4318
  )
4292
4319
  ),
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
4320
  _react2.default.createElement(
4792
4321
  _modal2.default,
4793
4322
  {
@@ -4800,6 +4329,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4800
4329
  onCancel: this.handleCzkCancel,
4801
4330
  keyboard: false,
4802
4331
  centered: !this.isHorizontalPad ? true : false,
4332
+ zIndex: 1007,
4803
4333
  footer: _react2.default.createElement(
4804
4334
  'div',
4805
4335
  { className: 'action' },
@@ -5077,6 +4607,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5077
4607
  onCancel: this.handleMoreCzkCancel,
5078
4608
  keyboard: false,
5079
4609
  centered: !this.isHorizontalPad ? true : false,
4610
+ zIndex: 1007,
5080
4611
  footer: _react2.default.createElement(
5081
4612
  'div',
5082
4613
  { className: 'action' },
@@ -5118,7 +4649,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5118
4649
  onCancel: this.handleSetPwdCancel,
5119
4650
  keyboard: false,
5120
4651
  centered: !this.isHorizontalPad ? true : false,
5121
- title: '\u8BBE\u7F6E\u5BC6\u7801'
4652
+ title: '\u8BBE\u7F6E\u5BC6\u7801',
4653
+ zIndex: 1007
5122
4654
  }, 'footer', _react2.default.createElement(
5123
4655
  'div',
5124
4656
  { className: 'action' },
@@ -5214,6 +4746,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5214
4746
  onCancel: this.handleDjqCancel,
5215
4747
  centered: !this.isHorizontalPad ? true : false,
5216
4748
  title: Differentiate.COUPON + '支付',
4749
+ zIndex: 1007,
5217
4750
  footer: _react2.default.createElement(
5218
4751
  'div',
5219
4752
  { className: 'action' },
@@ -5536,6 +5069,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5536
5069
  centered: !this.isHorizontalPad ? true : false,
5537
5070
  title: "积分抵现",
5538
5071
  destroyOnClose: true,
5072
+ zIndex: 1007,
5539
5073
  footer: _react2.default.createElement(
5540
5074
  'div',
5541
5075
  { className: 'action' },
@@ -5708,7 +5242,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5708
5242
  ),
5709
5243
  _react2.default.createElement(_index3.default, { discount: {
5710
5244
  discountTotalAmount: discountTotalAmount, discountRetailTotalAount: discountRetailTotalAount, discountPrototypeTotalAmount: discountPrototypeTotalAmount
5711
- }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible })
5245
+ }, handleprototypeCancel: this.handleprototypeCancel, isHorizontalPad: this.isHorizontalPad, dataSource: dataSource, prototypeVisible: this.state.prototypeVisible, isNotAutoFocus: isNotAutoFocus })
5712
5246
  );
5713
5247
  }
5714
5248
  }]);