tplus-components-touch 3.31.3 → 3.31.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/components/billSearch/index.js +156 -18
  2. package/dist/components/billSearch/index.js.map +1 -1
  3. package/dist/components/billSearch/index.less +6 -3
  4. package/dist/components/cloudPrint/api.js +85 -43
  5. package/dist/components/cloudPrint/api.js.map +1 -1
  6. package/dist/components/cloudPrint/printDispatch.js +213 -108
  7. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  8. package/dist/components/inventorySearch/tab.js +77 -67
  9. package/dist/components/inventorySearch/tab.js.map +1 -1
  10. package/dist/components/keyboard/numberButton_input.js +4 -2
  11. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  12. package/dist/components/keyboard/onlyLetterButton2.less +35 -40
  13. package/dist/components/progressState/EmptyAndErrorView.js +4 -3
  14. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  15. package/dist/components/progressState/ProgressState.js +2 -1
  16. package/dist/components/progressState/ProgressState.js.map +1 -1
  17. package/dist/components/settlement/settlement.js +9 -4
  18. package/dist/components/settlement/settlement.js.map +1 -1
  19. package/dist/components/settlement/settlementStore.js +44 -37
  20. package/dist/components/settlement/settlementStore.js.map +1 -1
  21. package/dist/components/touchTable/index.js +4 -3
  22. package/dist/components/touchTable/index.js.map +1 -1
  23. package/dist/components/touchTable/index.less +20 -13
  24. package/dist/index.js +14 -2
  25. package/dist/index.js.map +1 -1
  26. package/package.json +35 -35
