tplus-components-touch 3.33.2 → 3.33.6

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 (188) 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 +29 -29
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +6 -6
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +376 -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.map +1 -1
  35. package/dist/components/commonForm/autoComplete/style.less +2 -2
  36. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  37. package/dist/components/commonForm/datePicker/style.less +4 -4
  38. package/dist/components/commonForm/formControl/index.js.map +1 -1
  39. package/dist/components/commonForm/index.js +4 -4
  40. package/dist/components/commonForm/index.js.map +1 -1
  41. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  42. package/dist/components/commonForm/inputNumber/style.less +10 -10
  43. package/dist/components/commonForm/radio/index.js.map +1 -1
  44. package/dist/components/commonForm/style.less +1 -1
  45. package/dist/components/deliverySearch/api.js +21 -21
  46. package/dist/components/deliverySearch/api.js.map +1 -1
  47. package/dist/components/deliverySearch/index.js +6 -6
  48. package/dist/components/deliverySearch/index.js.map +1 -1
  49. package/dist/components/deliverySearch/index.less +553 -553
  50. package/dist/components/form/index.js.map +1 -1
  51. package/dist/components/hardwareAPI/index.js.map +1 -1
  52. package/dist/components/hotKey/config.js +23 -23
  53. package/dist/components/hotKey/config.js.map +1 -1
  54. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  55. package/dist/components/hotKey/index.js +26 -26
  56. package/dist/components/hotKey/index.js.map +1 -1
  57. package/dist/components/hotKey/localConfig.js.map +1 -1
  58. package/dist/components/hotKey/style.less +96 -96
  59. package/dist/components/hotKey/utils.js.map +1 -1
  60. package/dist/components/input/index.js +6 -6
  61. package/dist/components/input/index.js.map +1 -1
  62. package/dist/components/input/scanInput.js.map +1 -1
  63. package/dist/components/input/scanInput.less +27 -27
  64. package/dist/components/input/style.less +99 -99
  65. package/dist/components/input/tplusInput/index.js +30 -30
  66. package/dist/components/input/tplusInput/index.js.map +1 -1
  67. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  68. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  69. package/dist/components/input/tplusInput/style.less +132 -132
  70. package/dist/components/input/utils/index.js.map +1 -1
  71. package/dist/components/inventorySearch/api.js +58 -58
  72. package/dist/components/inventorySearch/api.js.map +1 -1
  73. package/dist/components/inventorySearch/index.js +3 -3
  74. package/dist/components/inventorySearch/index.js.map +1 -1
  75. package/dist/components/inventorySearch/index.less +119 -119
  76. package/dist/components/inventorySearch/store.js.map +1 -1
  77. package/dist/components/inventorySearch/tab.js.map +1 -1
  78. package/dist/components/keyboard/index.js.map +1 -1
  79. package/dist/components/keyboard/index.less +469 -469
  80. package/dist/components/keyboard/letterKeyboard.js +2 -2
  81. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  82. package/dist/components/keyboard/numKeyboard.js +4 -4
  83. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  84. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  85. package/dist/components/keyboard/numberButton_input.js +5 -5
  86. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  87. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  88. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  89. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  90. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  91. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  92. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  93. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  94. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  95. package/dist/components/keyboard/onlyLetterButton2.less +156 -156
  96. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  97. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  98. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  99. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  100. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  101. package/dist/components/layout/hamburger.js.map +1 -1
  102. package/dist/components/layout/index.js +10 -10
  103. package/dist/components/layout/index.js.map +1 -1
  104. package/dist/components/layout/layout.js.map +1 -1
  105. package/dist/components/layout/sider.js +12 -12
  106. package/dist/components/layout/sider.js.map +1 -1
  107. package/dist/components/layout/style.less +82 -82
  108. package/dist/components/loading/index.js +15 -15
  109. package/dist/components/loading/index.js.map +1 -1
  110. package/dist/components/loading/loadingContent.js.map +1 -1
  111. package/dist/components/loading/style.less +72 -72
  112. package/dist/components/loading/utils.js.map +1 -1
  113. package/dist/components/message/index.js +8 -8
  114. package/dist/components/message/index.js.map +1 -1
  115. package/dist/components/message/index.less +101 -101
  116. package/dist/components/modal/index.js.map +1 -1
  117. package/dist/components/modal/index.less +19 -19
  118. package/dist/components/modalVertical/index.js +7 -7
  119. package/dist/components/modalVertical/index.js.map +1 -1
  120. package/dist/components/modalVertical/style.less +60 -60
  121. package/dist/components/modalWraper/index.js +16 -16
  122. package/dist/components/modalWraper/index.js.map +1 -1
  123. package/dist/components/modalWraper/style.less +257 -257
  124. package/dist/components/modalWraper/utils.js.map +1 -1
  125. package/dist/components/notification/index.js +4 -4
  126. package/dist/components/notification/index.js.map +1 -1
  127. package/dist/components/notification/index.less +51 -51
  128. package/dist/components/overflowTip/index.js +15 -15
  129. package/dist/components/overflowTip/index.js.map +1 -1
  130. package/dist/components/overflowTip/style.less +66 -66
  131. package/dist/components/page/index.js.map +1 -1
  132. package/dist/components/page/index.less +21 -21
  133. package/dist/components/product/detail.js +7 -7
  134. package/dist/components/product/detail.js.map +1 -1
  135. package/dist/components/product/getCard.js +5 -5
  136. package/dist/components/product/getCard.js.map +1 -1
  137. package/dist/components/product/index.less +128 -128
  138. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  139. package/dist/components/progressState/ProgressState.js +10 -10
  140. package/dist/components/progressState/ProgressState.js.map +1 -1
  141. package/dist/components/progressState/index.js.map +1 -1
  142. package/dist/components/progressState/style.less +65 -65
  143. package/dist/components/scan/index.js.map +1 -1
  144. package/dist/components/scan/index.less +33 -33
  145. package/dist/components/select/index.js.map +1 -1
  146. package/dist/components/select/index.less +11 -11
  147. package/dist/components/settlement/asyncModal.js.map +1 -1
  148. package/dist/components/settlement/index.js.map +1 -1
  149. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  150. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  151. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  152. package/dist/components/settlement/prototypeTable/style.less +58 -58
  153. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  154. package/dist/components/settlement/settlement.js +11 -10
  155. package/dist/components/settlement/settlement.js.map +1 -1
  156. package/dist/components/settlement/settlement.less +1686 -1665
  157. package/dist/components/settlement/settlementStore.js +428 -308
  158. package/dist/components/settlement/settlementStore.js.map +1 -1
  159. package/dist/components/settlement/utils.js.map +1 -1
  160. package/dist/components/socket/index.js +11 -11
  161. package/dist/components/socket/index.js.map +1 -1
  162. package/dist/components/spin/index.js +6 -6
  163. package/dist/components/spin/index.js.map +1 -1
  164. package/dist/components/spin/spin-style.less +436 -436
  165. package/dist/components/test/index.js +3 -3
  166. package/dist/components/test/index.js.map +1 -1
  167. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  168. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  169. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  170. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  171. package/dist/components/ticon/index.js.map +1 -1
  172. package/dist/components/touchScroll/index.js +9 -9
  173. package/dist/components/touchScroll/index.js.map +1 -1
  174. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  175. package/dist/components/touchTable/generateWater.js.map +1 -1
  176. package/dist/components/touchTable/index.js +9 -9
  177. package/dist/components/touchTable/index.js.map +1 -1
  178. package/dist/components/touchTable/index.less +376 -376
  179. package/dist/components/touchTable/utils.js.map +1 -1
  180. package/dist/demo/PopOverDemo.js.map +1 -1
  181. package/dist/index.js +7 -7
  182. package/dist/index.js.map +1 -1
  183. package/dist/util/tools.js.map +1 -1
  184. package/locales/zh/tplus-components-touch.json +1 -1
  185. package/locales/zh-CN/tplus-components-touch.json +1 -1
  186. package/mocks/memberInfo.json +79 -79
  187. package/package.json +1 -1
  188. package/tsconfig.json +26 -26
@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
41
41
 
42
42
  var _createClass3 = _interopRequireDefault(_createClass2);
43
43
 
