tplus-components-touch 3.28.7 → 3.28.8

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 (197) 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 +14 -14
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +7 -7
  20. package/dist/components/billSearch/api.js +37 -98
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +173 -42
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +376 -373
  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 +85 -43
  28. package/dist/components/cloudPrint/api.js.map +1 -1
  29. package/dist/components/cloudPrint/index.js.map +1 -1
  30. package/dist/components/cloudPrint/printDispatch.js +209 -108
  31. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  32. package/dist/components/commonForm/addressPicker/index.js +14 -23
  33. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  34. package/dist/components/commonForm/addressPicker/style.less +10 -10
  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 +7 -13
  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 +7 -7
  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 +0 -52
  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 +6 -6
  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 +27 -27
  66. package/dist/components/input/style.less +99 -106
  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 +76 -67
  80. package/dist/components/inventorySearch/tab.js.map +1 -1
  81. package/dist/components/keyboard/index.js.map +1 -1
  82. package/dist/components/keyboard/index.less +469 -469
  83. package/dist/components/keyboard/letterKeyboard.js +2 -2
  84. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  85. package/dist/components/keyboard/numKeyboard.js +4 -4
  86. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  87. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  88. package/dist/components/keyboard/numberButton_input.js +9 -7
  89. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  90. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  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 -161
  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 +12 -12
  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 -70
  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/prototypeTable/index.js.map +1 -1
  153. package/dist/components/settlement/prototypeTable/style.less +58 -58
  154. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  155. package/dist/components/settlement/settlement.js +80 -240
  156. package/dist/components/settlement/settlement.js.map +1 -1
  157. package/dist/components/settlement/settlement.less +1594 -1600
  158. package/dist/components/settlement/settlementStore.js +105 -135
  159. package/dist/components/settlement/settlementStore.js.map +1 -1
  160. package/dist/components/settlement/utils.js.map +1 -1
  161. package/dist/components/socket/index.js +11 -11
  162. package/dist/components/socket/index.js.map +1 -1
  163. package/dist/components/spin/index.js +6 -6
  164. package/dist/components/spin/index.js.map +1 -1
  165. package/dist/components/spin/spin-style.less +436 -436
  166. package/dist/components/test/index.js +3 -3
  167. package/dist/components/test/index.js.map +1 -1
  168. package/dist/components/ticon/iconfont/demo_index.html +5202 -5225
  169. package/dist/components/ticon/iconfont/iconfont.css +887 -891
  170. package/dist/components/ticon/iconfont/iconfont.js +1 -1
  171. package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
  172. package/dist/components/ticon/iconfont/iconfont.json +1535 -1542
  173. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  174. package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
  175. package/dist/components/ticon/iconfont/iconfont.woff +0 -0
  176. package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
  177. package/dist/components/ticon/index.js.map +1 -1
  178. package/dist/components/touchScroll/index.js +9 -9
  179. package/dist/components/touchScroll/index.js.map +1 -1
  180. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  181. package/dist/components/touchTable/generateWater.js.map +1 -1
  182. package/dist/components/touchTable/index.js +13 -21
  183. package/dist/components/touchTable/index.js.map +1 -1
  184. package/dist/components/touchTable/index.less +376 -369
  185. package/dist/components/touchTable/utils.js.map +1 -1
  186. package/dist/demo/PopOverDemo.js.map +1 -1
  187. package/dist/index.js +20 -13
  188. package/dist/index.js.map +1 -1
  189. package/dist/util/tools.js.map +1 -1
  190. package/locales/zh/tplus-components-touch.json +1 -1
  191. package/locales/zh-CN/tplus-components-touch.json +1 -1
  192. package/mocks/memberInfo.json +79 -79
  193. package/package.json +35 -35
  194. package/tsconfig.json +26 -26
  195. package/dist/components/presale/pickup.js +0 -431
  196. package/dist/components/presale/pickup.js.map +0 -1
  197. package/dist/components/presale/style.less +0 -48
