tplus-components-touch 3.54.5 → 3.54.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 (22) hide show
  1. package/dist/components/collection/index.js +173 -47
  2. package/dist/components/collection/index.js.map +1 -1
  3. package/dist/components/collection/searchView/index.js +2 -1
  4. package/dist/components/collection/searchView/index.js.map +1 -1
  5. package/dist/components/collection/searchView/index.less +4 -0
  6. package/dist/components/commonForm/inputNumber/index.js +17 -2
  7. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  8. package/dist/components/keyboard/numkeyboardPassword.js +31 -0
  9. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  10. package/dist/components/password/ModifyPass.js +41 -25
  11. package/dist/components/password/ModifyPass.js.map +1 -1
  12. package/dist/components/password/confirmPwd.js +5 -1
  13. package/dist/components/password/confirmPwd.js.map +1 -1
  14. package/dist/components/password/store.js +4 -2
  15. package/dist/components/password/store.js.map +1 -1
  16. package/dist/components/settlement/settlement.js +303 -121
  17. package/dist/components/settlement/settlement.js.map +1 -1
  18. package/dist/components/settlement/settlementStore.js +32 -32
  19. package/dist/components/settlement/settlementStore.js.map +1 -1
  20. package/dist/components/touchTable/index.js +1 -1
  21. package/dist/components/touchTable/index.js.map +1 -1
  22. package/package.json +1 -1
package/dist/components/settlement/settlementStore.js CHANGED
@@ -283,6 +283,10 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
283
283
  this.paymode.bookMaxValue = _mutantsMicrofx.stores.drawerStore.totalWaitPaidAmount;
284
284
  }
285
285
  }
286
+ //预订取货应补款金额
287
+ if (IdbusiType == 42) {
288
+ value = amount;
289
+ }
286
290
  this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
287
291
  }
288
292
  this.paymode.clean();
@@ -881,7 +885,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
881
885
  }, {
882
886
  key: 'commit',
883
887
  value: function () {
884
- var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest, dto) {
888
+ var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest, dto, context) {
885
889
  var status, paylist, ret, _ref7, _ref7$data, code, returnMsg, state, ret1, _ret, ret2;
886
890
 
887
891
  return _regenerator2.default.wrap(function _callee2$(_context2) {
@@ -993,6 +997,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
993
997
  case 39:
994
998
  if (dto) {
995
999
  this.dto = dto;
1000
+ this.context = context;
996
1001
  }
997
1002
  _context2.next = 42;
998
1003
  return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
@@ -1035,7 +1040,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1035
1040
  }, _callee2, this, [[4, 52]]);
1036
1041
  }));
1037
1042
 
1038
- function commit(_x2, _x3) {
1043
+ function commit(_x2, _x3, _x4) {
1039
1044
  return _ref6.apply(this, arguments);
1040
1045
  }
1041
1046
 
@@ -1379,17 +1384,12 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1379
1384
  _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
1380
1385
  _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode, TotalTaxAmount = _ref14.TotalTaxAmount;
1381
1386
 
1382
- if (IdbusiType === 42) {
1383
- (0, _mobx.runInAction)(function () {
1384
- _this12.dto.CreditUsageAmount = (0, _utils.getFixedNumber)(TotalTaxAmount, 2);
1385
- });
1386
- }
1387
1387
  if (IdbusiType === 42) {
1388
1388
  _dto = this.dto, _TotalTaxAmount = _dto.TotalTaxAmount, ArrearsAmount = _dto.ArrearsAmount;
1389
1389
  returnAmount1 = Math.abs(_TotalTaxAmount) - ArrearsAmount;
1390
1390
 
1391
1391
  (0, _mobx.runInAction)(function () {
1392
- _this12.dto.CreditUsageAmount = returnAmount1 > 1 ? (0, _utils.getFixedNumber)(-(Math.abs(_TotalTaxAmount) - returnAmount1), 2) : Math.abs(_TotalTaxAmount, 2);
1392
+ _this12.dto.CreditUsageAmount = -(returnAmount1 > 1 ? (0, _utils.getFixedNumber)(Math.abs(_TotalTaxAmount) - returnAmount1, 2) : Math.abs(_TotalTaxAmount, 2));
1393
1393
  });
1394
1394
  }
1395
1395
  if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
@@ -1408,36 +1408,36 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1408
1408
  _context5.t1 = this.dto.IdbusiType == 37;
1409
1409
 
1410
1410
  if (!_context5.t1) {
1411
- _context5.next = 16;
1411
+ _context5.next = 15;
1412
1412
  break;
1413
1413
  }
1414
1414
 
1415
- _context5.next = 15;
1415
+ _context5.next = 14;
1416
1416
  return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
1417
1417
 
1418
- case 15:
1418
+ case 14:
1419
1419
  _context5.t1 = _context5.sent;
1420
1420
 
1421
- case 16:
1421
+ case 15:
1422
1422
  _context5.t0 = _context5.t1;
1423
1423
 
1424
1424
  if (_context5.t0) {
1425
- _context5.next = 19;
1425
+ _context5.next = 18;
1426
1426
  break;
1427
1427
  }
1428
1428
 
1429
1429
  _context5.t0 = this.dto.IdbusiType != 37;
1430
1430
 
1431
- case 19:
1431
+ case 18:
1432
1432
  if (!_context5.t0) {
1433
- _context5.next = 39;
1433
+ _context5.next = 38;
1434
1434
  break;
1435
1435
  }
1436
1436
 
1437
1437
  dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
1438
1438
 
1439
1439
  if (!(IdbusiType !== 42)) {
1440
- _context5.next = 37;
1440
+ _context5.next = 36;
1441
1441
  break;
1442
1442
  }
1443
1443
 
@@ -1447,36 +1447,36 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1447
1447
  });
