tplus-components-touch 3.26.20 → 3.26.24

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 (9) hide show
  1. package/dist/components/settlement/moreCzkTable/index.js +156 -0
  2. package/dist/components/settlement/moreCzkTable/index.js.map +1 -0
  3. package/dist/components/settlement/moreCzkTable/style.less +0 -0
  4. package/dist/components/settlement/settlement.js +166 -55
  5. package/dist/components/settlement/settlement.js.map +1 -1
  6. package/dist/components/settlement/settlement.less +9 -0
  7. package/dist/components/settlement/settlementStore.js +88 -40
  8. package/dist/components/settlement/settlementStore.js.map +1 -1
  9. package/package.json +1 -1
package/dist/components/settlement/settlement.less CHANGED
@@ -1,6 +1,15 @@
1
1
  .asyncModal[role='dialog'] {
2
2
  z-index: 1006 !important;
3
3
  }
4
+ .moreCzkModal {
5
+ .ant-modal {
6
+ width: 800px !important;
7
+ .ant-modal-body {
8
+ height: 376px !important;
9
+ padding: 0;
10
+ }
11
+ }
12
+ }
4
13
  .asyncModal{
5
14
  .ant-modal-body{
6
15
  margin:-16px;
package/dist/components/settlement/settlementStore.js CHANGED
@@ -209,8 +209,10 @@ var SettlementStore = (_class = function () {
209
209
  _this2.paymode.currentMode.errinfo = "实收金额必须录入";
210
210
  } else {
211
211
  // 查询成功后将焦点移入下一个输入框
212
- var nextInput = document.querySelector('.czk .received .input');
213
- nextInput && nextInput.select();
212
+ setTimeout(function () {
213
+ var nextInput = document.querySelector('.czk .received .input');
214
+ nextInput && nextInput.select();
215
+ }, 300);
214
216
  }
215
217
  });
216
218
  }