@@ -234,7 +234,7 @@ var SettlementStore = (_class = function () {
234
234
  }
235
235
  detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
236
236
  detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
237
- //}
237
+ //}
238
238
  detailDTO.taxRate = item.TaxRate;
239
239
  detailDTO.quantity = item.Quantity;
240
240
 
@@ -307,18 +307,6 @@ var SettlementStore = (_class = function () {
307
307
  return (0, _tplusApi.ccApi)({}, '/marketingtool/paygift/executeRightsForPos/' + _this2.billID, false, false, { method: 'get', timeout_skip: true });
308
308
  };
309
309
 
310
- this.getRefWareHouseList = function () {
311
- return (0, _tplusApi.ccApi)({}, '/retail/RetailPos/getRefWareHouseList', false, false);
312
- };
313
-
314
- this.getPerformanceDistributionValue = function (data) {
315
- return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPerformanceDistributionValue', false, false);
316
- };
317
-
318
- this.getPosFreight = function (data) {
319
- return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
320
- };
321
-
322
310
  this.checkCoupon = function () {
323
311
  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
324
312
  var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
@@ -437,7 +425,7 @@ var SettlementStore = (_class = function () {
437
425
  }
438
426
  }, {
439
427
  key: 'init',
440
- value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data) {
428
+ value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
441
429
  var _this3 = this;
442
430
 
443
431
  this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
@@ -453,39 +441,20 @@ var SettlementStore = (_class = function () {
453
441
  if (global.DealSingleRowAmountSettingProcessorBlock) {
454
442
  global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
455
443
  }
444
+
445
+ var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
446
+ PayStyle = _enumController$getEn4.PayStyle;
447
+
448
+ var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
449
+
456
450
  // 成交金额抹零
457
451
  if (global.DealAmountSettingProcessorBlock) {
458
- global.DealAmountSettingProcessorBlock.execute(_this3.dto);
452
+ global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
459
453
  }
460
454
  });
461
455
  // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
462
456
  this.member = this.dto.Member; //stores.selectMemberStore.selectMemberInfo;
463
-
464
- //预订按比例收取订金处理
465
- var value = this.dto.TotalTaxAmount;
466
-
467
- var _getLoginInfo = this.getLoginInfo(),
468
- PreSellOrBook = _getLoginInfo.PreSellOrBook,
469
- PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
470
-
471
- var _ref5 = this.dto || {},
472
- IdbusiType = _ref5.IdbusiType,
473
- DistributionMode = _ref5.DistributionMode;
474
-
475
- if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
476
- value = value * PercentageWhenBook / 100;
477
- (0, _mobx.runInAction)(function () {
478
- _this3.dto.PrepaidAmount = value;
479
- });
480
- }
481
- if (IdbusiType == 38 && PreSellOrBook != 'DISABLED' && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
482
- value += this.dto.BuyerPayFreight || 0;
483
- }
484
- if (IdbusiType == 39) {
485
- value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
486
- }
487
-
488
- this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
457
+ this.brefund = this.paymode.setAmount(this.dto.TotalTaxAmount, this.dto.OnlinePaymentAmount);
489
458
  } else {
490
459
  this.brefund = this.paymode.setAmount(amount, 0);
491
460
  this.dto = data;
@@ -530,11 +499,11 @@ var SettlementStore = (_class = function () {
530
499
  value: function initByOriginReturn() {
531
500
  var _this5 = this;
532
501
 
533
- var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
534
- PayStyle = _enumController$getEn4.PayStyle;
502
+ var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
503
+ PayStyle = _enumController$getEn5.PayStyle;
535
504
 
536
- var _ref6 = _mutantsUtil.platform || {},
537
- isNewRetailBCPos = _ref6.isNewRetailBCPos;
505
+ var _ref5 = _mutantsUtil.platform || {},
506
+ isNewRetailBCPos = _ref5.isNewRetailBCPos;
538
507
 
539
508
  console.log(this.dto, 'dto==========');
540
509
  this.paymode.checkList = [];
@@ -559,14 +528,14 @@ var SettlementStore = (_class = function () {
559
528
  if (themode.paymentType == PayStyle.djq) {
560
529
  (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
561
530
  if (isNewRetailBCPos) {
562
- var _ref7 = djq || {},
563
- displayText = _ref7.displayText,
564
- promoRuleId = _ref7.promoRuleId,
565
- dateMount = _ref7.dateMount,
566
- promoMethodEnum = _ref7.promoMethodEnum,
567
- discountPct = _ref7.discountPct,
568
- promoId = _ref7.promoId,
569
- id = _ref7.id;
531
+ var _ref6 = djq || {},
532
+ displayText = _ref6.displayText,
533
+ promoRuleId = _ref6.promoRuleId,
534
+ dateMount = _ref6.dateMount,
535
+ promoMethodEnum = _ref6.promoMethodEnum,
536
+ discountPct = _ref6.discountPct,
537
+ promoId = _ref6.promoId,
538
+ id = _ref6.id;
570
539
 
571
540
  _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
572
541
  return;
@@ -599,7 +568,7 @@ var SettlementStore = (_class = function () {
599
568
  }, {
600
569
  key: 'quickSettle',
601
570
  value: function quickSettle(key) {
602
- this.addPay(key);
571
+ this.addPay(key, true);
603
572
  }
604
573
 
605
574
  //outer call
@@ -610,8 +579,8 @@ var SettlementStore = (_class = function () {
610
579
  value: function changeFocusAndAddPay(type) {
611
580
  var _this6 = this;
612
581
 
613
- var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
614
- PayStyle = _enumController$getEn5.PayStyle;
582
+ var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
583
+ PayStyle = _enumController$getEn6.PayStyle;
615
584
 
616
585
  this.paymode.currentFocus = type;
617
586
  if (this.paymode.currentMode) {
@@ -665,8 +634,8 @@ var SettlementStore = (_class = function () {
665
634
  var IdStore = this.storeInfo.storeID;
666
635
  var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
667
636
 
668
- var _ref8 = _mutantsUtil.platform || {},
669
- isNewRetailBCPos = _ref8.isNewRetailBCPos;
637
+ var _ref7 = _mutantsUtil.platform || {},
638
+ isNewRetailBCPos = _ref7.isNewRetailBCPos;
670
639
 
671
640
  var address = '';
672
641
  if (isNewRetailBCPos) {
@@ -676,8 +645,8 @@ var SettlementStore = (_class = function () {
676
645
  var data = result.data;
677
646
  var m = data;
678
647
 
679
- var _ref9 = _mutantsUtil.platform || {},
680
- isNewRetailBCPos = _ref9.isNewRetailBCPos;
648
+ var _ref8 = _mutantsUtil.platform || {},
649
+ isNewRetailBCPos = _ref8.isNewRetailBCPos;
681
650
 
682
651
  if (isNewRetailBCPos) {
683
652
  _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -722,8 +691,8 @@ var SettlementStore = (_class = function () {
722
691
  var data = JSON.parse(result.Data);
723
692
  var m = data && data.length > 0 && data[0];
724
693
 
725
- var _ref10 = _mutantsUtil.platform || {},
726
- isNewRetailBCPos = _ref10.isNewRetailBCPos;
694
+ var _ref9 = _mutantsUtil.platform || {},
695
+ isNewRetailBCPos = _ref9.isNewRetailBCPos;
727
696
 
728
697
  if (isNewRetailBCPos) {
729
698
  _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -792,8 +761,8 @@ var SettlementStore = (_class = function () {
792
761
  }, {
793
762
  key: 'setCurrentMode',
794
763
  value: function setCurrentMode(id, type, append) {
795
- var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
796
- PayStyle = _enumController$getEn6.PayStyle;
764
+ var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
765
+ PayStyle = _enumController$getEn7.PayStyle;
797
766
 
798
767
  var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
799
768
  if (mode) {
@@ -811,8 +780,8 @@ var SettlementStore = (_class = function () {
811
780
  value: function afterSetCurrentMode(type) {
812
781
  var _this8 = this;
813
782
 
814
- var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
815
- PayStyle = _enumController$getEn7.PayStyle;
783
+ var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
784
+ PayStyle = _enumController$getEn8.PayStyle;
816
785
 
817
786
  if (type == PayStyle.djq) {
818
787
  this.paymode.calcDjqValue();
@@ -847,9 +816,9 @@ var SettlementStore = (_class = function () {
847
816
  }
848
817
  }, {
849
818
  key: 'genNewMode',
850
- value: function genNewMode(type, notwithm, v) {
851
- var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
852
- PayStyle = _enumController$getEn8.PayStyle;
819
+ value: function genNewMode(type, notwithm, v, isQuick) {
820
+ var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
821
+ PayStyle = _enumController$getEn9.PayStyle;
853
822
 
854
823
  var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
855
824
  var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
@@ -858,9 +827,9 @@ var SettlementStore = (_class = function () {
858
827
  name: themode.name,
859
828
  exchangeRate: themode.exchangeRate,
860
829
  calDirection: themode.calDirection,
861
- value: value,
862
- value2: (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
863
- value3: value,
830
+ value: !isQuick ? 0 : value,
831
+ value2: !isQuick ? 0 : (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
832
+ value3: !isQuick ? 0 : value,
864
833
  order: this.paymode.thePaymodes.length + 1,
865
834
  paymentType: type,
866
835
  djqs: [],
@@ -892,8 +861,8 @@ var SettlementStore = (_class = function () {
892
861
  value: function setMaxAmount(type, mode) {
893
862
  var _this9 = this;
894
863
 
895
- var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
896
- PayStyle = _enumController$getEn9.PayStyle;
864
+ var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
865
+ PayStyle = _enumController$getEn10.PayStyle;
897
866
 
898
867
  var sum = 0;
899
868
  if (type == PayStyle.hyczk) {
@@ -969,8 +938,8 @@ var SettlementStore = (_class = function () {
969
938
  }, {
970
939
  key: 'addPayDirectly',
971
940
  value: function addPayDirectly(pay) {
972
- var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
973
- PayStyle = _enumController$getEn10.PayStyle;
941
+ var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
942
+ PayStyle = _enumController$getEn11.PayStyle;
974
943
 
975
944
  if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
976
945
  var pos = this.paymode.thePaymodes.length;
@@ -987,9 +956,9 @@ var SettlementStore = (_class = function () {
987
956
  }
988
957
  }, {
989
958
  key: 'addPay',
990
- value: function addPay(type) {
991
- var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
992
- PayStyle = _enumController$getEn11.PayStyle;
959
+ value: function addPay(type, isQuick) {
960
+ var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
961
+ PayStyle = _enumController$getEn12.PayStyle;
993
962
 
994
963
  var pos = this.paymode.thePaymodes.length;
995
964
  if (type == PayStyle.hyczk) {
@@ -999,14 +968,15 @@ var SettlementStore = (_class = function () {
999
968
  pos = index == -1 ? pos : index + 1;
1000
969
  }
1001
970
  // this.paymode.thePaymodes.push(this.genNewMode(type) );
1002
- this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
971
+
972
+ this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
1003
973
  this.paymode.calcReserved();
1004
974
  }
1005
975
  }, {
1006
976
  key: 'delPay',
1007
977
  value: function delPay(index) {
1008
- var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1009
- PayStyle = _enumController$getEn12.PayStyle;
978
+ var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
979
+ PayStyle = _enumController$getEn13.PayStyle;
1010
980
 
1011
981
  (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
1012
982
  return mode.paymethodId === index;
@@ -1017,8 +987,8 @@ var SettlementStore = (_class = function () {
1017
987
  }, {
1018
988
  key: 'commit',
1019
989
  value: function () {
1020
- var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
1021
- var _ref12, isNewRetailBCPos;
990
+ var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
991
+ var _ref11, isNewRetailBCPos;
1022
992
 
1023
993
  return _regenerator2.default.wrap(function _callee2$(_context2) {
1024
994
  while (1) {
@@ -1034,7 +1004,7 @@ var SettlementStore = (_class = function () {
1034
1004
  return _context2.abrupt('return', _promise2.default.resolve(true));
1035
1005
 
1036
1006
  case 3:
1037
- _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
1007
+ _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
1038
1008
  _context2.prev = 4;
1039
1009
 
1040
1010
  if (!(this.type == 1)) {
@@ -1090,7 +1060,7 @@ var SettlementStore = (_class = function () {
1090
1060
  }));
1091
1061
 
1092
1062
  function commit(_x2) {
1093
- return _ref11.apply(this, arguments);
1063
+ return _ref10.apply(this, arguments);
1094
1064
  }
1095
1065
 
1096
1066
  return commit;
@@ -1106,8 +1076,8 @@ var SettlementStore = (_class = function () {
1106
1076
  value: function saveMember() {
1107
1077
  var _this10 = this;
1108
1078
 
1109
- var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
1110
- PayStyle = _enumController$getEn13.PayStyle;
1079
+ var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1080
+ PayStyle = _enumController$getEn14.PayStyle;
1111
1081
 
1112
1082
  (0, _mobx.runInAction)(function () {
1113
1083
  _this10.dto.StorageMutiSettleDetails = [];
@@ -1148,16 +1118,16 @@ var SettlementStore = (_class = function () {
1148
1118
  }, {
1149
1119
  key: 'save',
1150
1120
  value: function () {
1151
- var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1121
+ var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1152
1122
  var _this11 = this;
1153
1123
 
1154
- var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1124
+ var _enumController$getEn15, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1155
1125
 
1156
1126
  return _regenerator2.default.wrap(function _callee3$(_context3) {
1157
1127
  while (1) {
1158
1128
  switch (_context3.prev = _context3.next) {
1159
1129
  case 0:
1160
- _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
1130
+ _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
1161
1131
 
1162
1132
  (0, _mobx.runInAction)(function () {
1163
1133
  _this11.dto.RetailPaymentDetails = [];
@@ -1231,8 +1201,8 @@ var SettlementStore = (_class = function () {
1231
1201
  }
1232
1202
  });
1233
1203
 
1234
- var _ref14 = _mutantsUtil.platform || {},
1235
- isNewRetailBCPos = _ref14.isNewRetailBCPos;
1204
+ var _ref13 = _mutantsUtil.platform || {},
1205
+ isNewRetailBCPos = _ref13.isNewRetailBCPos;
1236
1206
 
1237
1207
  if (_this11.dto.RetailStorageDetails.length > 0) {
1238
1208
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1266,7 +1236,7 @@ var SettlementStore = (_class = function () {
1266
1236
  _this11.dto.Idmember = Idmember;
1267
1237
  }
1268
1238
  });
1269
- _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
1239
+ _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
1270
1240
 
1271
1241
  console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
1272
1242
 
@@ -1336,7 +1306,7 @@ var SettlementStore = (_class = function () {
1336
1306
  }));
1337
1307
 
1338
1308
  function save() {
1339
- return _ref13.apply(this, arguments);
1309
+ return _ref12.apply(this, arguments);
1340
1310
  }
1341
1311
 
1342
1312
  return save;
@@ -1349,7 +1319,7 @@ var SettlementStore = (_class = function () {
1349
1319
  }, {
1350
1320
  key: 'querySettleResult',
1351
1321
  value: function () {
1352
- var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1322
+ var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1353
1323
  return _regenerator2.default.wrap(function _callee4$(_context4) {
1354
1324
  while (1) {
1355
1325
  switch (_context4.prev = _context4.next) {
@@ -1377,7 +1347,7 @@ var SettlementStore = (_class = function () {
1377
1347
  }));
1378
1348
 
1379
1349
  function querySettleResult() {
1380
- return _ref16.apply(this, arguments);
1350
+ return _ref15.apply(this, arguments);
1381
1351
  }
1382
1352
 
1383
1353
  return querySettleResult;
@@ -1403,14 +1373,14 @@ var SettlementStore = (_class = function () {
1403
1373
  }, {
1404
1374
  key: 'validePwd',
1405
1375
  value: function () {
1406
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1407
- var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
1376
+ var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1377
+ var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
1408
1378
 
1409
1379
  return _regenerator2.default.wrap(function _callee5$(_context5) {
1410
1380
  while (1) {
1411
1381
  switch (_context5.prev = _context5.next) {
1412
1382
  case 0:
1413
- _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
1383
+ _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
1414
1384
  _context5.prev = 1;
1415
1385
 
1416
1386
  if (!isNewRetailBCPos) {
@@ -1495,7 +1465,7 @@ var SettlementStore = (_class = function () {
1495
1465
  }));
1496
1466
 
1497
1467
  function validePwd(_x3) {
1498
- return _ref17.apply(this, arguments);
1468
+ return _ref16.apply(this, arguments);
1499
1469
  }
1500
1470
 
1501
1471
  return validePwd;
@@ -1534,14 +1504,14 @@ var SettlementStore = (_class = function () {
1534
1504
  var _this13 = this;
1535
1505
 
1536
1506
  return function () {
1537
- var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1538
- var _getLoginInfo2, IdStore, StoreCode, resp;
1507
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1508
+ var _getLoginInfo, IdStore, StoreCode, resp;
1539
1509
 
1540
1510
  return _regenerator2.default.wrap(function _callee6$(_context6) {
1541
1511
  while (1) {
1542
1512
  switch (_context6.prev = _context6.next) {
1543
1513
  case 0:
1544
- _getLoginInfo2 = _this13.getLoginInfo(), IdStore = _getLoginInfo2.IdStore, StoreCode = _getLoginInfo2.StoreCode;
1514
+ _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1545
1515
  _context6.next = 3;
1546
1516
  return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1547
1517
 
@@ -1561,7 +1531,7 @@ var SettlementStore = (_class = function () {
1561
1531
  }));
1562
1532
 
1563
1533
  return function (_x4) {
1564
- return _ref19.apply(this, arguments);
1534
+ return _ref18.apply(this, arguments);
1565
1535
  };
1566
1536
  }();
1567
1537
  }
@@ -1653,12 +1623,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
1653
1623
  this.checkList = [];
1654
1624
  }
1655
1625
 
1656
- var _ref20 = _mutantsUtil.platform || {},
1657
- isNewRetailBCPos = _ref20.isNewRetailBCPos;
1626
+ var _ref19 = _mutantsUtil.platform || {},
1627
+ isNewRetailBCPos = _ref19.isNewRetailBCPos;
1658
1628
 
1659
- var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1660
- PayStyle = _enumController$getEn15.PayStyle,
1661
- Differentiate = _enumController$getEn15.Differentiate;
1629
+ var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1630
+ PayStyle = _enumController$getEn16.PayStyle,
1631
+ Differentiate = _enumController$getEn16.Differentiate;
1662
1632
 
1663
1633
  if (q1) {
1664
1634
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1728,13 +1698,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
1728
1698
  // }
1729
1699
  // else
1730
1700
  // {
1731
-
1732
1701
  var bookingQuantity = 0;
1733
1702
  if (item.BookingQuantity) {
1734
1703
  bookingQuantity = item.BookingQuantity;
1735
1704
  }
1736
1705
  detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
1737
1706
  detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
1707
+ //}
1738
1708
  detailDTO.taxRate = item.TaxRate;
1739
1709
  detailDTO.quantity = item.Quantity;
1740
1710
 
@@ -1764,18 +1734,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
1764
1734
  }
1765
1735
  });
1766
1736
 
1767
- var _ref21 = element || {},
1768
- couponCode = _ref21.couponCode,
1769
- name = _ref21.name,
1770
- tieredAmountResult = _ref21.tieredAmountResult,
1771
- fromDate = _ref21.fromDate,
1772
- dateMount = _ref21.dateMount,
1773
- promoMethodEnum = _ref21.promoMethodEnum,
1774
- discountPct = _ref21.discountPct,
1775
- nominalAmount = _ref21.nominalAmount,
1776
- promoId = _ref21.promoId,
1777
- id = _ref21.id,
1778
- doorsill = _ref21.doorsill;
1737
+ var _ref20 = element || {},
1738
+ couponCode = _ref20.couponCode,
1739
+ name = _ref20.name,
1740
+ tieredAmountResult = _ref20.tieredAmountResult,
1741
+ fromDate = _ref20.fromDate,
1742
+ dateMount = _ref20.dateMount,
1743
+ promoMethodEnum = _ref20.promoMethodEnum,
1744
+ discountPct = _ref20.discountPct,
1745
+ nominalAmount = _ref20.nominalAmount,
1746
+ promoId = _ref20.promoId,
1747
+ id = _ref20.id,
1748
+ doorsill = _ref20.doorsill;
1779
1749
 
1780
1750
  var condValue = tieredAmountResult.condValue,
1781
1751
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -1819,11 +1789,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
1819
1789
  }, {
1820
1790
  key: 'calcDjqValue',
1821
1791
  value: function calcDjqValue(q1) {
1822
- var _ref22 = _mutantsUtil.platform || {},
1823
- isNewRetailBCPos = _ref22.isNewRetailBCPos;
1792
+ var _ref21 = _mutantsUtil.platform || {},
1793
+ isNewRetailBCPos = _ref21.isNewRetailBCPos;
1824
1794
 
1825
- var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1826
- Differentiate = _enumController$getEn16.Differentiate;
1795
+ var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
1796
+ Differentiate = _enumController$getEn17.Differentiate;
1827
1797
 
1828
1798
  if (q1) {
1829
1799
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1885,8 +1855,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1885
1855
  this.currentMode.errinfo = '';
1886
1856
  var sum = this.amount;
1887
1857
 
1888
- var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
1889
- PayStyle = _enumController$getEn17.PayStyle;
1858
+ var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
1859
+ PayStyle = _enumController$getEn18.PayStyle;
1890
1860
 
1891
1861
  this.thePaymodes && this.thePaymodes.forEach(function (mode) {
1892
1862
  if (mode.paymentType === PayStyle.hyczk) {
@@ -1910,16 +1880,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
1910
1880
  }, {
1911
1881
  key: 'setPaymodes',
1912
1882
  value: function () {
1913
- var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1883
+ var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1914
1884
  var _this15 = this;
1915
1885
 
1916
- var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1886
+ var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1917
1887
 
1918
1888
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1919
1889
  while (1) {
1920
1890
  switch (_context7.prev = _context7.next) {
1921
1891
  case 0:
1922
- _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
1892
+ _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
1923
1893
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
1924
1894
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
1925
1895
  _context7.next = 5;
@@ -1965,7 +1935,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1965
1935
  }));
1966
1936
 
1967
1937
  function setPaymodes(_x5, _x6) {
1968
- return _ref23.apply(this, arguments);
1938
+ return _ref22.apply(this, arguments);
1969
1939
  }
1970
1940
 
1971
1941
  return setPaymodes;
@@ -2086,8 +2056,8 @@ var Member = exports.Member = (_class5 = function () {
2086
2056
  return key == 'canusedbalancestorage';
2087
2057
  });
2088
2058
 
2089
- var _ref24 = _mutantsUtil.platform || {},
2090
- isNewRetailBCPos = _ref24.isNewRetailBCPos;
2059
+ var _ref23 = _mutantsUtil.platform || {},
2060
+ isNewRetailBCPos = _ref23.isNewRetailBCPos;
2091
2061
 
2092
2062
  m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
2093
2063
  m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);