1448
1448
 
1449
1449
  if (!(payList && payList.length > 0)) {
1450
- _context5.next = 36;
1450
+ _context5.next = 35;
1451
1451
  break;
1452
1452
  }
1453
1453
 
1454
1454
  payment = payList[0];
1455
1455
  tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
1456
- _context5.next = 28;
1456
+ _context5.next = 27;
1457
1457
  return this.thirdPay(1, payment, tradeType, dtoParams);
1458
1458
 
1459
- case 28:
1459
+ case 27:
1460
1460
  ret = _context5.sent;
1461
1461
  _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
1462
1462
 
1463
1463
  if (!(type === true)) {
1464
- _context5.next = 34;
1464
+ _context5.next = 33;
1465
1465
  break;
1466
1466
  }
1467
1467
 
1468
1468
  dtoParams = data;
1469
- _context5.next = 36;
1469
+ _context5.next = 35;
1470
1470
  break;
1471
1471
 
1472
- case 34:
1472
+ case 33:
1473
1473
  _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
1474
1474
  return _context5.abrupt('return', false);
1475
1475
 
1476
- case 36:
1476
+ case 35:
1477
1477
  this.dtoParams = dtoParams;
1478
1478
 
1479
- case 37:
1479
+ case 36:
1480
1480
  console.log('结算信息:', dtoParams);
1481
1481
  return _context5.abrupt('return', this.SettlementApi.retailPosSettle({
1482
1482
  dto: dtoParams,
@@ -1492,7 +1492,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1492
1492
  _this12.paymode.checkList = [];
1493
1493
  }));
1494
1494
 
1495
- case 39:
1495
+ case 38:
1496
1496
  case 'end':
1497
1497
  return _context5.stop();
1498
1498
  }
@@ -1610,7 +1610,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1610
1610
  }, _callee6, this, [[0, 24]]);
1611
1611
  }));
1612
1612
 
1613
- function thirdPay(_x4, _x5, _x6, _x7) {
1613
+ function thirdPay(_x5, _x6, _x7, _x8) {
1614
1614
  return _ref17.apply(this, arguments);
1615
1615
  }
1616
1616
 
@@ -1676,7 +1676,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1676
1676
  }, _callee8, this);
1677
1677
  }));
1678
1678
 
1679
- function thirdPayRefund(_x8) {
1679
+ function thirdPayRefund(_x9) {
1680
1680
  return _ref20.apply(this, arguments);
1681
1681
  }
1682
1682
 
@@ -1861,7 +1861,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
1861
1861
  }, _callee10, this, [[1, 29]]);
1862
1862
  }));
1863
1863
 
1864
- function validePwd(_x9) {
1864
+ function validePwd(_x10) {
1865
1865
  return _ref24.apply(this, arguments);
1866
1866
  }
1867
1867
 
@@ -2138,7 +2138,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
2138
2138
  }, _callee11, _this14);
2139
2139
  }));
2140
2140
 
2141
- return function (_x10) {
2141
+ return function (_x11) {
2142
2142
  return _ref27.apply(this, arguments);
2143
2143
  };
2144
2144
  }();
@@ -2284,7 +2284,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
2284
2284
  }, _callee13, _this17);
2285
2285
  }));
2286
2286
 
2287
- return function (_x11) {
2287
+ return function (_x12) {
2288
2288
  return _ref30.apply(this, arguments);
2289
2289
  };
2290
2290
  }();
@@ -2352,7 +2352,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
2352
2352
  }, _callee14, _this18);
2353
2353
  }));
2354
2354
 
2355
- return function (_x12, _x13) {
2355
+ return function (_x13, _x14) {
2356
2356
  return _ref31.apply(this, arguments);
2357
2357
  };
2358
2358
  }();
@@ -2837,7 +2837,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
2837
2837
  }, _callee16, this);
2838
2838
  }));
2839
2839
 
2840
- function setPaymodes(_x14, _x15) {
2840
+ function setPaymodes(_x15, _x16) {
2841
2841
  return _ref34.apply(this, arguments);
2842
2842
  }
2843
2843