tplus-components-touch 3.27.15 → 3.27.19
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/commonForm/addressPicker/index.js +3 -3
- package/dist/components/commonForm/addressPicker/index.js.map +1 -1
- package/dist/components/commonForm/datePicker/index.js +5 -2
- package/dist/components/commonForm/datePicker/index.js.map +1 -1
- package/dist/components/presale/pickup.js +8 -2
- package/dist/components/presale/pickup.js.map +1 -1
- package/dist/components/presale/style.less +2 -0
- package/dist/components/settlement/settlement.js +135 -165
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +6 -9
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/package.json +1 -1
|
@@ -311,14 +311,6 @@ var SettlementStore = (_class = function () {
|
|
|
311
311
|
return (0, _tplusApi.ccApi)({}, '/retail/RetailPos/getRefWareHouseList', false, false);
|
|
312
312
|
};
|
|
313
313
|
|
|
314
|
-
this.getPerformanceDistributionValue = function (data) {
|
|
315
|
-
return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPerformanceDistributionValue', false, false);
|
|
316
|
-
};
|
|
317
|
-
|
|
318
|
-
this.getPosFreight = function (data) {
|
|
319
|
-
return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
|
|
320
|
-
};
|
|
321
|
-
|
|
322
314
|
this.checkCoupon = function () {
|
|
323
315
|
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
|
|
324
316
|
var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
|
|
@@ -461,6 +453,7 @@ var SettlementStore = (_class = function () {
|
|
|
461
453
|
// this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
|
|
462
454
|
this.member = this.dto.Member; //stores.selectMemberStore.selectMemberInfo;
|
|
463
455
|
|
|
456
|
+
// this.paymode.bookMaxValue = 0;
|
|
464
457
|
//预订按比例收取订金处理
|
|
465
458
|
var value = this.dto.TotalTaxAmount;
|
|
466
459
|
|
|
@@ -473,14 +466,17 @@ var SettlementStore = (_class = function () {
|
|
|
473
466
|
DistributionMode = _ref5.DistributionMode;
|
|
474
467
|
|
|
475
468
|
if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
|
469
|
+
this.paymode.bookMaxValue = value;
|
|
476
470
|
value = value * PercentageWhenBook / 100;
|
|
477
471
|
(0, _mobx.runInAction)(function () {
|
|
478
472
|
_this3.dto.PrepaidAmount = value;
|
|
479
473
|
});
|
|
480
474
|
}
|
|
475
|
+
//预订计算快递或同城配送运费
|
|
481
476
|
if (IdbusiType == 38 && PreSellOrBook != 'DISABLED' && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
|
482
477
|
value += this.dto.BuyerPayFreight || 0;
|
|
483
478
|
}
|
|
479
|
+
//预订取货应补款金额
|
|
484
480
|
if (IdbusiType == 39) {
|
|
485
481
|
value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
|
|
486
482
|
}
|
|
@@ -1568,7 +1564,6 @@ var SettlementStore = (_class = function () {
|
|
|
1568
1564
|
}), _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, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
|
|
1569
1565
|
exports.default = SettlementStore;
|
|
1570
1566
|
var PayMode = exports.PayMode = (_class3 = function () {
|
|
1571
|
-
//应收
|
|
1572
1567
|
function PayMode() {
|
|
1573
1568
|
// this.amount=getFixedNumber(amount);
|
|
1574
1569
|
// this.calcReserved();
|
|
@@ -1589,6 +1584,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1589
1584
|
|
|
1590
1585
|
_initDefineProp(this, 'thePaymodes', _descriptor7, this);
|
|
1591
1586
|
|
|
1587
|
+
this.bookMaxValue = 0;
|
|
1592
1588
|
this.currentMode = null;
|
|
1593
1589
|
this.checkList = [];
|
|
1594
1590
|
this.settle = {
|
|
@@ -1603,6 +1599,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1603
1599
|
_initDefineProp(this, 'addDjqs', _descriptor10, this);
|
|
1604
1600
|
}
|
|
1605
1601
|
// @observable store = null;
|
|
1602
|
+
//应收
|
|
1606
1603
|
|
|
1607
1604
|
|
|
1608
1605
|
(0, _createClass3.default)(PayMode, [{
|