44
- var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
44
+ var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _desc2, _value2, _class3, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _desc3, _value3, _class5, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20;
45
45
 
46
46
  var _mobx = require('mobx');
47
47
 
@@ -427,6 +427,47 @@ var SettlementStore = (_class = function () {
427
427
  };
428
428
  }();
429
429
 
430
+ this.repeatStorageModal = function (content) {
431
+ return new _promise2.default(function (resolve, reject) {
432
+ _tplusComponentsTouch.ModalWraper.confirm({
433
+ title: '',
434
+ okText: '继续储值',
435
+ className: 'repeat-modal',
436
+ zIndex: 1007,
437
+ content: content,
438
+ onOk: function () {
439
+ var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
440
+ return _regenerator2.default.wrap(function _callee2$(_context2) {
441
+ while (1) {
442
+ switch (_context2.prev = _context2.next) {
443
+ case 0:
444
+ _context2.next = 2;
445
+ return _this2.saveMember();
446
+
447
+ case 2:
448
+ resolve(true);
449
+
450
+ case 3:
451
+ case 'end':
452
+ return _context2.stop();
453
+ }
454
+ }
455
+ }, _callee2, _this2);
456
+ }));
457
+
458
+ return function onOk() {
459
+ return _ref5.apply(this, arguments);
460
+ };
461
+ }(),
462
+ onCancel: function onCancel() {
463
+ resolve(false);
464
+ }
465
+ });
466
+ });
467
+ };
468
+
469
+ _initDefineProp(this, 'setVoucherDate', _descriptor5, this);
470
+
430
471
  this.checkIntegralExchangeReturn = function (id) {
431
472
  return new _promise2.default(function (resolve, reject) {
432
473
  (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -542,8 +583,8 @@ var SettlementStore = (_class = function () {
542
583
  var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
543
584
  PayStyle = _enumController$getEn5.PayStyle;
544
585
 
545
- var _ref5 = _mutantsUtil.platform || {},
546
- isNewRetailBCPos = _ref5.isNewRetailBCPos;
586
+ var _ref6 = _mutantsUtil.platform || {},
587
+ isNewRetailBCPos = _ref6.isNewRetailBCPos;
547
588
 
548
589
  console.log(this.dto, 'dto==========');
549
590
  this.paymode.checkList = [];
@@ -568,14 +609,14 @@ var SettlementStore = (_class = function () {
568
609
  if (themode.paymentType == PayStyle.djq) {
569
610
  (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
570
611
  if (isNewRetailBCPos) {
571
- var _ref6 = djq || {},
572
- displayText = _ref6.displayText,
573
- promoRuleId = _ref6.promoRuleId,
574
- dateMount = _ref6.dateMount,
575
- promoMethodEnum = _ref6.promoMethodEnum,
576
- discountPct = _ref6.discountPct,
577
- promoId = _ref6.promoId,
578
- id = _ref6.id;
612
+ var _ref7 = djq || {},
613
+ displayText = _ref7.displayText,
614
+ promoRuleId = _ref7.promoRuleId,
615
+ dateMount = _ref7.dateMount,
616
+ promoMethodEnum = _ref7.promoMethodEnum,
617
+ discountPct = _ref7.discountPct,
618
+ promoId = _ref7.promoId,
619
+ id = _ref7.id;
579
620
 
580
621
  _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);
581
622
  return;
@@ -683,44 +724,44 @@ var SettlementStore = (_class = function () {
683
724
  var IdStore = this.storeInfo.storeID;
684
725
  var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
685
726
 
686
- var _ref7 = _mutantsUtil.platform || {},
687
- isNewRetailBCPos = _ref7.isNewRetailBCPos;
727
+ var _ref8 = _mutantsUtil.platform || {},
728
+ isNewRetailBCPos = _ref8.isNewRetailBCPos;
688
729
 
689
730
  var address = '';
690
731
  if (isNewRetailBCPos) {
691
732
  // address = '/member/memberProfile/FindByStorageCode/'+v;
692
733
  address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
693
734
  return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
694
- var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
735
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
695
736
  var data, m;
696
- return _regenerator2.default.wrap(function _callee2$(_context2) {
737
+ return _regenerator2.default.wrap(function _callee3$(_context3) {
697
738
  while (1) {
698
- switch (_context2.prev = _context2.next) {
739
+ switch (_context3.prev = _context3.next) {
699
740
  case 0:
700
741
  data = result.data;
701
742
  m = data && data.length && data[0];
702
743
 
703
744
  if (!(result && result.data.length)) {
704
- _context2.next = 25;
745
+ _context3.next = 25;
705
746
  break;
706
747
  }
707
748
 
708
749
  if (!(result.data.length === 1)) {
709
- _context2.next = 14;
750
+ _context3.next = 14;
710
751
  break;
711
752
  }
712
753
 
713
754
  if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
714
- _context2.next = 10;
755
+ _context3.next = 10;
715
756
  break;
716
757
  }
717
758
 
718
759
  _this7.paymode.updateCardInfo(m);
719
760
  _this7.handleCzkData(m);
720
- return _context2.abrupt('return', result.data);
761
+ return _context3.abrupt('return', result.data);
721
762
 
722
763
  case 10:
723
- _context2.next = 12;
764
+ _context3.next = 12;
724
765
  return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
725
766
  var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
726
767
  if (data1.enable) {
@@ -733,40 +774,40 @@ var SettlementStore = (_class = function () {
733
774
  });
734
775
 
735
776
  case 12:
736
- _context2.next = 25;
777
+ _context3.next = 25;
737
778
  break;
738
779
 
739
780
  case 14:
740
781
  if (!(result.data && result.data.length === 1)) {
741
- _context2.next = 19;
782
+ _context3.next = 19;
742
783
  break;
743
784
  }
744
785
 
745
786
  _this7.paymode.updateCardInfo(result.data[0]);
746
- return _context2.abrupt('return', result.data);
787
+ return _context3.abrupt('return', result.data);
747
788
 
748
789
  case 19:
749
790
  if (!(result.data && result.data.length > 1)) {
750
- _context2.next = 23;
791
+ _context3.next = 23;
751
792
  break;
752
793
  }
753
794
 
754
- return _context2.abrupt('return', result.data);
795
+ return _context3.abrupt('return', result.data);
755
796
 
756
797
  case 23:
757
798
  _message2.default.warn('没有可用储值卡!');
758
- return _context2.abrupt('return', false);
799
+ return _context3.abrupt('return', false);
759
800
 
760
801
  case 25:
761
802
  case 'end':
762
- return _context2.stop();
803
+ return _context3.stop();
763
804
  }
764
805
  }
765
- }, _callee2, _this7);
806
+ }, _callee3, _this7);
766
807
  }));
767
808
 
768
809
  return function (_x2) {
769
- return _ref8.apply(this, arguments);
810
+ return _ref9.apply(this, arguments);
770
811
  };
771
812
  }()
772
813
  // result.data.forEach((m) => {
@@ -1068,83 +1109,158 @@ var SettlementStore = (_class = function () {
1068
1109
  this.paymode.currentFocus = -1;
1069
1110
  this.paymode.calcReserved();
1070
1111
  }
1112
+
1113
+ // 获取储值是否重复, 在commit方法中使用
1114
+
1115
+ }, {
1116
+ key: 'findStorageBillValidate',
1117
+ value: function findStorageBillValidate() {
1118
+ var _this10 = this;
1119
+
1120
+ var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1121
+ PayStyle = _enumController$getEn14.PayStyle;
1122
+
1123
+ (0, _mobx.runInAction)(function () {
1124
+ _this10.dto.StorageMutiSettleDetails = [];
1125
+ var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
1126
+ return parseFloat(mode.value) != 0;
1127
+ }) : _this10.paymode.thePaymodes;
1128
+ (0, _each3.default)(thePaymodes, function (mode) {
1129
+ var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
1130
+
1131
+ var value = parseFloat(mode.value);
1132
+ var giveChange = null;
1133
+ if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
1134
+ value = Math.Add(value, _this10.paymode.receivable);
1135
+ giveChange = Math.abs(_this10.paymode.receivable);
1136
+ }
1137
+ _this10.dto.StorageMutiSettleDetails.push({
1138
+ Code: mode.paymethodId,
1139
+ StorageAmount: value,
1140
+ GiveChange: giveChange,
1141
+ IdsettleStyle: themode.idSettleStyle,
1142
+ IdbankAccount: themode.idBankAccount,
1143
+ PaymentCode: mode.authCode,
1144
+ DynamicPropertyKeys: [],
1145
+ DynamicPropertyValues: [],
1146
+ DataSource: { Id: _this10.dataSource }
1147
+ });
1148
+ });
1149
+ });
1150
+ return (0, _tplusApi.ccApi)((0, _extends3.default)({}, this.dto), '/marketingtool/Storage/findStorageBillValidate', false, false);
1151
+ }
1152
+
1153
+ //判断是否重复弹框
1154
+
1071
1155
  }, {
1072
1156
  key: 'commit',
1073
1157
  value: function () {
1074
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(bTest) {
1075
- var _ref10, isNewRetailBCPos;
1158
+ var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
1159
+ var _ref11, isNewRetailBCPos, ret, _ref12, _ref12$data, code, returnMsg, state;
1076
1160
 
1077
- return _regenerator2.default.wrap(function _callee3$(_context3) {
1161
+ return _regenerator2.default.wrap(function _callee4$(_context4) {
1078
1162
  while (1) {
1079
- switch (_context3.prev = _context3.next) {
1163
+ switch (_context4.prev = _context4.next) {
1080
1164
  case 0:
1081
1165
  console.log('settlementStore.commit开始,参数:' + bTest);
1082
1166
 
1083
1167
  if (!bTest) {
1084
- _context3.next = 3;
1168
+ _context4.next = 3;
1085
1169
  break;
1086
1170
  }
1087
1171
 
1088
- return _context3.abrupt('return', _promise2.default.resolve(true));
1172
+ return _context4.abrupt('return', _promise2.default.resolve(true));
1089
1173
 
1090
1174
  case 3:
1091
- _ref10 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref10.isNewRetailBCPos;
1092
- _context3.prev = 4;
1175
+ _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
1176
+ _context4.prev = 4;
1093
1177
 
1094
1178
  if (!(this.type == 1)) {
1095
- _context3.next = 10;
1179
+ _context4.next = 24;
1096
1180
  break;
1097
1181
  }
1098
1182
 
1099
- _context3.next = 8;
1100
- return this.saveMember();
1183
+ _context4.next = 8;
1184
+ return this.findStorageBillValidate();
1101
1185
 
1102
1186
  case 8:
1103
- _context3.next = 18;
1187
+ ret = _context4.sent;
1188
+ _ref12 = ret || {}, _ref12$data = _ref12.data;
1189
+ _ref12$data = _ref12$data === undefined ? {} : _ref12$data;
1190
+ code = _ref12$data.code, returnMsg = _ref12$data.returnMsg;
1191
+
1192
+ if (!(code && code == 10001)) {
1193
+ _context4.next = 20;
1194
+ break;
1195
+ }
1196
+
1197
+ _context4.next = 15;
1198
+ return this.repeatStorageModal(returnMsg);
1199
+
1200
+ case 15:
1201
+ state = _context4.sent;
1202
+
1203
+ if (!(state === false)) {
1204
+ _context4.next = 18;
1205
+ break;
1206
+ }
1207
+
1208
+ return _context4.abrupt('return', _promise2.default.resolve(false));
1209
+
1210
+ case 18:
1211
+ _context4.next = 22;
1212
+ break;
1213
+
1214
+ case 20:
1215
+ _context4.next = 22;
1216
+ return this.saveMember();
1217
+
1218
+ case 22:
1219
+ _context4.next = 32;
1104
1220
  break;
1105
1221
 
1106
- case 10:
1222
+ case 24:
1107
1223
  if (!isNewRetailBCPos) {
1108
- _context3.next = 13;
1224
+ _context4.next = 27;
1109
1225
  break;
1110
1226
  }
1111
1227
 
1112
- _context3.next = 13;
1228
+ _context4.next = 27;
1113
1229
  return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
1114
1230
 
1115
- case 13:
1116
- _context3.next = 15;
1231
+ case 27:
1232
+ _context4.next = 29;
1117
1233
  return this.save();
1118
1234
 
1119
- case 15:
1235
+ case 29:
1120
1236
  if (!isNewRetailBCPos) {
1121
- _context3.next = 18;
1237
+ _context4.next = 32;
1122
1238
  break;
1123
1239
  }
1124
1240
 
1125
- _context3.next = 18;
1241
+ _context4.next = 32;
1126
1242
  return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
1127
1243
 
1128
- case 18:
1129
- return _context3.abrupt('return', _promise2.default.resolve(true));
1244
+ case 32:
1245
+ return _context4.abrupt('return', _promise2.default.resolve(true));
1130
1246
 
1131
- case 21:
1132
- _context3.prev = 21;
1133
- _context3.t0 = _context3['catch'](4);
1247
+ case 35:
1248
+ _context4.prev = 35;
1249
+ _context4.t0 = _context4['catch'](4);
1134
1250
 
1135
- console.error('settlementStore.commit失败,错误信息:' + _context3.t0);
1136
- return _context3.abrupt('return', _promise2.default.resolve(_context3.t0));
1251
+ console.error('settlementStore.commit失败,错误信息:' + _context4.t0);
1252
+ return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
1137
1253
 
1138
- case 25:
1254
+ case 39:
1139
1255
  case 'end':
1140
- return _context3.stop();
1256
+ return _context4.stop();
1141
1257
  }
1142
1258
  }
1143
- }, _callee3, this, [[4, 21]]);
1259
+ }, _callee4, this, [[4, 35]]);
1144
1260
  }));
1145
1261
 
1146
1262
  function commit(_x3) {
1147
- return _ref9.apply(this, arguments);
1263
+ return _ref10.apply(this, arguments);
1148
1264
  }
1149
1265
 
1150
1266
  return commit;
@@ -1158,26 +1274,26 @@ var SettlementStore = (_class = function () {
1158
1274
  }, {
1159
1275
  key: 'saveMember',
1160
1276
  value: function saveMember() {
1161
- var _this10 = this;
1277
+ var _this11 = this;
1162
1278
 
1163
- var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1164
- PayStyle = _enumController$getEn14.PayStyle;
1279
+ var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1280
+ PayStyle = _enumController$getEn15.PayStyle;
1165
1281
 
1166
1282
  (0, _mobx.runInAction)(function () {
1167
- _this10.dto.StorageMutiSettleDetails = [];
1168
- var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
1283
+ _this11.dto.StorageMutiSettleDetails = [];
1284
+ var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1169
1285
  return parseFloat(mode.value) != 0;
1170
- }) : _this10.paymode.thePaymodes;
1286
+ }) : _this11.paymode.thePaymodes;
1171
1287
  (0, _each3.default)(thePaymodes, function (mode) {
1172
- var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
1288
+ var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1173
1289
 
1174
1290
  var value = parseFloat(mode.value);
1175
1291
  var giveChange = null;
1176
- if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
1177
- value = Math.Add(value, _this10.paymode.receivable);
1178
- giveChange = Math.abs(_this10.paymode.receivable);
1292
+ if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1293
+ value = Math.Add(value, _this11.paymode.receivable);
1294
+ giveChange = Math.abs(_this11.paymode.receivable);
1179
1295
  }
1180
- _this10.dto.StorageMutiSettleDetails.push({
1296
+ _this11.dto.StorageMutiSettleDetails.push({
1181
1297
  Code: mode.paymethodId,
1182
1298
  StorageAmount: value,
1183
1299
  GiveChange: giveChange,
@@ -1186,7 +1302,7 @@ var SettlementStore = (_class = function () {
1186
1302
  PaymentCode: mode.authCode,
1187
1303
  DynamicPropertyKeys: [],
1188
1304
  DynamicPropertyValues: [],
1189
- DataSource: { Id: _this10.dataSource }
1305
+ DataSource: { Id: _this11.dataSource }
1190
1306
  });
1191
1307
  });
1192
1308
  });
@@ -1196,37 +1312,37 @@ var SettlementStore = (_class = function () {
1196
1312
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1197
1313
  }
1198
1314
  return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
1199
- _this10.handlePrint(resp);
1315
+ _this11.handlePrint(resp);
1200
1316
  });
1201
1317
  }
1202
1318
  }, {
1203
1319
  key: 'save',
1204
1320
  value: function () {
1205
- var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1206
- var _this11 = this;
1321
+ var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
1322
+ var _this12 = this;
1207
1323
 
1208
- var _enumController$getEn15, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1324
+ var _enumController$getEn16, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1209
1325
 
1210
- return _regenerator2.default.wrap(function _callee4$(_context4) {
1326
+ return _regenerator2.default.wrap(function _callee5$(_context5) {
1211
1327
  while (1) {
1212
- switch (_context4.prev = _context4.next) {
1328
+ switch (_context5.prev = _context5.next) {
1213
1329
  case 0:
1214
- _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
1330
+ _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle;
1215
1331
 
1216
1332
  (0, _mobx.runInAction)(function () {
1217
- _this11.dto.RetailPaymentDetails = [];
1218
- _this11.dto.RetailStorageDetails = [];
1219
- _this11.dto.RetailCouponDetails = [];
1333
+ _this12.dto.RetailPaymentDetails = [];
1334
+ _this12.dto.RetailStorageDetails = [];
1335
+ _this12.dto.RetailCouponDetails = [];
1220
1336
  var czkSum = 0;
1221
1337
  var count = 0;
1222
- var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1338
+ var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
1223
1339
  return parseFloat(mode.value) != 0;
1224
- }) : _this11.paymode.thePaymodes;
1340
+ }) : _this12.paymode.thePaymodes;
1225
1341
  (0, _each3.default)(thePaymodes, function (mode, index) {
1226
- var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1342
+ var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
1227
1343
  if (mode.paymentType == PayStyle.hyczk) {
1228
1344
  czkSum = Math.Add(czkSum, mode.value);
1229
- _this11.dto.RetailStorageDetails.push({
1345
+ _this12.dto.RetailStorageDetails.push({
1230
1346
  Code: mode.paymethodId,
1231
1347
  MeStorageCardId: mode.meStorageCardId,
1232
1348
  StoragePaymentAmount: mode.value,
@@ -1235,17 +1351,17 @@ var SettlementStore = (_class = function () {
1235
1351
  Idmember: mode.memberId,
1236
1352
  DynamicPropertyKeys: [],
1237
1353
  DynamicPropertyValues: [],
1238
- DataSource: { Id: _this11.dataSource },
1354
+ DataSource: { Id: _this12.dataSource },
1239
1355
  Password: mode.authCode
1240
1356
  });
1241
1357
  } else {
1242
1358
  var value = parseFloat(mode.value);
1243
1359
  var giveChange = null;
1244
- if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1245
- value = Math.Add(value, _this11.paymode.receivable);
1246
- giveChange = Math.abs(_this11.paymode.receivable);
1360
+ if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
1361
+ value = Math.Add(value, _this12.paymode.receivable);
1362
+ giveChange = Math.abs(_this12.paymode.receivable);
1247
1363
  }
1248
- _this11.dto.RetailPaymentDetails.push({
1364
+ _this12.dto.RetailPaymentDetails.push({
1249
1365
  Code: mode.paymethodId,
1250
1366
  OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
1251
1367
  Amount: value,
@@ -1259,11 +1375,11 @@ var SettlementStore = (_class = function () {
1259
1375
  OverchargesAmount: mode.overchargesAmount,
1260
1376
  DynamicPropertyKeys: [],
1261
1377
  DynamicPropertyValues: [],
1262
- DataSource: { Id: _this11.dataSource }
1378
+ DataSource: { Id: _this12.dataSource }
1263
1379
  });
1264
1380
  if (mode.paymentType == PayStyle.djq) {
1265
- (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
1266
- _this11.dto.RetailCouponDetails.push({
1381
+ (0, _each3.default)(_this12.paymode.checkList && _this12.paymode.checkList.length ? _this12.paymode.checkList : mode.djqs, function (djq) {
1382
+ _this12.dto.RetailCouponDetails.push({
1267
1383
  CouponCode: djq.promoCouponCode,
1268
1384
  ReductionAmount: djq.amount,
1269
1385
  EnableAmount: djq.doorsill,
@@ -1273,50 +1389,50 @@ var SettlementStore = (_class = function () {
1273
1389
  PromotionId: djq.promoId,
1274
1390
  PromotionRuleId: djq.promoRuleId,
1275
1391
  PromoCouponAllocatedId: djq.id,
1276
- DataSource: { Id: _this11.dataSource }
1392
+ DataSource: { Id: _this12.dataSource }
1277
1393
  });
1278
1394
  });
1279
1395
  }
1280
1396
  }
1281
1397
  });
1282
1398
 
1283
- var _ref12 = _mutantsUtil.platform || {},
1284
- isNewRetailBCPos = _ref12.isNewRetailBCPos;
1399
+ var _ref14 = _mutantsUtil.platform || {},
1400
+ isNewRetailBCPos = _ref14.isNewRetailBCPos;
1285
1401
 
1286
- if (_this11.dto.RetailStorageDetails.length > 0) {
1287
- var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1402
+ if (_this12.dto.RetailStorageDetails.length > 0) {
1403
+ var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1288
1404
  if (isNewRetailBCPos) {
1289
- _this11.dto.RetailPaymentDetails.push({
1290
- Code: _this11.paymode.counter,
1405
+ _this12.dto.RetailPaymentDetails.push({
1406
+ Code: _this12.paymode.counter,
1291
1407
  OrigAmount: czkSum,
1292
1408
  Amount: czkSum,
1293
1409
  IdsettleStyle: themode.idSettleStyle,
1294
1410
  IdbankAccount: themode.idBankAccount,
1295
1411
  DynamicPropertyKeys: [],
1296
1412
  DynamicPropertyValues: [],
1297
- DataSource: { Id: _this11.dataSource },
1298
- RetailStorageDetails: _this11.dto.RetailStorageDetails
1413
+ DataSource: { Id: _this12.dataSource },
1414
+ RetailStorageDetails: _this12.dto.RetailStorageDetails
1299
1415
  });
1300
1416
  } else {
1301
- _this11.dto.RetailPaymentDetails.push({
1302
- Code: _this11.paymode.counter,
1417
+ _this12.dto.RetailPaymentDetails.push({
1418
+ Code: _this12.paymode.counter,
1303
1419
  OrigAmount: czkSum,
1304
1420
  Amount: czkSum,
1305
1421
  IdsettleStyle: themode.idSettleStyle,
1306
1422
  IdbankAccount: themode.idBankAccount,
1307
1423
  DynamicPropertyKeys: [],
1308
1424
  DynamicPropertyValues: [],
1309
- DataSource: { Id: _this11.dataSource }
1425
+ DataSource: { Id: _this12.dataSource }
1310
1426
  });
1311
1427
  }
1312
1428
  }
1313
1429
  });
1314
- _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
1430
+ _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
1315
1431
 
1316
1432
  console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
1317
1433
 
1318
1434
  if (!isNewRetailBCPos) {
1319
- _context4.next = 20;
1435
+ _context5.next = 20;
1320
1436
  break;
1321
1437
  }
1322
1438
 
@@ -1327,70 +1443,65 @@ var SettlementStore = (_class = function () {
1327
1443
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1328
1444
  }
1329
1445
  RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
1330
- _context4.t1 = this.dto.IdbusiType == 37;
1446
+ _context5.t1 = this.dto.IdbusiType == 37;
1331
1447
 
1332
- if (!_context4.t1) {
1333
- _context4.next = 13;
1448
+ if (!_context5.t1) {
1449
+ _context5.next = 13;
1334
1450
  break;
1335
1451
  }
1336
1452
 
1337
- _context4.next = 12;
1453
+ _context5.next = 12;
1338
1454
  return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
1339
1455
 
1340
1456
  case 12:
1341
- _context4.t1 = _context4.sent;
1457
+ _context5.t1 = _context5.sent;
1342
1458
 
1343
1459
  case 13:
1344
- _context4.t0 = _context4.t1;
1460
+ _context5.t0 = _context5.t1;
1345
1461
 
1346
- if (_context4.t0) {
1347
- _context4.next = 16;
1462
+ if (_context5.t0) {
1463
+ _context5.next = 16;
1348
1464
  break;
1349
1465
  }
1350
1466
 
1351
- _context4.t0 = this.dto.IdbusiType != 37;
1467
+ _context5.t0 = this.dto.IdbusiType != 37;
1352
1468
 
1353
1469
  case 16:
1354
- if (!_context4.t0) {
1355
- _context4.next = 18;
1470
+ if (!_context5.t0) {
1471
+ _context5.next = 18;
1356
1472
  break;
1357
1473
  }
1358
1474
 
1359
- return _context4.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1360
- _this11.setDtoID(resp.ID);
1361
- _this11.paymode.checkList = [];
1362
- _this11.billID = resp.ID;
1475
+ return _context5.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1476
+ _this12.setDtoID(resp.ID);
1477
+ _this12.paymode.checkList = [];
1478
+ _this12.billID = resp.ID;
1363
1479
  }));
1364
1480
 
1365
1481
  case 18:
1366
- _context4.next = 21;
1482
+ _context5.next = 21;
1367
1483
  break;
1368
1484
 
1369
1485
  case 20:
1370
- return _context4.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1371
- _this11.setDtoID(resp.ID);
1372
- _this11.billID = resp.ID;
1486
+ return _context5.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1487
+ _this12.setDtoID(resp.ID);
1488
+ _this12.billID = resp.ID;
1373
1489
  }));
1374
1490
 
1375
1491
  case 21:
1376
1492
  case 'end':
1377
- return _context4.stop();
1493
+ return _context5.stop();
1378
1494
  }
1379
1495
  }
1380
- }, _callee4, this);
1496
+ }, _callee5, this);
1381
1497
  }));
1382
1498
 
1383
1499
  function save() {
1384
- return _ref11.apply(this, arguments);
1500
+ return _ref13.apply(this, arguments);
1385
1501
  }
1386
1502
 
1387
1503
  return save;
1388
1504
  }()
1389
- }, {
1390
- key: 'setVoucherDate',
1391
- value: function setVoucherDate() {
1392
- this.dto.VoucherDate = new Date();
1393
- }
1394
1505
  }, {
1395
1506
  key: 'setDtoID',
1396
1507
  value: function setDtoID(id) {
@@ -1399,35 +1510,35 @@ var SettlementStore = (_class = function () {
1399
1510
  }, {
1400
1511
  key: 'querySettleResult',
1401
1512
  value: function () {
1402
- var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
1403
- return _regenerator2.default.wrap(function _callee5$(_context5) {
1513
+ var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
1514
+ return _regenerator2.default.wrap(function _callee6$(_context6) {
1404
1515
  while (1) {
1405
- switch (_context5.prev = _context5.next) {
1516
+ switch (_context6.prev = _context6.next) {
1406
1517
  case 0:
1407
- _context5.prev = 0;
1408
- _context5.t0 = _promise2.default;
1409
- _context5.next = 4;
1518
+ _context6.prev = 0;
1519
+ _context6.t0 = _promise2.default;
1520
+ _context6.next = 4;
1410
1521
  return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
1411
1522
 
1412
1523
  case 4:
1413
- _context5.t1 = _context5.sent;
1414
- return _context5.abrupt('return', _context5.t0.resolve.call(_context5.t0, _context5.t1));
1524
+ _context6.t1 = _context6.sent;
1525
+ return _context6.abrupt('return', _context6.t0.resolve.call(_context6.t0, _context6.t1));
1415
1526
 
1416
1527
  case 8:
1417
- _context5.prev = 8;
1418
- _context5.t2 = _context5['catch'](0);
1419
- return _context5.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
1528
+ _context6.prev = 8;
1529
+ _context6.t2 = _context6['catch'](0);
1530
+ return _context6.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
1420
1531
 
1421
1532
  case 11:
1422
1533
  case 'end':
1423
- return _context5.stop();
1534
+ return _context6.stop();
1424
1535
  }
1425
1536
  }
1426
- }, _callee5, this, [[0, 8]]);
1537
+ }, _callee6, this, [[0, 8]]);
1427
1538
  }));
1428
1539
 
1429
1540
  function querySettleResult() {
1430
- return _ref14.apply(this, arguments);
1541
+ return _ref16.apply(this, arguments);
1431
1542
  }
1432
1543
 
1433
1544
  return querySettleResult;
@@ -1453,18 +1564,18 @@ var SettlementStore = (_class = function () {
1453
1564
  }, {
1454
1565
  key: 'validePwd',
1455
1566
  value: function () {
1456
- var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
1457
- var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1567
+ var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(value) {
1568
+ var _ref18, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1458
1569
 
1459
- return _regenerator2.default.wrap(function _callee6$(_context6) {
1570
+ return _regenerator2.default.wrap(function _callee7$(_context7) {
1460
1571
  while (1) {
1461
- switch (_context6.prev = _context6.next) {
1572
+ switch (_context7.prev = _context7.next) {
1462
1573
  case 0:
1463
- _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
1464
- _context6.prev = 1;
1574
+ _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
1575
+ _context7.prev = 1;
1465
1576
 
1466
1577
  if (!isNewRetailBCPos) {
1467
- _context6.next = 33;
1578
+ _context7.next = 33;
1468
1579
  break;
1469
1580
  }
1470
1581
 
@@ -1474,60 +1585,60 @@ var SettlementStore = (_class = function () {
1474
1585
  memberStorageId = this.paymode.currentMode.meStorageCardId;
1475
1586
 
1476
1587
  if (!cook2) {
1477
- _context6.next = 12;
1588
+ _context7.next = 12;
1478
1589
  break;
1479
1590
  }
1480
1591
 
1481
1592
  if (!cook2.hasOwnProperty(memberStorageId + "")) {
1482
- _context6.next = 12;
1593
+ _context7.next = 12;
1483
1594
  break;
1484
1595
  }
1485
1596
 
1486
1597
  if (!(cook2[memberStorageId] > 3)) {
1487
- _context6.next = 12;
1598
+ _context7.next = 12;
1488
1599
  break;
1489
1600
  }
1490
1601
 
1491
1602
  message = '今日密码错误已达上限,不可使用储值消费,请明日再试,如忘记请重置密码或修改密码。';
1492
- return _context6.abrupt('return', _promise2.default.resolve(message));
1603
+ return _context7.abrupt('return', _promise2.default.resolve(message));
1493
1604
 
1494
1605
  case 12:
1495
1606
  _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
1496
1607
  result = null;
1497
1608
 
1498
1609
  if (!(cardTypeEnum === 'BALANCE_CARD')) {
1499
- _context6.next = 20;
1610
+ _context7.next = 20;
1500
1611
  break;
1501
1612
  }
1502
1613
 
1503
- _context6.next = 17;
1614
+ _context7.next = 17;
1504
1615
  return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1505
1616
 
1506
1617
  case 17:
1507
- result = _context6.sent;
1508
- _context6.next = 29;
1618
+ result = _context7.sent;
1619
+ _context7.next = 29;
1509
1620
  break;
1510
1621
 
1511
1622
  case 20:
1512
1623
  if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
1513
- _context6.next = 26;
1624
+ _context7.next = 26;
1514
1625
  break;
1515
1626
  }
1516
1627
 
1517
- _context6.next = 23;
1628
+ _context7.next = 23;
1518
1629
  return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1519
1630
 
1520
1631
  case 23:
1521
- result = _context6.sent;
1522
- _context6.next = 29;
1632
+ result = _context7.sent;
1633
+ _context7.next = 29;
1523
1634
  break;
1524
1635
 
1525
1636
  case 26:
1526
- _context6.next = 28;
1637
+ _context7.next = 28;
1527
1638
  return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1528
1639
 
1529
1640
  case 28:
1530
- result = _context6.sent;
1641
+ result = _context7.sent;
1531
1642
 
1532
1643
  case 29:
1533
1644
  if (!result.data) {
@@ -1546,38 +1657,38 @@ var SettlementStore = (_class = function () {
1546
1657
  this.setCookie('errorPwd', '', -1);
1547
1658
  this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
1548
1659
  }
1549
- return _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1660
+ return _context7.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1550
1661
 
1551
1662
  case 33:
1552
- _context6.next = 35;
1663
+ _context7.next = 35;
1553
1664
  return (0, _tplusApi.tApi)({ "CheckoutParams": {
1554
1665
  "Idmember": value.id,
1555
1666
  "Password": value.pwd
1556
1667
  } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
1557
1668
 
1558
1669
  case 35:
1559
- _result = _context6.sent;
1560
- return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1670
+ _result = _context7.sent;
1671
+ return _context7.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1561
1672
 
1562
1673
  case 37:
1563
- _context6.next = 42;
1674
+ _context7.next = 42;
1564
1675
  break;
1565
1676
 
1566
1677
  case 39:
1567
- _context6.prev = 39;
1568
- _context6.t0 = _context6['catch'](1);
1569
- return _context6.abrupt('return', "failed");
1678
+ _context7.prev = 39;
1679
+ _context7.t0 = _context7['catch'](1);
1680
+ return _context7.abrupt('return', "failed");
1570
1681
 
1571
1682
  case 42:
1572
1683
  case 'end':
1573
- return _context6.stop();
1684
+ return _context7.stop();
1574
1685
  }
1575
1686
  }
1576
- }, _callee6, this, [[1, 39]]);
1687
+ }, _callee7, this, [[1, 39]]);
1577
1688
  }));
1578
1689
 
1579
1690
  function validePwd(_x4) {
1580
- return _ref15.apply(this, arguments);
1691
+ return _ref17.apply(this, arguments);
1581
1692
  }
1582
1693
 
1583
1694
  return validePwd;
@@ -1587,7 +1698,7 @@ var SettlementStore = (_class = function () {
1587
1698
  }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
1588
1699
  enumerable: true,
1589
1700
  initializer: function initializer() {
1590
- var _this12 = this;
1701
+ var _this13 = this;
1591
1702
 
1592
1703
  return function (newPass, newPassConfirm) {
1593
1704
  if (!newPass || !newPassConfirm) {
@@ -1599,7 +1710,7 @@ var SettlementStore = (_class = function () {
1599
1710
  var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
1600
1711
  return (0, _tplusApi.ccApi)({
1601
1712
  Idstore: idstore,
1602
- meMemberId: _this12.paymode.currentMode.memberId,
1713
+ meMemberId: _this13.paymode.currentMode.memberId,
1603
1714
  oldPassword: null,
1604
1715
  newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
1605
1716
  dataSource: "POS"
@@ -1613,134 +1724,143 @@ var SettlementStore = (_class = function () {
1613
1724
  }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
1614
1725
  enumerable: true,
1615
1726
  initializer: function initializer() {
1616
- var _this13 = this;
1727
+ var _this14 = this;
1617
1728
 
1618
1729
  return function () {
1619
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(_this) {
1730
+ var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(_this) {
1620
1731
  var _getLoginInfo, IdStore, StoreCode, resp;
1621
1732
 
1622
- return _regenerator2.default.wrap(function _callee7$(_context7) {
1733
+ return _regenerator2.default.wrap(function _callee8$(_context8) {
1623
1734
  while (1) {
1624
- switch (_context7.prev = _context7.next) {
1735
+ switch (_context8.prev = _context8.next) {
1625
1736
  case 0:
1626
- _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1627
- _context7.next = 3;
1628
- return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1737
+ _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1738
+ _context8.next = 3;
1739
+ return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1629
1740
 
1630
1741
  case 3:
1631
- resp = _context7.sent;
1742
+ resp = _context8.sent;
1632
1743
 
1633
1744
  _this.member = resp;
1634
1745
  _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
1635
- return _context7.abrupt('return', _promise2.default.resolve(resp));
1746
+ return _context8.abrupt('return', _promise2.default.resolve(resp));
1636
1747
 
1637
1748
  case 7:
1638
1749
  case 'end':
1639
- return _context7.stop();
1750
+ return _context8.stop();
1640
1751
  }
1641
1752
  }
1642
- }, _callee7, _this13);
1753
+ }, _callee8, _this14);
1643
1754
  }));
1644
1755
 
1645
1756
  return function (_x5) {
1646
- return _ref17.apply(this, arguments);
1757
+ return _ref19.apply(this, arguments);
1647
1758
  };
1648
1759
  }();
1649
1760
  }
1650
1761
  }), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
1651
1762
  enumerable: true,
1652
1763
  initializer: function initializer() {
1653
- var _this14 = this;
1764
+ var _this15 = this;
1654
1765
 
1655
1766
  return function () {
1656
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(memberId) {
1767
+ var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(memberId) {
1657
1768
  var result;
1658
- return _regenerator2.default.wrap(function _callee8$(_context8) {
1769
+ return _regenerator2.default.wrap(function _callee9$(_context9) {
1659
1770
  while (1) {
1660
- switch (_context8.prev = _context8.next) {
1771
+ switch (_context9.prev = _context9.next) {
1661
1772
  case 0:
1662
- _context8.next = 2;
1773
+ _context9.next = 2;
1663
1774
  return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
1664
1775
 
1665
1776
  case 2:
1666
- result = _context8.sent;
1777
+ result = _context9.sent;
1667
1778
 
1668
1779
  if (!(result && result.data.length)) {
1669
- _context8.next = 20;
1780
+ _context9.next = 20;
1670
1781
  break;
1671
1782
  }
1672
1783
 
1673
1784
  if (!(result.data.length === 1)) {
1674
- _context8.next = 9;
1785
+ _context9.next = 9;
1675
1786
  break;
1676
1787
  }
1677
1788
 
1678
- _this14.paymode.updateCardInfo(result.data[0]);
1679
- return _context8.abrupt('return', result.data);
1789
+ _this15.paymode.updateCardInfo(result.data[0]);
1790
+ return _context9.abrupt('return', result.data);
1680
1791
 
1681
1792
  case 9:
1682
1793
  if (!(result.data && result.data.length === 1)) {
1683
- _context8.next = 14;
1794
+ _context9.next = 14;
1684
1795
  break;
1685
1796
  }
1686
1797
 
1687
- _this14.paymode.updateCardInfo(result.data[0]);
1688
- return _context8.abrupt('return', result.data);
1798
+ _this15.paymode.updateCardInfo(result.data[0]);
1799
+ return _context9.abrupt('return', result.data);
1689
1800
 
1690
1801
  case 14:
1691
1802
  if (!(result.data && result.data.length > 1)) {
1692
- _context8.next = 18;
1803
+ _context9.next = 18;
1693
1804
  break;
1694
1805
  }
1695
1806
 
1696
- return _context8.abrupt('return', result.data);
1807
+ return _context9.abrupt('return', result.data);
1697
1808
 
1698
1809
  case 18:
1699
1810
  _message2.default.warn('没有可用储值卡!');
1700
- return _context8.abrupt('return', false);
1811
+ return _context9.abrupt('return', false);
1701
1812
 
1702
1813
  case 20:
1703
1814
  case 'end':
1704
- return _context8.stop();
1815
+ return _context9.stop();
1705
1816
  }
1706
1817
  }
1707
- }, _callee8, _this14);
1818
+ }, _callee9, _this15);
1708
1819
  }));
1709
1820
 
1710
1821
  return function (_x6) {
1711
- return _ref18.apply(this, arguments);
1822
+ return _ref20.apply(this, arguments);
1712
1823
  };
1713
1824
  }();
1714
1825
  }
1715
1826
  }), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
1716
1827
  enumerable: true,
1717
1828
  initializer: function initializer() {
1718
- var _this15 = this;
1829
+ var _this16 = this;
1719
1830
 
1720
- return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
1831
+ return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
1721
1832
  var address, result;
1722
- return _regenerator2.default.wrap(function _callee9$(_context9) {
1833
+ return _regenerator2.default.wrap(function _callee10$(_context10) {
1723
1834
  while (1) {
1724
- switch (_context9.prev = _context9.next) {
1835
+ switch (_context10.prev = _context10.next) {
1725
1836
  case 0:
1726
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this15.paymode.currentMode.storageCardNo;
1727
- _context9.next = 3;
1837
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this16.paymode.currentMode.storageCardNo;
1838
+ _context10.next = 3;
1728
1839
  return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
1729
1840
 
1730
1841
  case 3:
1731
- result = _context9.sent;
1842
+ result = _context10.sent;
1732
1843
 
1733
- _this15.paymode.updateCardInfo(result.data);
1844
+ _this16.paymode.updateCardInfo(result.data);
1734
1845
 
1735
1846
  case 5:
1736
1847
  case 'end':
1737
- return _context9.stop();
1848
+ return _context10.stop();
1738
1849
  }
1739
1850
  }
1740
- }, _callee9, _this15);
1851
+ }, _callee10, _this16);
1741
1852
  }));
1742
1853
  }
1743
- }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setVoucherDate', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setVoucherDate'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
1854
+ }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'setVoucherDate', [_mobx.action], {
1855
+ enumerable: true,
1856
+ initializer: function initializer() {
1857
+ var _this17 = this;
1858
+
1859
+ return function () {
1860
+ _this17.dto.VoucherDate = new Date();
1861
+ };
1862
+ }
1863
+ }), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
1744
1864
  exports.default = SettlementStore;
1745
1865
  var PayMode = exports.PayMode = (_class3 = function () {
1746
1866
  //应收
@@ -1754,19 +1874,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
1754
1874
  this.onlineamount = 0;
1755
1875
  this.maxamount = 0;
1756
1876
 
1757
- _initDefineProp(this, 'currentFocus', _descriptor5, this);
1877
+ _initDefineProp(this, 'currentFocus', _descriptor6, this);
1758
1878
 
1759
- _initDefineProp(this, 'received', _descriptor6, this);
1879
+ _initDefineProp(this, 'received', _descriptor7, this);
1760
1880
 
1761
- _initDefineProp(this, 'receivable', _descriptor7, this);
1881
+ _initDefineProp(this, 'receivable', _descriptor8, this);
1762
1882
 
1763
- _initDefineProp(this, 'paymodes', _descriptor8, this);
1883
+ _initDefineProp(this, 'paymodes', _descriptor9, this);
1764
1884
 
1765
- _initDefineProp(this, 'thePaymodes', _descriptor9, this);
1885
+ _initDefineProp(this, 'thePaymodes', _descriptor10, this);
1766
1886
 
1767
- _initDefineProp(this, 'storageCardNo', _descriptor10, this);
1887
+ _initDefineProp(this, 'storageCardNo', _descriptor11, this);
1768
1888
 
1769
- _initDefineProp(this, 'balance', _descriptor11, this);
1889
+ _initDefineProp(this, 'balance', _descriptor12, this);
1770
1890
 
1771
1891
  this.currentMode = null;
1772
1892
  this.checkList = [];
@@ -1775,11 +1895,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
1775
1895
  hotKey: "Ctrl+M"
1776
1896
  };
1777
1897
 
1778
- _initDefineProp(this, 'calcCheckList', _descriptor12, this);
1898
+ _initDefineProp(this, 'calcCheckList', _descriptor13, this);
1779
1899
 
1780
- _initDefineProp(this, 'setCouponNum', _descriptor13, this);
1900
+ _initDefineProp(this, 'setCouponNum', _descriptor14, this);
1781
1901
 
1782
- _initDefineProp(this, 'addDjqs', _descriptor14, this);
1902
+ _initDefineProp(this, 'addDjqs', _descriptor15, this);
1783
1903
  }
1784
1904
  // @observable store = null;
1785
1905
 
@@ -1838,7 +1958,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1838
1958
  }, {
1839
1959
  key: 'calcDjqCheckValue',
1840
1960
  value: function calcDjqCheckValue(q1, dto, params) {
1841
- var _this16 = this;
1961
+ var _this18 = this;
1842
1962
 
1843
1963
  var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
1844
1964
  var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1852,12 +1972,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
1852
1972
  this.checkList = [];
1853
1973
  }
1854
1974
 
1855
- var _ref20 = _mutantsUtil.platform || {},
1856
- isNewRetailBCPos = _ref20.isNewRetailBCPos;
1975
+ var _ref22 = _mutantsUtil.platform || {},
1976
+ isNewRetailBCPos = _ref22.isNewRetailBCPos;
1857
1977
 
1858
- var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1859
- PayStyle = _enumController$getEn16.PayStyle,
1860
- Differentiate = _enumController$getEn16.Differentiate;
1978
+ var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
1979
+ PayStyle = _enumController$getEn17.PayStyle,
1980
+ Differentiate = _enumController$getEn17.Differentiate;
1861
1981
 
1862
1982
  if (q1) {
1863
1983
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1885,7 +2005,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1885
2005
  if (!q1.checked) {
1886
2006
  this.checkList.forEach(function (ele, i) {
1887
2007
  if (ele.id === q1.id) {
1888
- _this16.checkList.splice(i, 1);
2008
+ _this18.checkList.splice(i, 1);
1889
2009
  }
1890
2010
  });
1891
2011
  } else {
@@ -1957,24 +2077,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
1957
2077
  if (result && result.length != 0) {
1958
2078
  result.forEach(function (element, index) {
1959
2079
  var djq1 = false;
1960
- _this16.currentMode.djqs.forEach(function (djq) {
2080
+ _this18.currentMode.djqs.forEach(function (djq) {
1961
2081
  if (element.id === djq.id) {
1962
2082
  djq1 = true;
1963
2083
  }
1964
2084
  });
1965
2085
 
1966
- var _ref21 = element || {},
1967
- couponCode = _ref21.couponCode,
1968
- name = _ref21.name,
1969
- tieredAmountResult = _ref21.tieredAmountResult,
1970
- fromDate = _ref21.fromDate,
1971
- dateMount = _ref21.dateMount,
1972
- promoMethodEnum = _ref21.promoMethodEnum,
1973
- discountPct = _ref21.discountPct,
1974
- nominalAmount = _ref21.nominalAmount,
1975
- promoId = _ref21.promoId,
1976
- id = _ref21.id,
1977
- doorsill = _ref21.doorsill;
2086
+ var _ref23 = element || {},
2087
+ couponCode = _ref23.couponCode,
2088
+ name = _ref23.name,
2089
+ tieredAmountResult = _ref23.tieredAmountResult,
2090
+ fromDate = _ref23.fromDate,
2091
+ dateMount = _ref23.dateMount,
2092
+ promoMethodEnum = _ref23.promoMethodEnum,
2093
+ discountPct = _ref23.discountPct,
2094
+ nominalAmount = _ref23.nominalAmount,
2095
+ promoId = _ref23.promoId,
2096
+ id = _ref23.id,
2097
+ doorsill = _ref23.doorsill;
1978
2098
 
1979
2099
  var condValue = tieredAmountResult.condValue,
1980
2100
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -2002,10 +2122,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
2002
2122
  // couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
2003
2123
  // id
2004
2124
  // })
2005
- _this16.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
2125
+ _this18.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
2006
2126
  djq1 = false;
2007
2127
  } else {
2008
- _this16.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
2128
+ _this18.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
2009
2129
  // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
2010
2130
  // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
2011
2131
  }
@@ -2018,11 +2138,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
2018
2138
  }, {
2019
2139
  key: 'calcDjqValue',
2020
2140
  value: function calcDjqValue(q1) {
2021
- var _ref22 = _mutantsUtil.platform || {},
2022
- isNewRetailBCPos = _ref22.isNewRetailBCPos;
2141
+ var _ref24 = _mutantsUtil.platform || {},
2142
+ isNewRetailBCPos = _ref24.isNewRetailBCPos;
2023
2143
 
2024
- var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
2025
- Differentiate = _enumController$getEn17.Differentiate;
2144
+ var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
2145
+ Differentiate = _enumController$getEn18.Differentiate;
2026
2146
 
2027
2147
  if (q1) {
2028
2148
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2084,8 +2204,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2084
2204
  this.currentMode.errinfo = '';
2085
2205
  var sum = this.amount;
2086
2206
 
2087
- var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
2088
- PayStyle = _enumController$getEn18.PayStyle;
2207
+ var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
2208
+ PayStyle = _enumController$getEn19.PayStyle;
2089
2209
 
2090
2210
  this.thePaymodes && this.thePaymodes.forEach(function (mode) {
2091
2211
  if (mode.paymentType === PayStyle.hyczk) {
@@ -2109,23 +2229,23 @@ var PayMode = exports.PayMode = (_class3 = function () {
2109
2229
  }, {
2110
2230
  key: 'setPaymodes',
2111
2231
  value: function () {
2112
- var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(type, isIntegralExchange) {
2113
- var _this17 = this;
2232
+ var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(type, isIntegralExchange) {
2233
+ var _this19 = this;
2114
2234
 
2115
- var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2235
+ var _enumController$getEn20, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2116
2236
 
2117
- return _regenerator2.default.wrap(function _callee10$(_context10) {
2237
+ return _regenerator2.default.wrap(function _callee11$(_context11) {
2118
2238
  while (1) {
2119
- switch (_context10.prev = _context10.next) {
2239
+ switch (_context11.prev = _context11.next) {
2120
2240
  case 0:
2121
- _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
2241
+ _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn20.settleStyleType, PayStyle = _enumController$getEn20.PayStyle;
2122
2242
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
2123
2243
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
2124
- _context10.next = 5;
2244
+ _context11.next = 5;
2125
2245
  return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
2126
2246
 
2127
2247
  case 5:
2128
- modes = _context10.sent;
2248
+ modes = _context11.sent;
2129
2249
 
2130
2250
  if (modes) {
2131
2251
  (0, _mobx.runInAction)(function () {
@@ -2150,21 +2270,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
2150
2270
  calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
2151
2271
  });
2152
2272
  });
2153
- _this17.paymodes = paymodes;
2273
+ _this19.paymodes = paymodes;
2154
2274
  //modes.QuickSettleStyles
2155
2275
  });
2156
2276
  }
2157
2277
 
2158
2278
  case 7:
2159
2279
  case 'end':
2160
- return _context10.stop();
2280
+ return _context11.stop();
2161
2281
  }
2162
2282
  }
2163
- }, _callee10, this);
2283
+ }, _callee11, this);
2164
2284
  }));
2165
2285
 
2166
2286
  function setPaymodes(_x7, _x8) {
2167
- return _ref23.apply(this, arguments);
2287
+ return _ref25.apply(this, arguments);
2168
2288
  }
2169
2289
 
2170
2290
  return setPaymodes;
@@ -2181,57 +2301,57 @@ var PayMode = exports.PayMode = (_class3 = function () {
2181
2301
  }
2182
2302
  }]);
2183
2303
  return PayMode;
2184
- }(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
2304
+ }(), (_descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
2185
2305
  enumerable: true,
2186
2306
  initializer: function initializer() {
2187
2307
  return "";
2188
2308
  }
2189
- }), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
2309
+ }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
2190
2310
  enumerable: true,
2191
2311
  initializer: function initializer() {
2192
2312
  return 0;
2193
2313
  }
2194
- }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
2314
+ }), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
2195
2315
  enumerable: true,
2196
2316
  initializer: function initializer() {
2197
2317
  return 0;
2198
2318
  }
2199
- }), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
2319
+ }), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
2200
2320
  enumerable: true,
2201
2321
  initializer: function initializer() {
2202
2322
  return [];
2203
2323
  }
2204
- }), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
2324
+ }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
2205
2325
  enumerable: true,
2206
2326
  initializer: function initializer() {
2207
2327
  return [];
2208
2328
  }
2209
- }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
2329
+ }), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
2210
2330
  enumerable: true,
2211
2331
  initializer: function initializer() {
2212
2332
  return null;
2213
2333
  }
2214
- }), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
2334
+ }), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
2215
2335
  enumerable: true,
2216
2336
  initializer: function initializer() {
2217
2337
  return null;
2218
2338
  }
2219
- }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2339
+ }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2220
2340
  enumerable: true,
2221
2341
  initializer: function initializer() {
2222
- var _this18 = this;
2342
+ var _this20 = this;
2223
2343
 
2224
2344
  return function () {
2225
- _this18.checkList = [];
2345
+ _this20.checkList = [];
2226
2346
  };
2227
2347
  }
2228
- }), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
2348
+ }), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
2229
2349
  enumerable: true,
2230
2350
  initializer: function initializer() {
2231
- var _this19 = this;
2351
+ var _this21 = this;
2232
2352
 
2233
2353
  return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
2234
- _this19.currentMode.djqs.forEach(function (ele) {
2354
+ _this21.currentMode.djqs.forEach(function (ele) {
2235
2355
  if (ele.id === id) {
2236
2356
  promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
2237
2357
  ele.couponCategoryEnum = couponNum;
@@ -2241,10 +2361,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
2241
2361
  });
2242
2362
  };
2243
2363
  }
2244
- }), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2364
+ }), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2245
2365
  enumerable: true,
2246
2366
  initializer: function initializer() {
2247
- var _this20 = this;
2367
+ var _this22 = this;
2248
2368
 
2249
2369
  return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2250
2370
  var djq = {
@@ -2266,25 +2386,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
2266
2386
  couponCategoryEnum: couponCategoryEnum,
2267
2387
  id: id
2268
2388
  };
2269
- _this20.currentMode.djqs.push(djq);
2389
+ _this22.currentMode.djqs.push(djq);
2270
2390
  };
2271
2391
  }
2272
2392
  }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
2273
2393
  var Member = exports.Member = (_class5 = function () {
2274
2394
  function Member(m) {
2275
- var _this21 = this;
2395
+ var _this23 = this;
2276
2396
 
2277
2397
  (0, _classCallCheck3.default)(this, Member);
2278
2398
 
2279
- _initDefineProp(this, 'cardNo', _descriptor15, this);
2399
+ _initDefineProp(this, 'cardNo', _descriptor16, this);
2280
2400
 
2281
- _initDefineProp(this, 'balance', _descriptor16, this);
2401
+ _initDefineProp(this, 'balance', _descriptor17, this);
2282
2402
 
2283
- _initDefineProp(this, 'exchangable', _descriptor17, this);
2403
+ _initDefineProp(this, 'exchangable', _descriptor18, this);
2284
2404
 
2285
- _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
2405
+ _initDefineProp(this, 'meStorageCardId', _descriptor19, this);
2286
2406
 
2287
- _initDefineProp(this, 'storageCardNo', _descriptor19, this);
2407
+ _initDefineProp(this, 'storageCardNo', _descriptor20, this);
2288
2408
 
2289
2409
  if (m) {
2290
2410
  this.id = m.ID;
@@ -2295,15 +2415,15 @@ var Member = exports.Member = (_class5 = function () {
2295
2415
  return key == 'canusedbalancestorage';
2296
2416
  });
2297
2417
 
2298
- var _ref24 = _mutantsUtil.platform || {},
2299
- isNewRetailBCPos = _ref24.isNewRetailBCPos;
2418
+ var _ref26 = _mutantsUtil.platform || {},
2419
+ isNewRetailBCPos = _ref26.isNewRetailBCPos;
2300
2420
 
2301
2421
  (0, _mobx.runInAction)(function () {
2302
- _this21.cardNo = m.CardCode;
2422
+ _this23.cardNo = m.CardCode;
2303
2423
  if (index >= 0) {
2304
- _this21.balance = parseFloat(m.DynamicPropertyValues[index]);
2424
+ _this23.balance = parseFloat(m.DynamicPropertyValues[index]);
2305
2425
  } else {
2306
- _this21.balance = _this21.rawbalance;
2426
+ _this23.balance = _this23.rawbalance;
2307
2427
  }
2308
2428
  });
2309
2429
  this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2325,19 +2445,19 @@ var Member = exports.Member = (_class5 = function () {
2325
2445
  }
2326
2446
  }]);
2327
2447
  return Member;
2328
- }(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2448
+ }(), (_descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2329
2449
  enumerable: true,
2330
2450
  initializer: null
2331
- }), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2451
+ }), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2332
2452
  enumerable: true,
2333
2453
  initializer: null
2334
- }), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2454
+ }), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2335
2455
  enumerable: true,
2336
2456
  initializer: null
2337
- }), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
2457
+ }), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
2338
2458
  enumerable: true,
2339
2459
  initializer: null
2340
- }), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
2460
+ }), _descriptor20 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
2341
2461
  enumerable: true,
2342
2462
  initializer: null
2343
2463
  }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _class5);