tplus-components-touch 3.24.2 → 3.24.3

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/prototypeTable/style.less +1 -1
  2. package/dist/components/settlement/settlement.js +6 -0
  3. package/dist/components/settlement/settlement.js.map +1 -1
  4. package/dist/components/settlement/settlement.less +5 -4
  5. package/dist/components/settlement/settlementStore.js +44 -27
  6. package/dist/components/settlement/settlementStore.js.map +1 -1
  7. package/dist/components/touchTable/index.js +2 -1
  8. package/dist/components/touchTable/index.js.map +1 -1
  9. package/package.json +35 -35
package/dist/components/settlement/settlement.less CHANGED
@@ -484,11 +484,12 @@
484
484
  cursor: pointer;
485
485
  .name{
486
486
  // padding-left:23px;
487
- padding-top:16px;
487
+ padding-top: 15px;
488
488
  padding-bottom: 19px;
489
- font-size: 17px;
490
- line-height: 16px;
491
- width: 130px;
489
+ font-size: 14px;
490
+ line-height: 1.3;
491
+ width: 120px;
492
+ height: 58px;
492
493
  text-indent: 0;
493
494
  padding-left: 14px;
494
495
  display: -webkit-box;
package/dist/components/settlement/settlementStore.js CHANGED
@@ -109,6 +109,10 @@ var _moment = require('moment');
109
109
 
110
110
  var _moment2 = _interopRequireDefault(_moment);
111
111
 
112
+ var _reduce2 = require('lodash/reduce');
113
+
114
+ var _reduce3 = _interopRequireDefault(_reduce2);
115
+
112
116
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
113
117
 
114
118
  function _initDefineProp(target, property, descriptor, context) {
@@ -659,6 +663,9 @@ var SettlementStore = (_class = function () {
659
663
  _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
660
664
  _this7.updateEvent();
661
665
  var message = '';
666
+ var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
667
+ return total + cur.value;
668
+ }, 0);
662
669
  if (global.CheckMemberStorageProcessorBlock) {
663
670
  message = CheckMemberStorageProcessorBlock.execute(m);
664
671
  }
@@ -666,7 +673,7 @@ var SettlementStore = (_class = function () {
666
673
  _this7.paymode.currentMode.errinfo = message;
667
674
  } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
668
675
  _this7.paymode.currentMode.errinfo = "余额不足";
669
- } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
676
+ } else if (_this7.paymode.amount > 0 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
670
677
  _this7.paymode.currentMode.errinfo = "实收金额必须录入";
671
678
  } else {
672
679
  // 查询成功后将焦点移入下一个输入框
@@ -1364,7 +1371,7 @@ var SettlementStore = (_class = function () {
1364
1371
  key: 'validePwd',
1365
1372
  value: function () {
1366
1373
  var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1367
- var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
1374
+ var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
1368
1375
 
1369
1376
  return _regenerator2.default.wrap(function _callee5$(_context5) {
1370
1377
  while (1) {
@@ -1374,83 +1381,84 @@ var SettlementStore = (_class = function () {
1374
1381
  _context5.prev = 1;
1375
1382
 
1376
1383
  if (!isNewRetailBCPos) {
1377
- _context5.next = 18;
1384
+ _context5.next = 19;
1378
1385
  break;
1379
1386
  }
1380
1387
 
1381
1388
  cook1 = this.getAllCookies()['errorPwd'];
1382
1389
  cook2 = cook1 && JSON.parse(cook1);
1383
1390
  message = '密码输入错误';
1391
+ memberId = this.paymode.currentMode.member.MeStorageCardId;
1384
1392
 
1385
1393
  if (!cook2) {
1386
- _context5.next = 11;
1394
+ _context5.next = 12;
1387
1395
  break;
1388
1396
  }
1389
1397
 
1390
- if (!cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
1391
- _context5.next = 11;
1398
+ if (!cook2.hasOwnProperty(memberId + "")) {
1399
+ _context5.next = 12;
1392
1400
  break;
1393
1401
  }
1394
1402
 
1395
- if (!(cook2[this.member.MeStorageCardId] > 3)) {
1396
- _context5.next = 11;
1403
+ if (!(cook2[memberId] > 3)) {
1404
+ _context5.next = 12;
1397
1405
  break;
1398
1406
  }
1399
1407
 
1400
1408
  message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
1401
1409
  return _context5.abrupt('return', _promise2.default.resolve(message));
1402
1410
 
1403
- case 11:
1404
- _context5.next = 13;
1411
+ case 12:
1412
+ _context5.next = 14;
1405
1413
  return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
1406
1414
 
1407
- case 13:
1415
+ case 14:
1408
1416
  result = _context5.sent;
1409
1417
 
1410
1418
  if (!result.data) {
1411
1419
  if (cook2) {
1412
- if (cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
1413
- count = cook2[this.member.MeStorageCardId];
1420
+ if (cook2.hasOwnProperty(memberId + "")) {
1421
+ count = cook2[memberId];
1414
1422
 
1415
- cook2[this.member.MeStorageCardId] = count + 1;
1423
+ cook2[memberId] = count + 1;
1416
1424
  } else {
1417
- cook2[this.member.MeStorageCardId] = 1;
1425
+ cook2[memberId] = 1;
1418
1426
  }
1419
1427
  } else {
1420
1428
  cook2 = {};
1421
- cook2[this.member.MeStorageCardId] = 1;
1429
+ cook2[memberId] = 1;
1422
1430
  }
1423
1431
  this.setCookie('errorPwd', '', -1);
1424
1432
  this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
1425
1433
  }
1426
1434
  return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1427
1435
 
1428
- case 18:
1429
- _context5.next = 20;
1436
+ case 19:
1437
+ _context5.next = 21;
1430
1438
  return (0, _tplusApi.tApi)({ "CheckoutParams": {
1431
1439
  "Idmember": value.id,
1432
1440
  "Password": value.pwd
1433
1441
  } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
1434
1442
 
1435
- case 20:
1443
+ case 21:
1436
1444
  _result = _context5.sent;
1437
1445
  return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1438
1446
 
1439
- case 22:
1440
- _context5.next = 27;
1447
+ case 23:
1448
+ _context5.next = 28;
1441
1449
  break;
1442
1450
 
1443
- case 24:
1444
- _context5.prev = 24;
1451
+ case 25:
1452
+ _context5.prev = 25;
1445
1453
  _context5.t0 = _context5['catch'](1);
1446
1454
  return _context5.abrupt('return', "failed");
1447
1455
 
1448
- case 27:
1456
+ case 28:
1449
1457
  case 'end':
1450
1458
  return _context5.stop();
1451
1459
  }
1452
1460
  }
1453
- }, _callee5, this, [[1, 24]]);
1461
+ }, _callee5, this, [[1, 25]]);
1454
1462
  }));
1455
1463
 
1456
1464
  function validePwd(_x3) {
@@ -1679,12 +1687,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
1679
1687
  detailDTO.isManualFreeGift = item.IsPresent;
1680
1688
  detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
1681
1689
  detailDTO.IsManualChangePrice = item.IsManualChangePrice;
1690
+
1691
+ // if(detailDTO.IsManualChangePrice)//如果是手工改价
1692
+ // {
1693
+ // detailDTO.listPrice = item.TaxPrice;
1694
+ // detailDTO.netAmountWithTax = item.TaxAmount;
1695
+ // }
1696
+ // else
1697
+ // {
1682
1698
  var bookingQuantity = 0;
1683
1699
  if (item.BookingQuantity) {
1684
1700
  bookingQuantity = item.BookingQuantity;
1685
1701
  }
1686
1702
  detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
1687
1703
  detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
1704
+ //}
1688
1705
  detailDTO.taxRate = item.TaxRate;
1689
1706
  detailDTO.quantity = item.Quantity;
1690
1707
 
@@ -1838,13 +1855,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
1838
1855
  var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
1839
1856
  PayStyle = _enumController$getEn17.PayStyle;
1840
1857
 
1841
- this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
1858
+ this.thePaymodes && this.thePaymodes.forEach(function (mode) {
1842
1859
  if (mode.paymentType === PayStyle.hyczk) {
1843
1860
  sum -= mode.value;
1844
1861
  }
1845
1862
  });
1846
1863
 
1847
- if (this.amount > 0 && (v === '' || v === '0.00')) {
1864
+ if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
1848
1865
  this.currentMode.errinfo = "实收金额必须录入";
1849
1866
  } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
1850
1867
  this.currentMode.errinfo = "实收不应大于应收";