package/dist/components/settlement/settlementStore.js CHANGED
@@ -465,7 +465,7 @@ var SettlementStore = (_class = function () {
465
465
  }
466
466
  }, {
467
467
  key: 'init',
468
- value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data) {
468
+ value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
469
469
  var _this3 = this;
470
470
 
471
471
  this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
@@ -481,9 +481,15 @@ var SettlementStore = (_class = function () {
481
481
  if (global.DealSingleRowAmountSettingProcessorBlock) {
482
482
  global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
483
483
  }
484
+
485
+ var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
486
+ PayStyle = _enumController$getEn4.PayStyle;
487
+
488
+ var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
489
+
484
490
  // 成交金额抹零
485
491
  if (global.DealAmountSettingProcessorBlock) {
486
- global.DealAmountSettingProcessorBlock.execute(_this3.dto);
492
+ global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
487
493
  }
488
494
  });
489
495
  // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
@@ -533,8 +539,8 @@ var SettlementStore = (_class = function () {
533
539
  value: function initByOriginReturn() {
534
540
  var _this5 = this;
535
541
 
536
- var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
537
- PayStyle = _enumController$getEn4.PayStyle;
542
+ var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
543
+ PayStyle = _enumController$getEn5.PayStyle;
538
544
 
539
545
  var _ref5 = _mutantsUtil.platform || {},
540
546
  isNewRetailBCPos = _ref5.isNewRetailBCPos;
@@ -612,7 +618,7 @@ var SettlementStore = (_class = function () {
612
618
  }, {
613
619
  key: 'quickSettle',
614
620
  value: function quickSettle(key) {
615
- this.addPay(key);
621
+ this.addPay(key, true);
616
622
  }
617
623
 
618
624
  //outer call
@@ -623,8 +629,8 @@ var SettlementStore = (_class = function () {
623
629
  value: function changeFocusAndAddPay(type) {
624
630
  var _this6 = this;
625
631
 
626
- var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
627
- PayStyle = _enumController$getEn5.PayStyle;
632
+ var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
633
+ PayStyle = _enumController$getEn6.PayStyle;
628
634
 
629
635
  this.paymode.currentFocus = type;
630
636
  if (this.paymode.currentMode) {
@@ -836,8 +842,8 @@ var SettlementStore = (_class = function () {
836
842
  }, {
837
843
  key: 'setCurrentMode',
838
844
  value: function setCurrentMode(id, type, append) {
839
- var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
840
- PayStyle = _enumController$getEn6.PayStyle;
845
+ var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
846
+ PayStyle = _enumController$getEn7.PayStyle;
841
847
 
842
848
  var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
843
849
  if (mode) {
@@ -855,8 +861,8 @@ var SettlementStore = (_class = function () {
855
861
  value: function afterSetCurrentMode(type) {
856
862
  var _this8 = this;
857
863
 
858
- var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
859
- PayStyle = _enumController$getEn7.PayStyle;
864
+ var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
865
+ PayStyle = _enumController$getEn8.PayStyle;
860
866
 
861
867
  if (type == PayStyle.djq) {
862
868
  this.paymode.calcDjqValue();
@@ -891,9 +897,9 @@ var SettlementStore = (_class = function () {
891
897
  }
892
898
  }, {
893
899
  key: 'genNewMode',
894
- value: function genNewMode(type, notwithm, v) {
895
- var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
896
- PayStyle = _enumController$getEn8.PayStyle;
900
+ value: function genNewMode(type, notwithm, v, isQuick) {
901
+ var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
902
+ PayStyle = _enumController$getEn9.PayStyle;
897
903
 
898
904
  var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
899
905
  var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
@@ -939,8 +945,8 @@ var SettlementStore = (_class = function () {
939
945
  value: function setMaxAmount(type, mode) {
940
946
  var _this9 = this;
941
947
 
942
- var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
943
- PayStyle = _enumController$getEn9.PayStyle;
948
+ var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
949
+ PayStyle = _enumController$getEn10.PayStyle;
944
950
 
945
951
  var sum = 0;
946
952
  if (type == PayStyle.hyczk) {
@@ -1016,8 +1022,8 @@ var SettlementStore = (_class = function () {
1016
1022
  }, {
1017
1023
  key: 'addPayDirectly',
1018
1024
  value: function addPayDirectly(pay) {
1019
- var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
1020
- PayStyle = _enumController$getEn10.PayStyle;
1025
+ var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
1026
+ PayStyle = _enumController$getEn11.PayStyle;
1021
1027
 
1022
1028
  if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
1023
1029
  var pos = this.paymode.thePaymodes.length;
@@ -1034,9 +1040,9 @@ var SettlementStore = (_class = function () {
1034
1040
  }
1035
1041
  }, {
1036
1042
  key: 'addPay',
1037
- value: function addPay(type) {
1038
- var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
1039
- PayStyle = _enumController$getEn11.PayStyle;
1043
+ value: function addPay(type, isQuick) {
1044
+ var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1045
+ PayStyle = _enumController$getEn12.PayStyle;
1040
1046
 
1041
1047
  var pos = this.paymode.thePaymodes.length;
1042
1048
  if (type == PayStyle.hyczk) {
@@ -1046,14 +1052,15 @@ var SettlementStore = (_class = function () {
1046
1052
  pos = index == -1 ? pos : index + 1;
1047
1053
  }
1048
1054
  // this.paymode.thePaymodes.push(this.genNewMode(type) );
1049
- this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
1055
+
1056
+ this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
1050
1057
  this.paymode.calcReserved();
1051
1058
  }
1052
1059
  }, {
1053
1060
  key: 'delPay',
1054
1061
  value: function delPay(index) {
1055
- var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1056
- PayStyle = _enumController$getEn12.PayStyle;
1062
+ var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
1063
+ PayStyle = _enumController$getEn13.PayStyle;
1057
1064
 
1058
1065
  (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
1059
1066
  return mode.paymethodId === index;
@@ -1153,8 +1160,8 @@ var SettlementStore = (_class = function () {
1153
1160
  value: function saveMember() {
1154
1161
  var _this10 = this;
1155
1162
 
1156
- var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
1157
- PayStyle = _enumController$getEn13.PayStyle;
1163
+ var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1164
+ PayStyle = _enumController$getEn14.PayStyle;
1158
1165
 
1159
1166
  (0, _mobx.runInAction)(function () {
1160
1167
  _this10.dto.StorageMutiSettleDetails = [];
@@ -1198,13 +1205,13 @@ var SettlementStore = (_class = function () {
1198
1205
  var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1199
1206
  var _this11 = this;
1200
1207
 
1201
- var _enumController$getEn14, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1208
+ var _enumController$getEn15, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1202
1209
 
1203
1210
  return _regenerator2.default.wrap(function _callee4$(_context4) {
1204
1211
  while (1) {
1205
1212
  switch (_context4.prev = _context4.next) {
1206
1213
  case 0:
1207
- _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
1214
+ _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
1208
1215
 
1209
1216
  (0, _mobx.runInAction)(function () {
1210
1217
  _this11.dto.RetailPaymentDetails = [];
@@ -1843,9 +1850,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
1843
1850
  var _ref20 = _mutantsUtil.platform || {},
1844
1851
  isNewRetailBCPos = _ref20.isNewRetailBCPos;
1845
1852
 
1846
- var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1847
- PayStyle = _enumController$getEn15.PayStyle,
1848
- Differentiate = _enumController$getEn15.Differentiate;
1853
+ var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1854
+ PayStyle = _enumController$getEn16.PayStyle,
1855
+ Differentiate = _enumController$getEn16.Differentiate;
1849
1856
 
1850
1857
  if (q1) {
1851
1858
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2009,8 +2016,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2009
2016
  var _ref22 = _mutantsUtil.platform || {},
2010
2017
  isNewRetailBCPos = _ref22.isNewRetailBCPos;
2011
2018
 
2012
- var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
2013
- Differentiate = _enumController$getEn16.Differentiate;
2019
+ var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
2020
+ Differentiate = _enumController$getEn17.Differentiate;
2014
2021
 
2015
2022
  if (q1) {
2016
2023
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2072,8 +2079,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2072
2079
  this.currentMode.errinfo = '';
2073
2080
  var sum = this.amount;
2074
2081
 
2075
- var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
2076
- PayStyle = _enumController$getEn17.PayStyle;
2082
+ var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
2083
+ PayStyle = _enumController$getEn18.PayStyle;
2077
2084
 
2078
2085
  this.thePaymodes && this.thePaymodes.forEach(function (mode) {
2079
2086
  if (mode.paymentType === PayStyle.hyczk) {
@@ -2100,13 +2107,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
2100
2107
  var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(type, isIntegralExchange) {
2101
2108
  var _this17 = this;
2102
2109
 
2103
- var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2110
+ var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2104
2111
 
2105
2112
  return _regenerator2.default.wrap(function _callee10$(_context10) {
2106
2113
  while (1) {
2107
2114
  switch (_context10.prev = _context10.next) {
2108
2115
  case 0:
2109
- _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
2116
+ _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
2110
2117
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
2111
2118
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
2112
2119
  _context10.next = 5;