tplus-components-touch 3.28.6 → 3.28.7
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/billSearch/api.js +74 -13
- package/dist/components/billSearch/api.js.map +1 -1
- package/dist/components/billSearch/index.js +36 -167
- package/dist/components/billSearch/index.js.map +1 -1
- package/dist/components/billSearch/index.less +3 -6
- package/dist/components/cloudPrint/api.js +43 -85
- package/dist/components/cloudPrint/api.js.map +1 -1
- package/dist/components/cloudPrint/printDispatch.js +108 -209
- package/dist/components/cloudPrint/printDispatch.js.map +1 -1
- package/dist/components/commonForm/addressPicker/index.js +16 -7
- package/dist/components/commonForm/addressPicker/index.js.map +1 -1
- package/dist/components/commonForm/index.js +9 -3
- package/dist/components/commonForm/index.js.map +1 -1
- package/dist/components/deliverySearch/index.js +1 -1
- package/dist/components/deliverySearch/index.js.map +1 -1
- package/dist/components/hotKey/localConfig.js +52 -0
- package/dist/components/hotKey/localConfig.js.map +1 -1
- package/dist/components/input/style.less +7 -0
- package/dist/components/inventorySearch/tab.js +67 -76
- package/dist/components/inventorySearch/tab.js.map +1 -1
- package/dist/components/keyboard/numberButton_input.js +2 -4
- package/dist/components/keyboard/numberButton_input.js.map +1 -1
- package/dist/components/keyboard/onlyLetterButton2.less +40 -35
- package/dist/components/loading/style.less +6 -8
- package/dist/components/presale/pickup.js +431 -0
- package/dist/components/presale/pickup.js.map +1 -0
- package/dist/components/presale/style.less +48 -0
- package/dist/components/settlement/settlement.js +235 -75
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +7 -1
- package/dist/components/settlement/settlementStore.js +135 -105
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo_index.html +26 -3
- package/dist/components/ticon/iconfont/iconfont.css +7 -3
- package/dist/components/ticon/iconfont/iconfont.js +1 -1
- package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
- package/dist/components/ticon/iconfont/iconfont.json +7 -0
- package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
- package/dist/components/touchTable/index.js +12 -4
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/components/touchTable/index.less +13 -20
- package/dist/index.js +9 -16
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -24,6 +24,10 @@ var _carousel = require('antd/es/carousel');
|
|
|
24
24
|
|
|
25
25
|
var _carousel2 = _interopRequireDefault(_carousel);
|
|
26
26
|
|
|
27
|
+
var _keys = require('babel-runtime/core-js/object/keys');
|
|
28
|
+
|
|
29
|
+
var _keys2 = _interopRequireDefault(_keys);
|
|
30
|
+
|
|
27
31
|
var _button = require('antd/es/button');
|
|
28
32
|
|
|
29
33
|
var _button2 = _interopRequireDefault(_button);
|
|
@@ -208,8 +212,6 @@ var _index2 = require('./prototypeTable/index');
|
|
|
208
212
|
|
|
209
213
|
var _index3 = _interopRequireDefault(_index2);
|
|
210
214
|
|
|
211
|
-
var _tplusComponentsTouch = require('tplus-components-touch');
|
|
212
|
-
|
|
213
215
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
214
216
|
|
|
215
217
|
var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.platform.electron;
|
|
@@ -327,7 +329,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
327
329
|
var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
|
|
328
330
|
PayStyle = _enumController$getEn.PayStyle;
|
|
329
331
|
|
|
330
|
-
_this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto
|
|
332
|
+
_this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto);
|
|
331
333
|
var amount = _this2.store.paymode.amount;
|
|
332
334
|
if (amount == 0) {
|
|
333
335
|
_this2.settleZero();
|
|
@@ -593,10 +595,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
593
595
|
// czkVisible: true
|
|
594
596
|
// })
|
|
595
597
|
// }
|
|
596
|
-
// }
|
|
598
|
+
// }
|
|
597
599
|
// // else {
|
|
598
600
|
// // Message.warn('请先录入会员');
|
|
599
|
-
// // }
|
|
601
|
+
// // }
|
|
600
602
|
// // this.setState({
|
|
601
603
|
// // czkVisible: true,
|
|
602
604
|
// // });
|
|
@@ -1422,7 +1424,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1422
1424
|
if (_this2.hotkeydebouncedPayMode == mode) {
|
|
1423
1425
|
return;
|
|
1424
1426
|
}
|
|
1425
|
-
|
|
1427
|
+
_this2.store.changeClickFocusOnly(mode.paymentType);
|
|
1426
1428
|
_this2.setCurrentFocusOnly(mode.paymentType);
|
|
1427
1429
|
if (_this2.hotkeydebounced) {
|
|
1428
1430
|
_this2.hotkeydebounced.cancel();
|
|
@@ -2495,57 +2497,179 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
2495
2497
|
};
|
|
2496
2498
|
}();
|
|
2497
2499
|
|
|
2498
|
-
_this2.
|
|
2499
|
-
_this2.
|
|
2500
|
-
|
|
2501
|
-
});
|
|
2500
|
+
_this2.isNoProductTip = function (nonProductMap) {
|
|
2501
|
+
var _ref24 = _this2.context.viewModel.data || {},
|
|
2502
|
+
RetailDetails = _ref24.RetailDetails;
|
|
2502
2503
|
|
|
2503
|
-
var
|
|
2504
|
-
|
|
2504
|
+
var names = [];
|
|
2505
|
+
var temphtml = [];
|
|
2506
|
+
var count = 0;
|
|
2507
|
+
if ((0, _keys2.default)(nonProductMap).length > 0) {
|
|
2508
|
+
var _loop = function _loop(key) {
|
|
2509
|
+
count++;
|
|
2510
|
+
var product = RetailDetails.find(function (o) {
|
|
2511
|
+
return o.Idinventory == key;
|
|
2512
|
+
});
|
|
2513
|
+
names.push('【' + product.Inventory.Name + '】');
|
|
2514
|
+
temphtml.push(count + '、' + nonProductMap[key]);
|
|
2515
|
+
};
|
|
2505
2516
|
|
|
2506
|
-
|
|
2507
|
-
|
|
2508
|
-
|
|
2509
|
-
|
|
2510
|
-
|
|
2517
|
+
for (var key in nonProductMap) {
|
|
2518
|
+
_loop(key);
|
|
2519
|
+
}
|
|
2520
|
+
_modalWraper2.default.warning({
|
|
2521
|
+
title: '不可配送商品',
|
|
2522
|
+
content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join(';')
|
|
2523
|
+
});
|
|
2524
|
+
return true;
|
|
2525
|
+
}
|
|
2526
|
+
return false;
|
|
2527
|
+
};
|
|
2511
2528
|
|
|
2529
|
+
_this2.btnDebounced = function () {
|
|
2530
|
+
var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
|
|
2531
|
+
var IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref26, nonProductMap, _ref26$freightProduct, freightProductDTOList, data, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
|
|
2512
2532
|
|
|
2513
|
-
|
|
2533
|
+
return _regenerator2.default.wrap(function _callee14$(_context14) {
|
|
2534
|
+
while (1) {
|
|
2535
|
+
switch (_context14.prev = _context14.next) {
|
|
2536
|
+
case 0:
|
|
2537
|
+
IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
|
|
2538
|
+
CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
|
|
2539
|
+
DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
|
|
2540
|
+
//预订时,若没录入买家手机号,或配送方式为快递时,弹框买家信息确认框
|
|
2514
2541
|
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
}
|
|
2520
|
-
});
|
|
2521
|
-
_this2.setState({
|
|
2522
|
-
isXianjin: status ? true : false
|
|
2523
|
-
});
|
|
2542
|
+
if (!(IdbusiType == 38)) {
|
|
2543
|
+
_context14.next = 28;
|
|
2544
|
+
break;
|
|
2545
|
+
}
|
|
2524
2546
|
|
|
2525
|
-
|
|
2526
|
-
|
|
2527
|
-
|
|
2528
|
-
|
|
2529
|
-
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
|
|
2534
|
-
|
|
2535
|
-
|
|
2536
|
-
|
|
2537
|
-
|
|
2538
|
-
|
|
2539
|
-
|
|
2540
|
-
|
|
2541
|
-
|
|
2542
|
-
|
|
2543
|
-
|
|
2547
|
+
if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
|
2548
|
+
_context14.next = 7;
|
|
2549
|
+
break;
|
|
2550
|
+
}
|
|
2551
|
+
|
|
2552
|
+
_context14.next = 7;
|
|
2553
|
+
return _this2.props.openBuyerModal();
|
|
2554
|
+
|
|
2555
|
+
case 7:
|
|
2556
|
+
if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
|
2557
|
+
_context14.next = 28;
|
|
2558
|
+
break;
|
|
2559
|
+
}
|
|
2560
|
+
|
|
2561
|
+
_this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
|
|
2562
|
+
IPMSG = {};
|
|
2563
|
+
|
|
2564
|
+
if (!!window.localStorage.IPMSG) {
|
|
2565
|
+
IPMSG = JSON.parse(window.localStorage.IPMSG);
|
|
2566
|
+
}
|
|
2567
|
+
_context14.next = 13;
|
|
2568
|
+
return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
|
|
2569
|
+
|
|
2570
|
+
case 13:
|
|
2571
|
+
_ref26 = _context14.sent;
|
|
2572
|
+
nonProductMap = _ref26.nonProductMap;
|
|
2573
|
+
_ref26$freightProduct = _ref26.freightProductDTOList;
|
|
2574
|
+
freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
|
|
2575
|
+
|
|
2576
|
+
if (!_this2.isNoProductTip(nonProductMap)) {
|
|
2577
|
+
_context14.next = 19;
|
|
2578
|
+
break;
|
|
2579
|
+
}
|
|
2580
|
+
|
|
2581
|
+
return _context14.abrupt('return');
|
|
2582
|
+
|
|
2583
|
+
case 19:
|
|
2584
|
+
_context14.next = 21;
|
|
2585
|
+
return _this2.props.openWareHouseModal(freightProductDTOList);
|
|
2586
|
+
|
|
2587
|
+
case 21:
|
|
2588
|
+
_context14.next = 23;
|
|
2589
|
+
return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
|
|
2590
|
+
|
|
2591
|
+
case 23:
|
|
2592
|
+
data = _context14.sent;
|
|
2593
|
+
|
|
2594
|
+
if (!_this2.isNoProductTip(data.nonProductMap)) {
|
|
2595
|
+
_context14.next = 26;
|
|
2596
|
+
break;
|
|
2597
|
+
}
|
|
2598
|
+
|
|
2599
|
+
return _context14.abrupt('return');
|
|
2600
|
+
|
|
2601
|
+
case 26:
|
|
2602
|
+
_context14.next = 28;
|
|
2603
|
+
return _this2.props.updataFreight(data.freight);
|
|
2604
|
+
|
|
2605
|
+
case 28:
|
|
2606
|
+
|
|
2607
|
+
_this2.setState({
|
|
2608
|
+
bquick: bquick
|
|
2609
|
+
});
|
|
2610
|
+
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
|
|
2611
|
+
_this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
|
|
2612
|
+
|
|
2613
|
+
if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
|
|
2614
|
+
_context14.next = 33;
|
|
2615
|
+
break;
|
|
2616
|
+
}
|
|
2617
|
+
|
|
2618
|
+
return _context14.abrupt('return', false);
|
|
2619
|
+
|
|
2620
|
+
case 33:
|
|
2621
|
+
status = false;
|
|
2622
|
+
|
|
2623
|
+
paymode.thePaymodes.forEach(function (v) {
|
|
2624
|
+
if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
|
|
2625
|
+
status = true;
|
|
2626
|
+
}
|
|
2627
|
+
});
|
|
2628
|
+
_this2.setState({
|
|
2629
|
+
isXianjin: status ? true : false
|
|
2630
|
+
});
|
|
2631
|
+
|
|
2632
|
+
if (!_this2.btndebounced) {
|
|
2633
|
+
_context14.next = 38;
|
|
2634
|
+
break;
|
|
2635
|
+
}
|
|
2636
|
+
|
|
2637
|
+
return _context14.abrupt('return');
|
|
2638
|
+
|
|
2639
|
+
case 38:
|
|
2640
|
+
_this2.btndebounced = (0, _debounce3.default)(function () {
|
|
2641
|
+
if (bquick) {
|
|
2642
|
+
_this2.quickSettle(type);
|
|
2643
|
+
} else {
|
|
2644
|
+
_this2.showModal();
|
|
2645
|
+
}
|
|
2646
|
+
}, 1000, {
|
|
2647
|
+
'leading': true,
|
|
2648
|
+
'trailing': false
|
|
2649
|
+
});
|
|
2650
|
+
_this2.btndebounced();
|
|
2651
|
+
setTimeout(function () {
|
|
2652
|
+
_this2.btndebounced.cancel();
|
|
2653
|
+
_this2.btndebounced = null;
|
|
2654
|
+
}, 2000);
|
|
2655
|
+
|
|
2656
|
+
case 41:
|
|
2657
|
+
case 'end':
|
|
2658
|
+
return _context14.stop();
|
|
2659
|
+
}
|
|
2660
|
+
}
|
|
2661
|
+
}, _callee14, _this3);
|
|
2662
|
+
}));
|
|
2663
|
+
|
|
2664
|
+
return function (_x8, _x9) {
|
|
2665
|
+
return _ref25.apply(this, arguments);
|
|
2666
|
+
};
|
|
2667
|
+
}();
|
|
2544
2668
|
|
|
2545
2669
|
_this2.onCzkChange = function (v) {
|
|
2546
2670
|
// console.log("czk change:"+new Date().toLocaleTimeString())
|
|
2547
|
-
var
|
|
2548
|
-
isNewRetailBCPos =
|
|
2671
|
+
var _ref27 = _mutantsUtil.platform || {},
|
|
2672
|
+
isNewRetailBCPos = _ref27.isNewRetailBCPos;
|
|
2549
2673
|
|
|
2550
2674
|
if (!isNewRetailBCPos) {
|
|
2551
2675
|
_this2.store.paymode.currentMode.member.setCardNo(v);
|
|
@@ -2682,6 +2806,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
2682
2806
|
type = _this2$props3.type;
|
|
2683
2807
|
|
|
2684
2808
|
var isManualIntoAmount = void 0;
|
|
2809
|
+
var BuyerPayFreight = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.BuyerPayFreight;
|
|
2810
|
+
var DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
|
|
2685
2811
|
// 付款弹窗
|
|
2686
2812
|
return new _promise2.default(function (resolve, reject) {
|
|
2687
2813
|
var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
|
|
@@ -2771,7 +2897,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
2771
2897
|
_react2.default.createElement(
|
|
2772
2898
|
'span',
|
|
2773
2899
|
{ className: 'yfje' },
|
|
2774
|
-
paymode.value
|
|
2900
|
+
paymode.value,
|
|
2901
|
+
(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? _react2.default.createElement(
|
|
2902
|
+
'span',
|
|
2903
|
+
{ className: 'freight' },
|
|
2904
|
+
'(\u5305\u542B',
|
|
2905
|
+
BuyerPayFreight,
|
|
2906
|
+
'\u5143\u8FD0\u8D39)'
|
|
2907
|
+
) : null
|
|
2775
2908
|
)
|
|
2776
2909
|
),
|
|
2777
2910
|
paymode.paymentType == PayStyle.xianjin && _react2.default.createElement(
|
|
@@ -2951,9 +3084,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
2951
3084
|
};
|
|
2952
3085
|
|
|
2953
3086
|
_this2.checkCurrentModeHaveMutex = function (type) {
|
|
2954
|
-
var _this2$
|
|
2955
|
-
paymode = _this2$
|
|
2956
|
-
newStyle = _this2$
|
|
3087
|
+
var _this2$store9 = _this2.store,
|
|
3088
|
+
paymode = _this2$store9.paymode,
|
|
3089
|
+
newStyle = _this2$store9.newStyle;
|
|
2957
3090
|
|
|
2958
3091
|
var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
|
|
2959
3092
|
PayStyle = _enumController$getEn27.PayStyle;
|
|
@@ -3126,17 +3259,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
3126
3259
|
|
|
3127
3260
|
_this2.hasElectron = hasElectron;
|
|
3128
3261
|
|
|
3129
|
-
var
|
|
3130
|
-
ICCardServer =
|
|
3131
|
-
ICCardPassword =
|
|
3262
|
+
var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
|
|
3263
|
+
ICCardServer = _ref28.ICCardServer,
|
|
3264
|
+
ICCardPassword = _ref28.ICCardPassword,
|
|
3265
|
+
PreSellOrBook = _ref28.PreSellOrBook,
|
|
3266
|
+
PercentageWhenBook = _ref28.PercentageWhenBook;
|
|
3132
3267
|
|
|
3133
3268
|
_this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
|
|
3134
3269
|
_this2.iCCardPassword = ICCardPassword; //IC卡密码
|
|
3270
|
+
_this2.isBook = PreSellOrBook == 'BOOK';
|
|
3271
|
+
_this2.percentageWhenBook = PercentageWhenBook;
|
|
3135
3272
|
//移动端环境下,没有读取IC卡的方式。
|
|
3136
3273
|
|
|
3137
|
-
var
|
|
3138
|
-
isHorizontalPad =
|
|
3139
|
-
isHorizontalSunMi =
|
|
3274
|
+
var _ref29 = _mutantsUtil.platform || {},
|
|
3275
|
+
isHorizontalPad = _ref29.isHorizontalPad,
|
|
3276
|
+
isHorizontalSunMi = _ref29.isHorizontalSunMi;
|
|
3140
3277
|
|
|
3141
3278
|
_this2.isHorizontalPad = !!isHorizontalPad;
|
|
3142
3279
|
_this2.isHorizontalSunMi = !!isHorizontalSunMi;
|
|
@@ -3371,8 +3508,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
3371
3508
|
discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
|
|
3372
3509
|
storageValue = _state2.storageValue;
|
|
3373
3510
|
|
|
3374
|
-
var
|
|
3375
|
-
isNewRetailBCPos =
|
|
3511
|
+
var _ref30 = _mutantsUtil.platform || {},
|
|
3512
|
+
isNewRetailBCPos = _ref30.isNewRetailBCPos;
|
|
3376
3513
|
|
|
3377
3514
|
var _store2 = this.store,
|
|
3378
3515
|
paymode = _store2.paymode,
|
|
@@ -3391,6 +3528,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
3391
3528
|
|
|
3392
3529
|
var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
|
|
3393
3530
|
var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
|
|
3531
|
+
|
|
3532
|
+
//收订金
|
|
3533
|
+
var IdbusiType = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.IdbusiType;
|
|
3534
|
+
var BuyerPayFreight = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.BuyerPayFreight;
|
|
3535
|
+
var DistributionMode = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.DistributionMode;
|
|
3536
|
+
if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
|
3537
|
+
totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
|
|
3538
|
+
}
|
|
3539
|
+
if (IdbusiType == 39) {
|
|
3540
|
+
totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
|
|
3541
|
+
}
|
|
3542
|
+
|
|
3394
3543
|
// 单据模式
|
|
3395
3544
|
var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
|
|
3396
3545
|
return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
|
|
@@ -3435,11 +3584,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
3435
3584
|
quantity4 = 0;
|
|
3436
3585
|
var sumQuantity = 0; //数量总和的值,包括称重的。
|
|
3437
3586
|
|
|
3438
|
-
var
|
|
3439
|
-
|
|
3440
|
-
buyQuantity =
|
|
3441
|
-
|
|
3442
|
-
returnQuantity =
|
|
3587
|
+
var _ref31 = quantityDetail || {},
|
|
3588
|
+
_ref31$buyQuantity = _ref31.buyQuantity,
|
|
3589
|
+
buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
|
|
3590
|
+
_ref31$returnQuantity = _ref31.returnQuantity,
|
|
3591
|
+
returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
|
|
3443
3592
|
|
|
3444
3593
|
var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
|
|
3445
3594
|
quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
|
|
@@ -3824,6 +3973,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
3824
3973
|
{ className: 'received' },
|
|
3825
3974
|
(0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
|
|
3826
3975
|
)
|
|
3976
|
+
),
|
|
3977
|
+
_react2.default.createElement(
|
|
3978
|
+
'div',
|
|
3979
|
+
{ className: 'receivable', style: { display: (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
|
|
3980
|
+
_react2.default.createElement(
|
|
3981
|
+
'span',
|
|
3982
|
+
null,
|
|
3983
|
+
'\u8FD0\u8D39'
|
|
3984
|
+
),
|
|
3985
|
+
_react2.default.createElement(
|
|
3986
|
+
'span',
|
|
3987
|
+
{ className: 'received' },
|
|
3988
|
+
(0, _utils.getFixedNumber)(Math.abs(BuyerPayFreight))
|
|
3989
|
+
)
|
|
3827
3990
|
)
|
|
3828
3991
|
),
|
|
3829
3992
|
!isReturn && _react2.default.createElement(
|
|
@@ -4040,7 +4203,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
4040
4203
|
// return;
|
|
4041
4204
|
// }
|
|
4042
4205
|
// }
|
|
4043
|
-
// mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
|
|
4206
|
+
// mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
|
|
4044
4207
|
_this8.onHotKeyClick1(mode, index, boriginReturn);
|
|
4045
4208
|
},
|
|
4046
4209
|
value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
|
|
@@ -4818,8 +4981,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
4818
4981
|
_this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
|
|
4819
4982
|
},
|
|
4820
4983
|
defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
|
|
4821
|
-
ref: function ref(
|
|
4822
|
-
return _this8["inputCzkAmount"] =
|
|
4984
|
+
ref: function ref(_ref32) {
|
|
4985
|
+
return _this8["inputCzkAmount"] = _ref32;
|
|
4823
4986
|
},
|
|
4824
4987
|
onFocus: function onFocus(e) {
|
|
4825
4988
|
_this8.inputkey = "inputCzkAmount";
|
|
@@ -5072,7 +5235,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
5072
5235
|
_react2.default.createElement(
|
|
5073
5236
|
'div',
|
|
5074
5237
|
{ className: 'djq2' },
|
|
5075
|
-
|
|
5238
|
+
(0, _map3.default)(currentMode && currentMode.djqs || [], function (q, index) {
|
|
5076
5239
|
if (!_this8.state.couponLight && !q.count) {
|
|
5077
5240
|
return;
|
|
5078
5241
|
}
|
|
@@ -5182,10 +5345,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
5182
5345
|
_react2.default.createElement('div', { className: 'point_top' }),
|
|
5183
5346
|
_react2.default.createElement('div', { className: 'point_bottom' })
|
|
5184
5347
|
);
|
|
5185
|
-
})
|
|
5186
|
-
state: "empty"
|
|
5187
|
-
// stateCommonStyle={{ 'marginTop': "36px" }}
|
|
5188
|
-
, empty: { buttonVisible: false } })
|
|
5348
|
+
})
|
|
5189
5349
|
)
|
|
5190
5350
|
),
|
|
5191
5351
|
currentMode && !currentMode.boriginReturn && _react2.default.createElement(
|
|
@@ -5439,8 +5599,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
5439
5599
|
_this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
|
|
5440
5600
|
},
|
|
5441
5601
|
defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
|
|
5442
|
-
ref: function ref(
|
|
5443
|
-
return _this8["inputJfdxAmount"] =
|
|
5602
|
+
ref: function ref(_ref33) {
|
|
5603
|
+
return _this8["inputJfdxAmount"] = _ref33;
|
|
5444
5604
|
},
|
|
5445
5605
|
onFocus: function onFocus(e) {
|
|
5446
5606
|
_this8.inputkey = "inputJfdxAmount";
|