tplus-components-touch 3.54.7 → 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.
- package/dist/components/collection/index.js +154 -47
- package/dist/components/collection/index.js.map +1 -1
- package/dist/components/collection/searchView/index.js +2 -1
- package/dist/components/collection/searchView/index.js.map +1 -1
- package/dist/components/commonForm/inputNumber/index.js +17 -2
- package/dist/components/commonForm/inputNumber/index.js.map +1 -1
- package/dist/components/keyboard/numkeyboardPassword.js +31 -0
- package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
- package/dist/components/password/ModifyPass.js +41 -25
- package/dist/components/password/ModifyPass.js.map +1 -1
- package/dist/components/password/confirmPwd.js +5 -1
- package/dist/components/password/confirmPwd.js.map +1 -1
- package/dist/components/password/store.js +4 -2
- package/dist/components/password/store.js.map +1 -1
- package/dist/components/settlement/settlement.js +173 -174
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +28 -32
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/touchTable/index.js +1 -1
- package/dist/components/touchTable/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -885,7 +885,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
885
885
|
}, {
|
|
886
886
|
key: 'commit',
|
|
887
887
|
value: function () {
|
|
888
|
-
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) {
|
|
889
889
|
var status, paylist, ret, _ref7, _ref7$data, code, returnMsg, state, ret1, _ret, ret2;
|
|
890
890
|
|
|
891
891
|
return _regenerator2.default.wrap(function _callee2$(_context2) {
|
|
@@ -997,6 +997,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
997
997
|
case 39:
|
|
998
998
|
if (dto) {
|
|
999
999
|
this.dto = dto;
|
|
1000
|
+
this.context = context;
|
|
1000
1001
|
}
|
|
1001
1002
|
_context2.next = 42;
|
|
1002
1003
|
return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
|
|
@@ -1039,7 +1040,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1039
1040
|
}, _callee2, this, [[4, 52]]);
|
|
1040
1041
|
}));
|
|
1041
1042
|
|
|
1042
|
-
function commit(_x2, _x3) {
|
|
1043
|
+
function commit(_x2, _x3, _x4) {
|
|
1043
1044
|
return _ref6.apply(this, arguments);
|
|
1044
1045
|
}
|
|
1045
1046
|
|
|
@@ -1383,17 +1384,12 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1383
1384
|
_getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
|
|
1384
1385
|
_ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode, TotalTaxAmount = _ref14.TotalTaxAmount;
|
|
1385
1386
|
|
|
1386
|
-
if (IdbusiType === 42) {
|
|
1387
|
-
(0, _mobx.runInAction)(function () {
|
|
1388
|
-
_this12.dto.CreditUsageAmount = (0, _utils.getFixedNumber)(TotalTaxAmount, 2);
|
|
1389
|
-
});
|
|
1390
|
-
}
|
|
1391
1387
|
if (IdbusiType === 42) {
|
|
1392
1388
|
_dto = this.dto, _TotalTaxAmount = _dto.TotalTaxAmount, ArrearsAmount = _dto.ArrearsAmount;
|
|
1393
1389
|
returnAmount1 = Math.abs(_TotalTaxAmount) - ArrearsAmount;
|
|
1394
1390
|
|
|
1395
1391
|
(0, _mobx.runInAction)(function () {
|
|
1396
|
-
_this12.dto.CreditUsageAmount = returnAmount1 > 1 ? (0, _utils.getFixedNumber)(
|
|
1392
|
+
_this12.dto.CreditUsageAmount = -(returnAmount1 > 1 ? (0, _utils.getFixedNumber)(Math.abs(_TotalTaxAmount) - returnAmount1, 2) : Math.abs(_TotalTaxAmount, 2));
|
|
1397
1393
|
});
|
|
1398
1394
|
}
|
|
1399
1395
|
if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
|
@@ -1412,36 +1408,36 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1412
1408
|
_context5.t1 = this.dto.IdbusiType == 37;
|
|
1413
1409
|
|
|
1414
1410
|
if (!_context5.t1) {
|
|
1415
|
-
_context5.next =
|
|
1411
|
+
_context5.next = 15;
|
|
1416
1412
|
break;
|
|
1417
1413
|
}
|
|
1418
1414
|
|
|
1419
|
-
_context5.next =
|
|
1415
|
+
_context5.next = 14;
|
|
1420
1416
|
return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
|
|
1421
1417
|
|
|
1422
|
-
case
|
|
1418
|
+
case 14:
|
|
1423
1419
|
_context5.t1 = _context5.sent;
|
|
1424
1420
|
|
|
1425
|
-
case
|
|
1421
|
+
case 15:
|
|
1426
1422
|
_context5.t0 = _context5.t1;
|
|
1427
1423
|
|
|
1428
1424
|
if (_context5.t0) {
|
|
1429
|
-
_context5.next =
|
|
1425
|
+
_context5.next = 18;
|
|
1430
1426
|
break;
|
|
1431
1427
|
}
|
|
1432
1428
|
|
|
1433
1429
|
_context5.t0 = this.dto.IdbusiType != 37;
|
|
1434
1430
|
|
|
1435
|
-
case
|
|
1431
|
+
case 18:
|
|
1436
1432
|
if (!_context5.t0) {
|
|
1437
|
-
_context5.next =
|
|
1433
|
+
_context5.next = 38;
|
|
1438
1434
|
break;
|
|
1439
1435
|
}
|
|
1440
1436
|
|
|
1441
1437
|
dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
|
|
1442
1438
|
|
|
1443
1439
|
if (!(IdbusiType !== 42)) {
|
|
1444
|
-
_context5.next =
|
|
1440
|
+
_context5.next = 36;
|
|
1445
1441
|
break;
|
|
1446
1442
|
}
|
|
1447
1443
|
|
|
@@ -1451,36 +1447,36 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1451
1447
|
});
|
|
1452
1448
|
|
|
1453
1449
|
if (!(payList && payList.length > 0)) {
|
|
1454
|
-
_context5.next =
|
|
1450
|
+
_context5.next = 35;
|
|
1455
1451
|
break;
|
|
1456
1452
|
}
|
|
1457
1453
|
|
|
1458
1454
|
payment = payList[0];
|
|
1459
1455
|
tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
|
|
1460
|
-
_context5.next =
|
|
1456
|
+
_context5.next = 27;
|
|
1461
1457
|
return this.thirdPay(1, payment, tradeType, dtoParams);
|
|
1462
1458
|
|
|
1463
|
-
case
|
|
1459
|
+
case 27:
|
|
1464
1460
|
ret = _context5.sent;
|
|
1465
1461
|
_ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
|
|
1466
1462
|
|
|
1467
1463
|
if (!(type === true)) {
|
|
1468
|
-
_context5.next =
|
|
1464
|
+
_context5.next = 33;
|
|
1469
1465
|
break;
|
|
1470
1466
|
}
|
|
1471
1467
|
|
|
1472
1468
|
dtoParams = data;
|
|
1473
|
-
_context5.next =
|
|
1469
|
+
_context5.next = 35;
|
|
1474
1470
|
break;
|
|
1475
1471
|
|
|
1476
|
-
case
|
|
1472
|
+
case 33:
|
|
1477
1473
|
_message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
|
|
1478
1474
|
return _context5.abrupt('return', false);
|
|
1479
1475
|
|
|
1480
|
-
case
|
|
1476
|
+
case 35:
|
|
1481
1477
|
this.dtoParams = dtoParams;
|
|
1482
1478
|
|
|
1483
|
-
case
|
|
1479
|
+
case 36:
|
|
1484
1480
|
console.log('结算信息:', dtoParams);
|
|
1485
1481
|
return _context5.abrupt('return', this.SettlementApi.retailPosSettle({
|
|
1486
1482
|
dto: dtoParams,
|
|
@@ -1496,7 +1492,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1496
1492
|
_this12.paymode.checkList = [];
|
|
1497
1493
|
}));
|
|
1498
1494
|
|
|
1499
|
-
case
|
|
1495
|
+
case 38:
|
|
1500
1496
|
case 'end':
|
|
1501
1497
|
return _context5.stop();
|
|
1502
1498
|
}
|
|
@@ -1614,7 +1610,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1614
1610
|
}, _callee6, this, [[0, 24]]);
|
|
1615
1611
|
}));
|
|
1616
1612
|
|
|
1617
|
-
function thirdPay(
|
|
1613
|
+
function thirdPay(_x5, _x6, _x7, _x8) {
|
|
1618
1614
|
return _ref17.apply(this, arguments);
|
|
1619
1615
|
}
|
|
1620
1616
|
|
|
@@ -1680,7 +1676,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1680
1676
|
}, _callee8, this);
|
|
1681
1677
|
}));
|
|
1682
1678
|
|
|
1683
|
-
function thirdPayRefund(
|
|
1679
|
+
function thirdPayRefund(_x9) {
|
|
1684
1680
|
return _ref20.apply(this, arguments);
|
|
1685
1681
|
}
|
|
1686
1682
|
|
|
@@ -1865,7 +1861,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
1865
1861
|
}, _callee10, this, [[1, 29]]);
|
|
1866
1862
|
}));
|
|
1867
1863
|
|
|
1868
|
-
function validePwd(
|
|
1864
|
+
function validePwd(_x10) {
|
|
1869
1865
|
return _ref24.apply(this, arguments);
|
|
1870
1866
|
}
|
|
1871
1867
|
|
|
@@ -2142,7 +2138,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
2142
2138
|
}, _callee11, _this14);
|
|
2143
2139
|
}));
|
|
2144
2140
|
|
|
2145
|
-
return function (
|
|
2141
|
+
return function (_x11) {
|
|
2146
2142
|
return _ref27.apply(this, arguments);
|
|
2147
2143
|
};
|
|
2148
2144
|
}();
|
|
@@ -2288,7 +2284,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
2288
2284
|
}, _callee13, _this17);
|
|
2289
2285
|
}));
|
|
2290
2286
|
|
|
2291
|
-
return function (
|
|
2287
|
+
return function (_x12) {
|
|
2292
2288
|
return _ref30.apply(this, arguments);
|
|
2293
2289
|
};
|
|
2294
2290
|
}();
|
|
@@ -2356,7 +2352,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
|
|
|
2356
2352
|
}, _callee14, _this18);
|
|
2357
2353
|
}));
|
|
2358
2354
|
|
|
2359
|
-
return function (
|
|
2355
|
+
return function (_x13, _x14) {
|
|
2360
2356
|
return _ref31.apply(this, arguments);
|
|
2361
2357
|
};
|
|
2362
2358
|
}();
|
|
@@ -2841,7 +2837,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
2841
2837
|
}, _callee16, this);
|
|
2842
2838
|
}));
|
|
2843
2839
|
|
|
2844
|
-
function setPaymodes(
|
|
2840
|
+
function setPaymodes(_x15, _x16) {
|
|
2845
2841
|
return _ref34.apply(this, arguments);
|
|
2846
2842
|
}
|
|
2847
2843
|
|