tplus-components-touch 3.40.1 → 3.40.2
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 +38 -26
- package/dist/components/billSearch/index.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/datePicker/index.js +6 -3
- package/dist/components/commonForm/datePicker/index.js.map +1 -1
- package/dist/components/commonForm/formControl/index.js +3 -2
- package/dist/components/commonForm/formControl/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/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/layout/style.less +1 -1
- package/dist/components/presale/pickup.js +479 -0
- package/dist/components/presale/pickup.js.map +1 -0
- package/dist/components/presale/style.less +59 -0
- package/dist/components/settlement/prototypeTable/index.js +3 -1
- package/dist/components/settlement/prototypeTable/index.js.map +1 -1
- package/dist/components/settlement/settlement.js +379 -129
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +23 -8
- package/dist/components/settlement/settlementStore.js +239 -106
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/settlement/utils.js +2 -2
- package/dist/components/settlement/utils.js.map +1 -1
- package/dist/components/ticon/iconfont/demo_index.html +3 -3
- package/dist/components/ticon/iconfont/iconfont.css +3 -3
- 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 -0
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/package.json +35 -35
@@ -16,6 +16,14 @@ var _drawer = require('antd/es/drawer');
|
|
16
16
|
|
17
17
|
var _drawer2 = _interopRequireDefault(_drawer);
|
18
18
|
|
19
|
+
var _table = require('antd/es/table');
|
20
|
+
|
21
|
+
var _table2 = _interopRequireDefault(_table);
|
22
|
+
|
23
|
+
var _keys = require('babel-runtime/core-js/object/keys');
|
24
|
+
|
25
|
+
var _keys2 = _interopRequireDefault(_keys);
|
26
|
+
|
19
27
|
var _extends2 = require('babel-runtime/helpers/extends');
|
20
28
|
|
21
29
|
var _extends3 = _interopRequireDefault(_extends2);
|
@@ -88,6 +96,8 @@ require('antd/es/input/style');
|
|
88
96
|
|
89
97
|
require('antd/es/drawer/style');
|
90
98
|
|
99
|
+
require('antd/es/table/style');
|
100
|
+
|
91
101
|
require('antd/es/carousel/style');
|
92
102
|
|
93
103
|
require('antd/es/button/style');
|
@@ -362,7 +372,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
362
372
|
isReturn = _this2$props.isReturn,
|
363
373
|
type = _this2$props.type;
|
364
374
|
|
365
|
-
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true
|
375
|
+
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true, fn: function fn(data) {
|
376
|
+
return _this2.isNoProductTip(data);
|
377
|
+
} })).then(function (result) {
|
366
378
|
if (result) {
|
367
379
|
_this2.setState({
|
368
380
|
settleDisabled: false
|
@@ -427,6 +439,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
427
439
|
return (0, _assign2.default)({}, o);
|
428
440
|
});
|
429
441
|
var discountRetailTotalAount = null;
|
442
|
+
var discountPrototypeTotalAmount = 0;
|
430
443
|
var count = 0;
|
431
444
|
dataSource && dataSource.forEach(function (item) {
|
432
445
|
var count1 = 0;
|
@@ -458,6 +471,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
458
471
|
}
|
459
472
|
item.InventoryName = item.Inventory.Name;
|
460
473
|
item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
|
474
|
+
discountPrototypeTotalAmount += item.DetailDiscountAmount;
|
461
475
|
//item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
|
462
476
|
item.TotalDiscount = item.DetailDiscountAmount;
|
463
477
|
item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
|
@@ -468,11 +482,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
468
482
|
});
|
469
483
|
_this2.setState({
|
470
484
|
dataSource: dataSource,
|
471
|
-
discountTotalAmount: (0, _utils.getFixedNumber)(
|
472
|
-
|
473
|
-
|
485
|
+
discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
|
486
|
+
discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
|
487
|
+
discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
|
474
488
|
});
|
475
|
-
console.log(RetailDetails, 'RetailDetails-----');
|
476
489
|
return count;
|
477
490
|
};
|
478
491
|
|
@@ -483,7 +496,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
483
496
|
|
484
497
|
var isAutoShowCouponWhenCash = (0, _tplusPoslogin.PosInitData)('IsAutoShowCouponWhenCash');
|
485
498
|
// 支持异步验证过程
|
486
|
-
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate(
|
499
|
+
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ fn: function fn(data) {
|
500
|
+
return _this2.isNoProductTip(data);
|
501
|
+
} })).then(function (result) {
|
487
502
|
if (result) {
|
488
503
|
_this2.setState({
|
489
504
|
settleDisabled: false
|
@@ -507,6 +522,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
507
522
|
|
508
523
|
_this2.settleZero = function () {
|
509
524
|
var that = _this2;
|
525
|
+
//预售取货无需支付时省略弹框确认这一步
|
526
|
+
var IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
|
527
|
+
if (IdbusiType == 39) {
|
528
|
+
that.handleSettle("zero");
|
529
|
+
return;
|
530
|
+
}
|
510
531
|
_modalWraper2.default.confirm({
|
511
532
|
className: 'tplus-confirm-modal',
|
512
533
|
title: '结算',
|
@@ -1050,7 +1071,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1050
1071
|
setTimeout(function () {
|
1051
1072
|
_this2.inputJfdxAmount.input.focus();
|
1052
1073
|
_this2.inputJfdxAmount.input.setSelectionRange(0, _this2.inputJfdxAmount.input.value.length);
|
1053
|
-
},
|
1074
|
+
}, 300);
|
1054
1075
|
};
|
1055
1076
|
|
1056
1077
|
_this2.handleJfdxOk = function (e) {
|
@@ -1092,7 +1113,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1092
1113
|
}
|
1093
1114
|
};
|
1094
1115
|
|
1095
|
-
_this2.onTabsClick2 = function (paymode, brefund, themode, key) {
|
1116
|
+
_this2.onTabsClick2 = function (paymode, brefund, themode, key, bookType) {
|
1096
1117
|
var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
|
1097
1118
|
PayStyle = _enumController$getEn7.PayStyle,
|
1098
1119
|
Differentiate = _enumController$getEn7.Differentiate;
|
@@ -1125,7 +1146,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1125
1146
|
})) {
|
1126
1147
|
_message2.default.error('已使用了其他的付款码支付,不可以再使用微信了。');
|
1127
1148
|
} else {
|
1128
|
-
_this2.setCurrentFocusAndAddPay(key);
|
1149
|
+
_this2.setCurrentFocusAndAddPay(key, bookType);
|
1129
1150
|
}
|
1130
1151
|
break;
|
1131
1152
|
case PayStyle.zfb:
|
@@ -1134,7 +1155,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1134
1155
|
})) {
|
1135
1156
|
_message2.default.error('已使用了其他的付款码支付,不可以再使用支付宝了。');
|
1136
1157
|
} else {
|
1137
|
-
_this2.setCurrentFocusAndAddPay(key);
|
1158
|
+
_this2.setCurrentFocusAndAddPay(key, bookType);
|
1138
1159
|
}
|
1139
1160
|
break;
|
1140
1161
|
case PayStyle.smzf:
|
@@ -1143,11 +1164,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1143
1164
|
})) {
|
1144
1165
|
_message2.default.error('已使用了其他的付款码支付,不可以再使用扫码支付了。');
|
1145
1166
|
} else {
|
1146
|
-
_this2.setCurrentFocusAndAddPay(key);
|
1167
|
+
_this2.setCurrentFocusAndAddPay(key, bookType);
|
1147
1168
|
}
|
1148
1169
|
break;
|
1149
1170
|
default:
|
1150
|
-
_this2.setCurrentFocusAndAddPay(key);
|
1171
|
+
_this2.setCurrentFocusAndAddPay(key, bookType);
|
1151
1172
|
break;
|
1152
1173
|
}
|
1153
1174
|
};
|
@@ -1190,7 +1211,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1190
1211
|
return bdisabled;
|
1191
1212
|
};
|
1192
1213
|
|
1193
|
-
_this2.onTabsClick = function (key) {
|
1214
|
+
_this2.onTabsClick = function (key, bookType) {
|
1194
1215
|
var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
|
1195
1216
|
PayStyle = _enumController$getEn9.PayStyle,
|
1196
1217
|
Differentiate = _enumController$getEn9.Differentiate;
|
@@ -1219,6 +1240,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1219
1240
|
return;
|
1220
1241
|
}
|
1221
1242
|
var themode = (0, _find3.default)(paymode.paymodes, { 'paymentType': key });
|
1243
|
+
//预订非全款不可使用零售抵现类支付方式
|
1244
|
+
// if(bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && themode.virtualPay){
|
1245
|
+
// return Message.error("付订金时不可使用零售抵现类结算方式!");
|
1246
|
+
// }
|
1222
1247
|
if (themode.exchangeRate != 1) {
|
1223
1248
|
var forign = (0, _find3.default)(paymode.thePaymodes, function (mode) {
|
1224
1249
|
return mode.exchangeRate != 1 && mode.paymentType != key;
|
@@ -1249,17 +1274,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1249
1274
|
that.setState({
|
1250
1275
|
noAlreadyWarn: false
|
1251
1276
|
});
|
1252
|
-
that.onTabsClick2(paymode, brefund, themode, key);
|
1277
|
+
that.onTabsClick2(paymode, brefund, themode, key, bookType);
|
1253
1278
|
},
|
1254
1279
|
onCancel: function onCancel() {}
|
1255
|
-
}) : that.onTabsClick2(paymode, brefund, themode, key)
|
1280
|
+
}) : that.onTabsClick2(paymode, brefund, themode, key, bookType);
|
1256
1281
|
break;
|
1257
1282
|
default:
|
1258
|
-
_this2.onTabsClick2(paymode, brefund, themode, key);
|
1283
|
+
_this2.onTabsClick2(paymode, brefund, themode, key, bookType);
|
1259
1284
|
break;
|
1260
1285
|
}
|
1261
1286
|
} else {
|
1262
|
-
_this2.onTabsClick2(paymode, brefund, themode, key);
|
1287
|
+
_this2.onTabsClick2(paymode, brefund, themode, key, bookType);
|
1263
1288
|
}
|
1264
1289
|
};
|
1265
1290
|
|
@@ -1282,8 +1307,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1282
1307
|
}
|
1283
1308
|
};
|
1284
1309
|
|
1285
|
-
_this2.setCurrentFocusAndAddPay = function (key, payId) {
|
1286
|
-
_this2.store.changeFocusAndAddPay(key);
|
1310
|
+
_this2.setCurrentFocusAndAddPay = function (key, bookType, payId) {
|
1311
|
+
_this2.store.changeFocusAndAddPay(key, bookType);
|
1287
1312
|
if (_this2.store.bquick) {
|
1288
1313
|
_this2.handleSettle("quickPay");
|
1289
1314
|
} else {
|
@@ -1291,7 +1316,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1291
1316
|
}
|
1292
1317
|
};
|
1293
1318
|
|
1294
|
-
_this2.onDelPay = function (index, boriginReturn, type) {
|
1319
|
+
_this2.onDelPay = function (index, boriginReturn, type, bookType) {
|
1295
1320
|
var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
|
1296
1321
|
PayStyle = _enumController$getEn12.PayStyle;
|
1297
1322
|
|
@@ -1300,17 +1325,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1300
1325
|
if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
|
1301
1326
|
_message2.default.info('原单退货时,该结算方式不可以删除。');
|
1302
1327
|
} else {
|
1303
|
-
_this2.store.delPay(index);
|
1328
|
+
_this2.store.delPay(index, bookType);
|
1304
1329
|
}
|
1305
1330
|
};
|
1306
1331
|
|
1307
|
-
_this2.handleChange = function (index, e) {
|
1332
|
+
_this2.handleChange = function (index, e, type) {
|
1308
1333
|
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(_this2.store.paymode.currentFocus)) return;
|
1334
|
+
var mode = (0, _find3.default)(_this2.store.paymode.thePaymodes, { 'paymethodId': index });
|
1335
|
+
// if(type == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
|
1336
|
+
// return Message.error("付订金时不可使用零售抵现类结算方式!");
|
1337
|
+
// }
|
1309
1338
|
var currentInput = e.target;
|
1310
1339
|
var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
|
1311
1340
|
if (!isNaN(e.target.value) || e.target.value == '-') {
|
1312
1341
|
if (e.target.value.length <= amountMaxLength) {
|
1313
|
-
_this2.store.changeValue(index, e.target.value, false);
|
1342
|
+
_this2.store.changeValue(index, e.target.value, false, type);
|
1314
1343
|
}
|
1315
1344
|
}
|
1316
1345
|
};
|
@@ -1350,14 +1379,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1350
1379
|
}
|
1351
1380
|
}
|
1352
1381
|
}
|
1353
|
-
// let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
|
1354
1382
|
_this2.store.paymode.setCurrentModeValue(val, max);
|
1355
1383
|
};
|
1356
1384
|
|
1357
|
-
_this2.onBlur = function (index, e) {
|
1385
|
+
_this2.onBlur = function (index, e, type) {
|
1358
1386
|
_this2.currentInput = null;
|
1359
1387
|
_this2.store.changeFocusOnly(-1);
|
1360
|
-
_this2.store.changeValue(index, e.target.value == '-' ? 0 : e.target.value, true);
|
1388
|
+
_this2.store.changeValue(index, e.target.value == '-' ? 0 : e.target.value, true, type);
|
1361
1389
|
};
|
1362
1390
|
|
1363
1391
|
_this2.onFocus = function (index, mode, paymode, e) {
|
@@ -1481,7 +1509,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1481
1509
|
}, 2000);
|
1482
1510
|
};
|
1483
1511
|
|
1484
|
-
_this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
|
1512
|
+
_this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
|
1513
|
+
// if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
|
1514
|
+
// return Message.error("付订金时不可使用零售抵现类结算方式!");
|
1515
|
+
// }
|
1485
1516
|
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
|
1486
1517
|
if (_this2.hotkeydebouncedPayMode == mode) {
|
1487
1518
|
return;
|
@@ -1521,11 +1552,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1521
1552
|
}
|
1522
1553
|
};
|
1523
1554
|
|
1524
|
-
_this2.onHotKeyClick2 = function (index, mode, paymode, e) {
|
1555
|
+
_this2.onHotKeyClick2 = function (index, mode, paymode, e, bookType) {
|
1525
1556
|
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
|
1526
1557
|
if (_this2.hotkeydebouncedPayMode == mode) {
|
1527
1558
|
return;
|
1528
1559
|
}
|
1560
|
+
// if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
|
1561
|
+
// return Message.error("付订金时不可使用零售抵现类结算方式!");
|
1562
|
+
// }
|
1529
1563
|
_this2.store.changeClickFocusOnly(mode.paymentType);
|
1530
1564
|
_this2.setCurrentFocusOnly(mode.paymentType);
|
1531
1565
|
if (_this2.hotkeydebounced) {
|
@@ -1676,6 +1710,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1676
1710
|
|
1677
1711
|
_modalWraper2.default.confirm({
|
1678
1712
|
className: 'tplus-confirm-modal',
|
1713
|
+
zIndex: 1007,
|
1679
1714
|
content: _react2.default.createElement(
|
1680
1715
|
'div',
|
1681
1716
|
{ className: 'unReturn' },
|
@@ -1762,7 +1797,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1762
1797
|
};
|
1763
1798
|
|
1764
1799
|
_this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
1765
|
-
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
|
1800
|
+
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, _this2$store6, getSettleGift, isFull, type, resp1;
|
1766
1801
|
|
1767
1802
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
1768
1803
|
while (1) {
|
@@ -1822,7 +1857,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1822
1857
|
}
|
1823
1858
|
};
|
1824
1859
|
|
1825
|
-
|
1860
|
+
_this2$store6 = _this2.store, getSettleGift = _this2$store6.getSettleGift, isFull = _this2$store6.isFull;
|
1826
1861
|
type = _this2.props.type;
|
1827
1862
|
resp1 = false;
|
1828
1863
|
|
@@ -1870,8 +1905,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1870
1905
|
message = "退货成功";
|
1871
1906
|
} else if (MemberPoints && Number(amount) == Number(0)) {
|
1872
1907
|
message = "兑换成功";
|
1908
|
+
} else if (IdbusiType == 39 && received == 0) {
|
1909
|
+
message = "取货成功";
|
1873
1910
|
}
|
1874
|
-
window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, function () {
|
1911
|
+
window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
|
1875
1912
|
_this.handleGuestShow(5);
|
1876
1913
|
});
|
1877
1914
|
_this2.setState({ isXianjin: false });
|
@@ -2028,7 +2065,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2028
2065
|
};
|
2029
2066
|
}();
|
2030
2067
|
|
2031
|
-
var _enumController$getEn21, PayStyle, _this2$
|
2068
|
+
var _enumController$getEn21, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
|
2032
2069
|
|
2033
2070
|
return _regenerator2.default.wrap(function _callee11$(_context11) {
|
2034
2071
|
while (1) {
|
@@ -2039,7 +2076,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2039
2076
|
});
|
2040
2077
|
console.log("settlement.handleSettle开始执行,参数:", +args);
|
2041
2078
|
_enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
|
2042
|
-
_this2$
|
2079
|
+
_this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
|
2043
2080
|
isQuickPay = args === 'quickPay';
|
2044
2081
|
that = _this2;
|
2045
2082
|
status = false;
|
@@ -2368,7 +2405,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2368
2405
|
|
2369
2406
|
//成功
|
2370
2407
|
//返回
|
2371
|
-
that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
|
2408
|
+
that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
2372
2409
|
_promise2.default.resolve();
|
2373
2410
|
_context12.next = 15;
|
2374
2411
|
break;
|
@@ -2591,58 +2628,122 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2591
2628
|
};
|
2592
2629
|
}();
|
2593
2630
|
|
2594
|
-
_this2.btnDebounced = function (
|
2595
|
-
|
2596
|
-
|
2597
|
-
isInputMember: true
|
2598
|
-
});
|
2631
|
+
_this2.btnDebounced = function () {
|
2632
|
+
var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
|
2633
|
+
var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
|
2599
2634
|
|
2600
|
-
|
2601
|
-
|
2635
|
+
return _regenerator2.default.wrap(function _callee16$(_context16) {
|
2636
|
+
while (1) {
|
2637
|
+
switch (_context16.prev = _context16.next) {
|
2638
|
+
case 0:
|
2639
|
+
IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
|
2640
|
+
CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
|
2641
|
+
DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
|
2642
|
+
Address = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.Address;
|
2643
|
+
//预订时,若没录入买家手机号,或配送方式为快递时,弹框买家信息确认框
|
2644
|
+
|
2645
|
+
if (!(IdbusiType == 38)) {
|
2646
|
+
_context16.next = 14;
|
2647
|
+
break;
|
2648
|
+
}
|
2602
2649
|
|
2603
|
-
|
2604
|
-
|
2605
|
-
|
2606
|
-
|
2607
|
-
|
2650
|
+
//预售下单时,启用了序列号管理和批号/有效期管理的商品,不支持快递和同城配送
|
2651
|
+
isEnableSerialNumber = (0, _tplusPoslogin.PosInitData)("IsEnableSerialNumber");
|
2652
|
+
resultObj = _this2.context.viewModel.data.RetailDetails.find(function (o) {
|
2653
|
+
return o.Inventory.IsSerialNumber && (o.Inventory.IsBatch || o.Inventory.IsQualityPeriod);
|
2654
|
+
});
|
2608
2655
|
|
2656
|
+
if (!(isEnableSerialNumber && resultObj && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE'))) {
|
2657
|
+
_context16.next = 9;
|
2658
|
+
break;
|
2659
|
+
}
|
2609
2660
|
|
2610
|
-
|
2661
|
+
return _context16.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品,不支持快递和同城配送'));
|
2611
2662
|
|
2612
|
-
|
2613
|
-
paymode.thePaymodes.forEach(function (v) {
|
2614
|
-
if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
|
2615
|
-
status = true;
|
2616
|
-
}
|
2617
|
-
});
|
2618
|
-
_this2.setState({
|
2619
|
-
isXianjin: status ? true : false
|
2620
|
-
});
|
2663
|
+
case 9:
|
2621
2664
|
|
2622
|
-
|
2623
|
-
|
2624
|
-
|
2625
|
-
|
2626
|
-
|
2627
|
-
|
2628
|
-
|
2629
|
-
|
2630
|
-
|
2631
|
-
|
2632
|
-
|
2633
|
-
|
2634
|
-
|
2635
|
-
|
2636
|
-
|
2637
|
-
|
2638
|
-
|
2639
|
-
|
2640
|
-
|
2665
|
+
if (DistributionMode.Id == 'ON_SITE_PICKUP' && !CustomerPhone && _this2.context.viewModel.data.Member.Mobilephone) {
|
2666
|
+
_this2.props.syncMemberInfoProcessor();
|
2667
|
+
}
|
2668
|
+
|
2669
|
+
if (!(!CustomerPhone && !_this2.context.viewModel.data.Member.Mobilephone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
2670
|
+
_context16.next = 14;
|
2671
|
+
break;
|
2672
|
+
}
|
2673
|
+
|
2674
|
+
title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
|
2675
|
+
_context16.next = 14;
|
2676
|
+
return _this2.props.openBuyerModal(title);
|
2677
|
+
|
2678
|
+
case 14:
|
2679
|
+
|
2680
|
+
_this2.setState({
|
2681
|
+
bquick: bquick,
|
2682
|
+
isInputMember: true
|
2683
|
+
});
|
2684
|
+
_enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
|
2685
|
+
_this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
|
2686
|
+
|
2687
|
+
if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
|
2688
|
+
_context16.next = 19;
|
2689
|
+
break;
|
2690
|
+
}
|
2691
|
+
|
2692
|
+
return _context16.abrupt('return', false);
|
2693
|
+
|
2694
|
+
case 19:
|
2695
|
+
status = false;
|
2696
|
+
|
2697
|
+
paymode.thePaymodes.forEach(function (v) {
|
2698
|
+
if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
|
2699
|
+
status = true;
|
2700
|
+
}
|
2701
|
+
});
|
2702
|
+
_this2.setState({
|
2703
|
+
isXianjin: status ? true : false
|
2704
|
+
});
|
2705
|
+
|
2706
|
+
if (!_this2.btndebounced) {
|
2707
|
+
_context16.next = 24;
|
2708
|
+
break;
|
2709
|
+
}
|
2710
|
+
|
2711
|
+
return _context16.abrupt('return');
|
2712
|
+
|
2713
|
+
case 24:
|
2714
|
+
_this2.btndebounced = (0, _debounce3.default)(function () {
|
2715
|
+
if (bquick) {
|
2716
|
+
_this2.quickSettle(type);
|
2717
|
+
} else {
|
2718
|
+
_this2.showModal();
|
2719
|
+
}
|
2720
|
+
}, 1000, {
|
2721
|
+
'leading': true,
|
2722
|
+
'trailing': false
|
2723
|
+
});
|
2724
|
+
_this2.btndebounced();
|
2725
|
+
setTimeout(function () {
|
2726
|
+
_this2.btndebounced.cancel();
|
2727
|
+
_this2.btndebounced = null;
|
2728
|
+
}, 2000);
|
2729
|
+
|
2730
|
+
case 27:
|
2731
|
+
case 'end':
|
2732
|
+
return _context16.stop();
|
2733
|
+
}
|
2734
|
+
}
|
2735
|
+
}, _callee16, _this3);
|
2736
|
+
}));
|
2737
|
+
|
2738
|
+
return function (_x10, _x11) {
|
2739
|
+
return _ref24.apply(this, arguments);
|
2740
|
+
};
|
2741
|
+
}();
|
2641
2742
|
|
2642
2743
|
_this2.onCzkChange = function (v) {
|
2643
2744
|
// console.log("czk change:"+new Date().toLocaleTimeString())
|
2644
|
-
var
|
2645
|
-
isNewRetailBCPos =
|
2745
|
+
var _ref25 = _mutantsUtil.platform || {},
|
2746
|
+
isNewRetailBCPos = _ref25.isNewRetailBCPos;
|
2646
2747
|
|
2647
2748
|
if (!isNewRetailBCPos) {
|
2648
2749
|
_this2.store.paymode.currentMode.member.setCardNo(v);
|
@@ -2722,7 +2823,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2722
2823
|
value = parseFloat(receivable) + parseFloat(inputTarget2.innerHTML);
|
2723
2824
|
}
|
2724
2825
|
inputTarget.value = value;
|
2725
|
-
|
2826
|
+
//预订现金快捷支付,这里修改找零计算,大于应收小于全额金额,不找零,大于全额金额找零
|
2827
|
+
if (_this2.store.paymode.isNotFullBook) {
|
2828
|
+
if (parseFloat(value || 0) > _this2.store.paymode.bookMaxValue) {
|
2829
|
+
inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(_this2.store.paymode.bookMaxValue));
|
2830
|
+
}
|
2831
|
+
if (parseFloat(value || 0) < parseFloat(receivable)) {
|
2832
|
+
inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
|
2833
|
+
}
|
2834
|
+
if (parseFloat(receivable) <= parseFloat(value || 0) && parseFloat(value || 0) <= _this2.store.paymode.bookMaxValue) {
|
2835
|
+
inputTarget2.innerHTML = (0, _utils.getFixedNumber)(0);
|
2836
|
+
}
|
2837
|
+
} else {
|
2838
|
+
inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
|
2839
|
+
}
|
2726
2840
|
};
|
2727
2841
|
|
2728
2842
|
_this2.changeScanProduct = function () {
|
@@ -2779,6 +2893,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2779
2893
|
type = _this2$props3.type;
|
2780
2894
|
|
2781
2895
|
var isManualIntoAmount = void 0;
|
2896
|
+
var BuyerPayFreight = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.BuyerPayFreight;
|
2897
|
+
var DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
|
2782
2898
|
// 付款弹窗
|
2783
2899
|
return new _promise2.default(function (resolve, reject) {
|
2784
2900
|
var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
|
@@ -2868,7 +2984,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2868
2984
|
_react2.default.createElement(
|
2869
2985
|
'span',
|
2870
2986
|
{ className: 'yfje' },
|
2871
|
-
paymode.value
|
2987
|
+
paymode.value,
|
2988
|
+
DistributionMode && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? _react2.default.createElement(
|
2989
|
+
'span',
|
2990
|
+
{ className: 'freight' },
|
2991
|
+
'(\u5305\u542B',
|
2992
|
+
BuyerPayFreight,
|
2993
|
+
'\u5143\u8FD0\u8D39)'
|
2994
|
+
) : null
|
2872
2995
|
)
|
2873
2996
|
),
|
2874
2997
|
paymode.paymentType == PayStyle.xianjin && _react2.default.createElement(
|
@@ -2992,7 +3115,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2992
3115
|
settleDisabled: false
|
2993
3116
|
});
|
2994
3117
|
that.store.bquick && that.props.onCancelSettle && that.props.onCancelSettle();
|
2995
|
-
that.store.bquick && that.store.delPay(paymode.paymethodId);
|
3118
|
+
that.store.bquick && that.store.delPay(paymode.paymethodId, !isQuickPay ? 'bookPay' : '');
|
2996
3119
|
reject('\u652F\u4ED8\u65B9\u5F0F: ' + paymode.name + '\u5931\u8D25');
|
2997
3120
|
} },
|
2998
3121
|
'\u53D6\u6D88'
|
@@ -3022,7 +3145,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3022
3145
|
modal.destroy();
|
3023
3146
|
setTimeout(function () {
|
3024
3147
|
if (paymode.paymentType == PayStyle.xianjin) {
|
3025
|
-
that.store.changeValue(paymode.paymethodId, v, false);
|
3148
|
+
that.store.changeValue(paymode.paymethodId, v, false, 'bookPay');
|
3026
3149
|
} else {
|
3027
3150
|
paymode.authCode = v;
|
3028
3151
|
}
|
@@ -3051,9 +3174,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3051
3174
|
};
|
3052
3175
|
|
3053
3176
|
_this2.checkCurrentModeHaveMutex = function (type) {
|
3054
|
-
var _this2$
|
3055
|
-
paymode = _this2$
|
3056
|
-
newStyle = _this2$
|
3177
|
+
var _this2$store9 = _this2.store,
|
3178
|
+
paymode = _this2$store9.paymode,
|
3179
|
+
newStyle = _this2$store9.newStyle;
|
3057
3180
|
|
3058
3181
|
var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
|
3059
3182
|
PayStyle = _enumController$getEn28.PayStyle;
|
@@ -3161,6 +3284,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3161
3284
|
var CarouselTp = CarouseOut || _carousel2.default;
|
3162
3285
|
var newParams = CarouseOut ? {} : params;
|
3163
3286
|
var mapList = [];
|
3287
|
+
var type = _this2.props.type;
|
3288
|
+
|
3164
3289
|
paymodes.forEach(function (item, index) {
|
3165
3290
|
// 整除则新增轮播页面
|
3166
3291
|
if (index % carouselStart === 0) {
|
@@ -3176,7 +3301,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3176
3301
|
'div',
|
3177
3302
|
null,
|
3178
3303
|
(0, _map3.default)(modeList, function (mode, modeIndex) {
|
3179
|
-
return _this2.renderToolbtn(mode, index * carouselStart + modeIndex);
|
3304
|
+
return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, type !== 1 ? 'bookPay' : '');
|
3180
3305
|
})
|
3181
3306
|
);
|
3182
3307
|
})
|
@@ -3227,19 +3352,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3227
3352
|
|
3228
3353
|
_this2.hasElectron = hasElectron;
|
3229
3354
|
|
3230
|
-
var
|
3231
|
-
MemberMeStorageCardInputByKeyBoard =
|
3232
|
-
ICCardServer =
|
3233
|
-
ICCardPassword =
|
3355
|
+
var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
|
3356
|
+
MemberMeStorageCardInputByKeyBoard = _ref26.MemberMeStorageCardInputByKeyBoard,
|
3357
|
+
ICCardServer = _ref26.ICCardServer,
|
3358
|
+
ICCardPassword = _ref26.ICCardPassword,
|
3359
|
+
PreSellOrBook = _ref26.PreSellOrBook,
|
3360
|
+
PercentageWhenBook = _ref26.PercentageWhenBook;
|
3234
3361
|
|
3235
3362
|
_this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
|
3236
3363
|
_this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
|
3237
3364
|
_this2.iCCardPassword = ICCardPassword; //IC卡密码
|
3365
|
+
_this2.isBook = PreSellOrBook == 'BOOK';
|
3366
|
+
_this2.percentageWhenBook = PercentageWhenBook;
|
3238
3367
|
//移动端环境下,没有读取IC卡的方式。
|
3239
3368
|
|
3240
|
-
var
|
3241
|
-
isHorizontalPad =
|
3242
|
-
isHorizontalSunMi =
|
3369
|
+
var _ref27 = _mutantsUtil.platform || {},
|
3370
|
+
isHorizontalPad = _ref27.isHorizontalPad,
|
3371
|
+
isHorizontalSunMi = _ref27.isHorizontalSunMi;
|
3243
3372
|
|
3244
3373
|
_this2.isHorizontalPad = !!isHorizontalPad;
|
3245
3374
|
_this2.isHorizontalSunMi = !!isHorizontalSunMi;
|
@@ -3368,6 +3497,76 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3368
3497
|
|
3369
3498
|
//that[`inputS${paymode.paymethodId}`]
|
3370
3499
|
|
3500
|
+
}, {
|
3501
|
+
key: 'isNoProductTip',
|
3502
|
+
value: function isNoProductTip(nonProductMap) {
|
3503
|
+
var _ref28 = this.context.viewModel.data || {},
|
3504
|
+
RetailDetails = _ref28.RetailDetails;
|
3505
|
+
|
3506
|
+
var temphtml = [];
|
3507
|
+
if ((0, _keys2.default)(nonProductMap).length > 0) {
|
3508
|
+
var columns = [{
|
3509
|
+
title: '商品名称',
|
3510
|
+
dataIndex: 'name',
|
3511
|
+
key: 'name',
|
3512
|
+
ellipsis: true
|
3513
|
+
}, {
|
3514
|
+
title: '原因',
|
3515
|
+
dataIndex: 'reason',
|
3516
|
+
key: 'reason',
|
3517
|
+
ellipsis: true
|
3518
|
+
}];
|
3519
|
+
|
3520
|
+
var _loop = function _loop(key) {
|
3521
|
+
var product = RetailDetails.find(function (o) {
|
3522
|
+
return o.Idinventory == key;
|
3523
|
+
});
|
3524
|
+
temphtml.push({ name: product.Inventory.Name, reason: nonProductMap[key] });
|
3525
|
+
};
|
3526
|
+
|
3527
|
+
for (var key in nonProductMap) {
|
3528
|
+
_loop(key);
|
3529
|
+
}
|
3530
|
+
var modal = (0, _asyncModal2.default)({
|
3531
|
+
onPressEnter: function onPressEnter() {
|
3532
|
+
modal.destroy();
|
3533
|
+
},
|
3534
|
+
maskClosable: false,
|
3535
|
+
keyboard: false,
|
3536
|
+
closable: true,
|
3537
|
+
title: '不可配送商品',
|
3538
|
+
width: 600,
|
3539
|
+
className: '',
|
3540
|
+
content: _react2.default.createElement(
|
3541
|
+
'div',
|
3542
|
+
{ className: 'not-distribution-tip' },
|
3543
|
+
_react2.default.createElement(
|
3544
|
+
'div',
|
3545
|
+
{ className: 'tip-content' },
|
3546
|
+
_react2.default.createElement(_table2.default, {
|
3547
|
+
columns: columns,
|
3548
|
+
dataSource: temphtml,
|
3549
|
+
scroll: { y: 240 },
|
3550
|
+
pagination: false,
|
3551
|
+
size: 'middle' })
|
3552
|
+
),
|
3553
|
+
_react2.default.createElement(
|
3554
|
+
'div',
|
3555
|
+
{ className: 'not-distribution-btn' },
|
3556
|
+
_react2.default.createElement(
|
3557
|
+
_button2.default,
|
3558
|
+
{ type: 'primary', onClick: function onClick() {
|
3559
|
+
modal.destroy();
|
3560
|
+
} },
|
3561
|
+
'\u77E5\u9053\u4E86'
|
3562
|
+
)
|
3563
|
+
)
|
3564
|
+
)
|
3565
|
+
});
|
3566
|
+
return true;
|
3567
|
+
}
|
3568
|
+
return false;
|
3569
|
+
}
|
3371
3570
|
}, {
|
3372
3571
|
key: 'checkThepaymode',
|
3373
3572
|
value: function checkThepaymode(key) {
|
@@ -3395,7 +3594,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3395
3594
|
}
|
3396
3595
|
}, {
|
3397
3596
|
key: 'renderToolbtn',
|
3398
|
-
value: function renderToolbtn(mode, index) {
|
3597
|
+
value: function renderToolbtn(mode, index, bookType) {
|
3399
3598
|
var _this7 = this;
|
3400
3599
|
|
3401
3600
|
var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
|
@@ -3433,7 +3632,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3433
3632
|
return _react2.default.createElement(
|
3434
3633
|
'div',
|
3435
3634
|
{ key: index + "", className: paymodeDisabled + ' ' + paymodeSelected + ' paymode hotkey_' + this.compoundHotkeysList[hotkeyIndex], onClick: function onClick() {
|
3436
|
-
_this7.onTabsClick(mode.paymentType);
|
3635
|
+
_this7.onTabsClick(mode.paymentType, bookType);
|
3437
3636
|
} },
|
3438
3637
|
_react2.default.createElement(
|
3439
3638
|
'div',
|
@@ -3506,15 +3705,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3506
3705
|
|
3507
3706
|
var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
|
3508
3707
|
var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
|
3708
|
+
|
3709
|
+
//收订金
|
3710
|
+
var IdbusiType = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.IdbusiType;
|
3711
|
+
var BuyerPayFreight = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.BuyerPayFreight;
|
3712
|
+
var DistributionMode = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.DistributionMode;
|
3713
|
+
if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
3714
|
+
totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
|
3715
|
+
}
|
3716
|
+
|
3509
3717
|
// 单据模式
|
3510
3718
|
var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
|
3719
|
+
if (IdbusiType == 39) {
|
3720
|
+
return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0) && m.paymentType != PayStyle.hyczk;
|
3721
|
+
}
|
3511
3722
|
return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
|
3512
3723
|
}) : paymode.thePaymodes;
|
3513
3724
|
var paymodes = paymode.paymodes,
|
3514
3725
|
settle = paymode.settle,
|
3515
3726
|
currentMode = paymode.currentMode;
|
3516
|
-
// 积分兑换 总积分
|
3517
3727
|
|
3728
|
+
|
3729
|
+
if (IdbusiType == 39) {
|
3730
|
+
totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
|
3731
|
+
paymodes = (0, _filter3.default)(paymodes, function (mode) {
|
3732
|
+
return mode.paymentType != PayStyle.hyczk;
|
3733
|
+
}); //取货过滤掉储值
|
3734
|
+
}
|
3735
|
+
// 积分兑换 总积分
|
3518
3736
|
var ExchangeIntegral = this.context && this.context.viewModel && this.context.viewModel.data.ExchangeIntegral;
|
3519
3737
|
|
3520
3738
|
var _hasSMZF = (0, _find3.default)(paymodes, function (item) {
|
@@ -3530,7 +3748,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3530
3748
|
}
|
3531
3749
|
|
3532
3750
|
var quickPay = boriginReturn ? [] : (0, _filter3.default)(paymodes, function (paymode) {
|
3533
|
-
|
3751
|
+
if (IdbusiType == 39) {
|
3752
|
+
return paymode.isQuick && paymode.paymentType != PayStyle.hyczk; //取货过滤掉储值
|
3753
|
+
} else {
|
3754
|
+
return paymode.isQuick;
|
3755
|
+
}
|
3534
3756
|
});
|
3535
3757
|
var productsIsEmpty = type != 1 && this.context.viewModel.data.RetailDetails.length == 0 || type == 1 && parseFloat(amount || 0) <= 0 || memberDisabled || noIsMinAmount;
|
3536
3758
|
var moreToolbtns = [];
|
@@ -3550,11 +3772,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3550
3772
|
quantity4 = 0;
|
3551
3773
|
var sumQuantity = 0; //数量总和的值,包括称重的。
|
3552
3774
|
|
3553
|
-
var
|
3554
|
-
|
3555
|
-
buyQuantity =
|
3556
|
-
|
3557
|
-
returnQuantity =
|
3775
|
+
var _ref29 = quantityDetail || {},
|
3776
|
+
_ref29$buyQuantity = _ref29.buyQuantity,
|
3777
|
+
buyQuantity = _ref29$buyQuantity === undefined ? 0 : _ref29$buyQuantity,
|
3778
|
+
_ref29$returnQuantity = _ref29.returnQuantity,
|
3779
|
+
returnQuantity = _ref29$returnQuantity === undefined ? 0 : _ref29$returnQuantity;
|
3558
3780
|
|
3559
3781
|
var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
|
3560
3782
|
quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
|
@@ -3732,7 +3954,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3732
3954
|
{ key: 'settle', className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }), onClick: function onClick() {
|
3733
3955
|
_this8.btnDebounced();
|
3734
3956
|
}, disabled: productsIsEmpty },
|
3735
|
-
this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
|
3957
|
+
this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : IdbusiType == 39 && _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount == 0 ? '取货' : settle.name
|
3736
3958
|
)
|
3737
3959
|
),
|
3738
3960
|
!newStyle && _react2.default.createElement(
|
@@ -3759,7 +3981,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3759
3981
|
'div',
|
3760
3982
|
null,
|
3761
3983
|
(0, _map3.default)(paymodes, function (mode, index) {
|
3762
|
-
return _this8.renderToolbtn(mode, index);
|
3984
|
+
return _this8.renderToolbtn(mode, index, 'bookPay');
|
3763
3985
|
})
|
3764
3986
|
),
|
3765
3987
|
paymodes.length > carouselStart && this.paymodesCarouselList(params, paymodes, carouselStart)
|
@@ -3804,20 +4026,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3804
4026
|
return _this8.onHotKeyClick2(index, mode, paymode, e);
|
3805
4027
|
},
|
3806
4028
|
onBlur: function onBlur(e) {
|
3807
|
-
return _this8.onBlur(index, e);
|
4029
|
+
return _this8.onBlur(index, e, 'bookPay');
|
3808
4030
|
},
|
3809
4031
|
onFocus: function onFocus(e) {
|
3810
4032
|
return _this8.onFocusHack(index, mode, paymode, e);
|
3811
4033
|
},
|
3812
4034
|
onChange: function onChange(e) {
|
3813
|
-
return _this8.handleChange(index, e);
|
4035
|
+
return _this8.handleChange(index, e, 'bookPay');
|
3814
4036
|
}
|
3815
4037
|
})
|
3816
4038
|
),
|
3817
4039
|
_react2.default.createElement(
|
3818
4040
|
'span',
|
3819
4041
|
{ className: 'minus', onClick: function onClick() {
|
3820
|
-
_this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
|
4042
|
+
_this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType, 'bookPay');
|
3821
4043
|
} },
|
3822
4044
|
_react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
|
3823
4045
|
)
|
@@ -3951,6 +4173,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3951
4173
|
{ className: 'received' },
|
3952
4174
|
(0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
|
3953
4175
|
)
|
4176
|
+
),
|
4177
|
+
_react2.default.createElement(
|
4178
|
+
'div',
|
4179
|
+
{ className: 'receivable', style: { display: DistributionMode && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
|
4180
|
+
_react2.default.createElement(
|
4181
|
+
'span',
|
4182
|
+
null,
|
4183
|
+
'\u8FD0\u8D39'
|
4184
|
+
),
|
4185
|
+
_react2.default.createElement(
|
4186
|
+
'span',
|
4187
|
+
{ className: 'received' },
|
4188
|
+
(0, _utils.getFixedNumber)(Math.abs(BuyerPayFreight))
|
4189
|
+
)
|
3954
4190
|
)
|
3955
4191
|
),
|
3956
4192
|
type != 1 && !isReturn && _react2.default.createElement(
|
@@ -4087,6 +4323,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4087
4323
|
{ className: 'received' },
|
4088
4324
|
(0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
|
4089
4325
|
)
|
4326
|
+
),
|
4327
|
+
_react2.default.createElement(
|
4328
|
+
'div',
|
4329
|
+
{ className: 'receivable', style: { display: DistributionMode && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
|
4330
|
+
_react2.default.createElement(
|
4331
|
+
'span',
|
4332
|
+
null,
|
4333
|
+
'\u8FD0\u8D39'
|
4334
|
+
),
|
4335
|
+
_react2.default.createElement(
|
4336
|
+
'span',
|
4337
|
+
{ className: 'received' },
|
4338
|
+
(0, _utils.getFixedNumber)(Math.abs(BuyerPayFreight))
|
4339
|
+
)
|
4090
4340
|
)
|
4091
4341
|
),
|
4092
4342
|
type != 1 && !isReturn && _react2.default.createElement(
|
@@ -4181,7 +4431,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4181
4431
|
_this8.onHotKeyClick1(mode, index, boriginReturn);
|
4182
4432
|
}
|
4183
4433
|
} else {
|
4184
|
-
_this8.onHotKeyClick1(mode, index, boriginReturn);
|
4434
|
+
_this8.onHotKeyClick1(mode, index, boriginReturn, 'bookPay');
|
4185
4435
|
}
|
4186
4436
|
},
|
4187
4437
|
value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
|
@@ -4193,16 +4443,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4193
4443
|
disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
|
4194
4444
|
value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
|
4195
4445
|
onClick: function onClick(e) {
|
4196
|
-
return _this8.onHotKeyClick2(index, mode, paymode, e);
|
4446
|
+
return _this8.onHotKeyClick2(index, mode, paymode, e, 'bookPay');
|
4197
4447
|
},
|
4198
4448
|
onBlur: function onBlur(e) {
|
4199
|
-
return _this8.onBlur(index, e);
|
4449
|
+
return _this8.onBlur(index, e, 'bookPay');
|
4200
4450
|
},
|
4201
4451
|
onFocus: function onFocus(e) {
|
4202
4452
|
return _this8.onFocusHack(index, mode, paymode, e);
|
4203
4453
|
},
|
4204
4454
|
onChange: function onChange(e) {
|
4205
|
-
return _this8.handleChange(index, e);
|
4455
|
+
return _this8.handleChange(index, e, 'bookPay');
|
4206
4456
|
}
|
4207
4457
|
})
|
4208
4458
|
)
|
@@ -4411,22 +4661,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4411
4661
|
return _this8.czkInput = input;
|
4412
4662
|
},
|
4413
4663
|
onKeyDown: function () {
|
4414
|
-
var
|
4664
|
+
var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
|
4415
4665
|
var time, _paymode;
|
4416
4666
|
|
4417
|
-
return _regenerator2.default.wrap(function
|
4667
|
+
return _regenerator2.default.wrap(function _callee17$(_context17) {
|
4418
4668
|
while (1) {
|
4419
|
-
switch (
|
4669
|
+
switch (_context17.prev = _context17.next) {
|
4420
4670
|
case 0:
|
4421
4671
|
if (!(e.keyCode == 13)) {
|
4422
|
-
|
4672
|
+
_context17.next = 14;
|
4423
4673
|
break;
|
4424
4674
|
}
|
4425
4675
|
|
4426
4676
|
time = Date.parse(new Date());
|
4427
4677
|
|
4428
4678
|
if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
|
4429
|
-
|
4679
|
+
_context17.next = 7;
|
4430
4680
|
break;
|
4431
4681
|
}
|
4432
4682
|
|
@@ -4435,11 +4685,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4435
4685
|
_this8.setState({
|
4436
4686
|
czkValue: null
|
4437
4687
|
});
|
4438
|
-
return
|
4688
|
+
return _context17.abrupt('return');
|
4439
4689
|
|
4440
4690
|
case 7:
|
4441
4691
|
_this8.keypressStime = null;
|
4442
|
-
|
4692
|
+
_context17.next = 10;
|
4443
4693
|
return _this8.loadCzk(e.target.value);
|
4444
4694
|
|
4445
4695
|
case 10:
|
@@ -4450,7 +4700,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4450
4700
|
czkvalue: null
|
4451
4701
|
});
|
4452
4702
|
}
|
4453
|
-
|
4703
|
+
_context17.next = 15;
|
4454
4704
|
break;
|
4455
4705
|
|
4456
4706
|
case 14:
|
@@ -4460,14 +4710,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4460
4710
|
|
4461
4711
|
case 15:
|
4462
4712
|
case 'end':
|
4463
|
-
return
|
4713
|
+
return _context17.stop();
|
4464
4714
|
}
|
4465
4715
|
}
|
4466
|
-
},
|
4716
|
+
}, _callee17, _this8);
|
4467
4717
|
}));
|
4468
4718
|
|
4469
|
-
return function (
|
4470
|
-
return
|
4719
|
+
return function (_x13) {
|
4720
|
+
return _ref30.apply(this, arguments);
|
4471
4721
|
};
|
4472
4722
|
}(),
|
4473
4723
|
onFocus: function onFocus(e) {
|
@@ -4524,8 +4774,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4524
4774
|
_this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
|
4525
4775
|
},
|
4526
4776
|
defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
|
4527
|
-
ref: function ref(
|
4528
|
-
return _this8["inputCzkAmount"] =
|
4777
|
+
ref: function ref(_ref31) {
|
4778
|
+
return _this8["inputCzkAmount"] = _ref31;
|
4529
4779
|
},
|
4530
4780
|
onFocus: function onFocus(e) {
|
4531
4781
|
_this8.inputkey = "inputCzkAmount";
|
@@ -5118,12 +5368,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5118
5368
|
_react2.default.createElement(
|
5119
5369
|
'div',
|
5120
5370
|
{ className: 'value' },
|
5121
|
-
currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.
|
5371
|
+
currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.steadCashIntegral)
|
5122
5372
|
),
|
5123
5373
|
_react2.default.createElement(
|
5124
5374
|
'div',
|
5125
5375
|
{ className: 'name' },
|
5126
|
-
'\
|
5376
|
+
'\u672C\u5355\u4F7F\u7528\u79EF\u5206'
|
5127
5377
|
)
|
5128
5378
|
),
|
5129
5379
|
_react2.default.createElement(
|
@@ -5144,7 +5394,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5144
5394
|
_react2.default.createElement(
|
5145
5395
|
'div',
|
5146
5396
|
{ className: 'name' },
|
5147
|
-
'\u672C\u5355\u53EF\
|
5397
|
+
'\u672C\u5355\u53EF\u62B5\u73B0\u91D1\u989D'
|
5148
5398
|
)
|
5149
5399
|
)
|
5150
5400
|
),
|
@@ -5195,8 +5445,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5195
5445
|
_this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
|
5196
5446
|
},
|
5197
5447
|
defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
|
5198
|
-
ref: function ref(
|
5199
|
-
return _this8["inputJfdxAmount"] =
|
5448
|
+
ref: function ref(_ref32) {
|
5449
|
+
return _this8["inputJfdxAmount"] = _ref32;
|
5200
5450
|
},
|
5201
5451
|
onFocus: function onFocus(e) {
|
5202
5452
|
_this8.inputkey = "inputJfdxAmount";
|