@@ -681,7 +683,7 @@ var SettlementStore = (_class = function () {
681
683
  var address = '';
682
684
  if (isNewRetailBCPos) {
683
685
  // address = '/member/memberProfile/FindByStorageCode/'+v;
684
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
686
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
685
687
  return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
686
688
  var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
687
689
  var data, m;
@@ -692,29 +694,64 @@ var SettlementStore = (_class = function () {
692
694
  data = result.data;
693
695
  m = data && data.length && data[0];
694
696
 
697
+ if (!(result && result.data.length)) {
698
+ _context2.next = 25;
699
+ break;
700
+ }
701
+
702
+ if (!(result.data.length === 1)) {
703
+ _context2.next = 14;
704
+ break;
705
+ }
706
+
695
707
  if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
696
- _context2.next = 7;
708
+ _context2.next = 10;
697
709
  break;
698
710
  }
699
711
 
700
712
  _this7.paymode.updateCardInfo(m);
701
713
  _this7.handleCzkData(m);
702
- _context2.next = 9;
703
- break;
714
+ return _context2.abrupt('return', result.data);
704
715
 
705
- case 7:
706
- _context2.next = 9;
716
+ case 10:
717
+ _context2.next = 12;
707
718
  return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
708
719
  var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
709
720
  if (data1.enable) {
710
721
  _this7.paymode.updateCardInfo(m);
711
722
  _this7.handleCzkData(m);
723
+ return result1.data;
712
724
  } else {
713
725
  _message2.default.warn(data1.disableReason);
714
726
  }
715
727
  });
716
728
 
717
- case 9:
729
+ case 12:
730
+ _context2.next = 25;
731
+ break;
732
+
733
+ case 14:
734
+ if (!(result.data && result.data.length === 1)) {
735
+ _context2.next = 19;
736
+ break;
737
+ }
738
+
739
+ _this7.paymode.updateCardInfo(result.data[0]);
740
+ return _context2.abrupt('return', result.data);
741
+
742
+ case 19:
743
+ if (!(result.data && result.data.length > 1)) {
744
+ _context2.next = 23;
745
+ break;
746
+ }
747
+
748
+ return _context2.abrupt('return', result.data);
749
+
750
+ case 23:
751
+ _message2.default.warn('没有可用储值卡！');
752
+ return _context2.abrupt('return', false);
753
+
754
+ case 25:
718
755
  case 'end':
719
756
  return _context2.stop();
720
757
  }
@@ -725,7 +762,14 @@ var SettlementStore = (_class = function () {
725
762
  return function (_x2) {
726
763
  return _ref8.apply(this, arguments);
727
764
  };
728
- }());
765
+ }()
766
+ // result.data.forEach((m) => {
767
+ // if (m.CardTypeEnum === 'BALANCE_CARD') {
768
+ // // 会员概念改为卡，把这些字段都放开
769
+ // this.paymode.updateCardInfo(m);
770
+ // }
771
+ // })
772
+ );
729
773
  } else {
730
774
  address = 'AA.DR.newRetailMember.SearchMember';
731
775
  return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
@@ -853,22 +897,7 @@ var SettlementStore = (_class = function () {
853
897
 
854
898
  var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
855
899
  var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
856
- var balance = null;
857
- var rawbalance = null;
858
- var storageCardNo = null;
859
900
  var memberId = this.member && this.member.ID ? this.member.ID : null;
860
- var cardTypeEnum = null;
861
- var walletEnabled = null;
862
- var meStorageCardId = null;
863
- if (type === PayStyle.hyczk) {
864
- // 会员概念改为卡，把这些字段都放开
865
- cardTypeEnum = this.member.CardTypeEnum ? this.member.CardTypeEnum : null;
866
- walletEnabled = this.member.WalletEnabled ? this.member.WalletEnabled : null;
867
- storageCardNo = this.member.StorageCardNo ? this.member.StorageCardNo : null;
868
- balance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
869
- rawbalance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
870
- meStorageCardId = this.member.MeStorageCardId ? this.member.MeStorageCardId : null;
871
- }
872
901
  var mode = (0, _mobx.observable)({
873
902
  paymethodId: this.paymode.counter,
874
903
  name: themode.name,
@@ -881,13 +910,7 @@ var SettlementStore = (_class = function () {
881
910
  paymentType: type,
882
911
  djqs: [],
883
912
  card: null,
884
- cardTypeEnum: !notwithm ? cardTypeEnum : null,
885
- walletEnabled: !notwithm ? walletEnabled : null,
886
913
  memberId: !notwithm ? memberId : null,
887
- meStorageCardId: !notwithm ? meStorageCardId : null,
888
- storageCardNo: !notwithm ? storageCardNo : null,
889
- balance: !notwithm ? balance : null,
890
- rawbalance: !notwithm ? rawbalance : null,
891
914
  member: new Member(!notwithm ? this.member : null),
892
915
  authCode: '',
893
916
  steadCashIntegral: null,
@@ -1625,21 +1648,46 @@ var SettlementStore = (_class = function () {
1625
1648
  switch (_context8.prev = _context8.next) {
1626
1649
  case 0:
1627
1650
  _context8.next = 2;
1628
- return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId, false, false, { method: 'get' });
1651
+ return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
1629
1652
 
1630
1653
  case 2:
1631
1654
  result = _context8.sent;
1632
1655
 
1633
- if (result && result.data.length) {
1634
- result.data.forEach(function (m) {
1635
- if (m.CardTypeEnum === 'BALANCE_CARD') {
1636
- // 会员概念改为卡，把这些字段都放开
1637
- _this14.paymode.updateCardInfo(m);
1638
- }
1639
- });
1656
+ if (!(result && result.data.length)) {
1657
+ _context8.next = 20;
1658
+ break;
1640
1659
  }
1641
1660
 
1642
- case 4:
1661
+ if (!(result.data.length === 1)) {
1662
+ _context8.next = 9;
1663
+ break;
1664
+ }
1665
+
1666
+ _this14.paymode.updateCardInfo(result.data[0]);
1667
+ return _context8.abrupt('return', result.data);
1668
+
1669
+ case 9:
1670
+ if (!(result.data && result.data.length === 1)) {
1671
+ _context8.next = 14;
1672
+ break;
1673
+ }
1674
+
1675
+ _this14.paymode.updateCardInfo(result.data[0]);
1676
+ return _context8.abrupt('return', result.data);
1677
+
1678
+ case 14:
1679
+ if (!(result.data && result.data.length > 1)) {
1680
+ _context8.next = 18;
1681
+ break;
1682
+ }
1683
+
1684
+ return _context8.abrupt('return', result.data);
1685
+
1686
+ case 18:
1687
+ _message2.default.warn('没有可用储值卡！');
1688
+ return _context8.abrupt('return', false);
1689
+
1690
+ case 20:
1643
1691
  case 'end':
1644
1692
  return _context8.stop();
1645
1693
  }