tplus-components-touch 3.54.7 → 3.54.10
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/components/collection/index.js +154 -47
- package/dist/components/collection/index.js.map +1 -1
- package/dist/components/collection/searchView/index.js +3 -2
- 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 +182 -193
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +1 -11
- 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
@@ -938,27 +938,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
938
938
|
case 4:
|
939
939
|
result = _context5.sent;
|
940
940
|
|
941
|
-
if (
|
942
|
-
|
943
|
-
|
941
|
+
if (result == "") {
|
942
|
+
//成功
|
943
|
+
//返回
|
944
|
+
_this2.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
945
|
+
_promise2.default.resolve();
|
946
|
+
} else {
|
947
|
+
_this2.setState({
|
948
|
+
confirmStatus: true
|
949
|
+
});
|
950
|
+
_message2.default.info(result);
|
944
951
|
}
|
945
952
|
|
946
|
-
|
947
|
-
//返回
|
948
|
-
_this2.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
949
|
-
_promise2.default.resolve();
|
950
|
-
_context5.next = 13;
|
951
|
-
break;
|
952
|
-
|
953
|
-
case 10:
|
954
|
-
_this2.setState({
|
955
|
-
confirmStatus: true
|
956
|
-
});
|
957
|
-
//Message.info("密码不正确");
|
958
|
-
_context5.next = 13;
|
959
|
-
return _promise2.default.reject(result);
|
960
|
-
|
961
|
-
case 13:
|
953
|
+
case 6:
|
962
954
|
case 'end':
|
963
955
|
return _context5.stop();
|
964
956
|
}
|
@@ -1907,7 +1899,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1907
1899
|
var _this$props = _this.props,
|
1908
1900
|
MemberPoints = _this$props.MemberPoints,
|
1909
1901
|
isMemberPointsReturn = _this$props.isMemberPointsReturn,
|
1910
|
-
isReturn = _this$props.isReturn
|
1902
|
+
isReturn = _this$props.isReturn,
|
1903
|
+
settlementType = _this$props.type;
|
1911
1904
|
|
1912
1905
|
var message = "支付成功";
|
1913
1906
|
if ((isReturn || isMemberPointsReturn) && Number(amount) == Number(0)) {
|
@@ -1917,9 +1910,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1917
1910
|
} else if (IdbusiType == 39 && received == 0) {
|
1918
1911
|
message = "取货成功";
|
1919
1912
|
}
|
1920
|
-
|
1913
|
+
// 收款的时候,drawerStore才消失
|
1914
|
+
if (settlementType === 2) {
|
1915
|
+
_mutantsMicrofx.stores.drawerStore.hide();
|
1916
|
+
}
|
1921
1917
|
if (params === 'onCreditReturn') {
|
1922
|
-
_message2.default.
|
1918
|
+
_message2.default.success('退货成功,此单无须退款!');
|
1923
1919
|
} else {
|
1924
1920
|
window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
|
1925
1921
|
_this.handleGuestShow(5);
|
@@ -2323,109 +2319,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2323
2319
|
}();
|
2324
2320
|
|
2325
2321
|
_this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16() {
|
2326
|
-
var
|
2327
|
-
var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
|
2328
|
-
var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
|
2329
|
-
|
2330
|
-
return _regenerator2.default.wrap(function _callee15$(_context15) {
|
2331
|
-
while (1) {
|
2332
|
-
switch (_context15.prev = _context15.next) {
|
2333
|
-
case 0:
|
2334
|
-
results = [];
|
2335
|
-
_context15.prev = 1;
|
2336
|
-
_iteratorNormalCompletion2 = true;
|
2337
|
-
_didIteratorError2 = false;
|
2338
|
-
_iteratorError2 = undefined;
|
2339
|
-
_context15.prev = 5;
|
2340
|
-
_iterator2 = (0, _getIterator3.default)(promises);
|
2341
|
-
|
2342
|
-
case 7:
|
2343
|
-
if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
|
2344
|
-
_context15.next = 16;
|
2345
|
-
break;
|
2346
|
-
}
|
2347
|
-
|
2348
|
-
p = _step2.value;
|
2349
|
-
_context15.next = 11;
|
2350
|
-
return p;
|
2351
|
-
|
2352
|
-
case 11:
|
2353
|
-
_result2 = _context15.sent;
|
2354
|
-
|
2355
|
-
results.push(_result2);
|
2356
|
-
|
2357
|
-
case 13:
|
2358
|
-
_iteratorNormalCompletion2 = true;
|
2359
|
-
_context15.next = 7;
|
2360
|
-
break;
|
2361
|
-
|
2362
|
-
case 16:
|
2363
|
-
_context15.next = 22;
|
2364
|
-
break;
|
2365
|
-
|
2366
|
-
case 18:
|
2367
|
-
_context15.prev = 18;
|
2368
|
-
_context15.t0 = _context15['catch'](5);
|
2369
|
-
_didIteratorError2 = true;
|
2370
|
-
_iteratorError2 = _context15.t0;
|
2371
|
-
|
2372
|
-
case 22:
|
2373
|
-
_context15.prev = 22;
|
2374
|
-
_context15.prev = 23;
|
2375
|
-
|
2376
|
-
if (!_iteratorNormalCompletion2 && _iterator2.return) {
|
2377
|
-
_iterator2.return();
|
2378
|
-
}
|
2379
|
-
|
2380
|
-
case 25:
|
2381
|
-
_context15.prev = 25;
|
2382
|
-
|
2383
|
-
if (!_didIteratorError2) {
|
2384
|
-
_context15.next = 28;
|
2385
|
-
break;
|
2386
|
-
}
|
2387
|
-
|
2388
|
-
throw _iteratorError2;
|
2389
|
-
|
2390
|
-
case 28:
|
2391
|
-
return _context15.finish(25);
|
2392
|
-
|
2393
|
-
case 29:
|
2394
|
-
return _context15.finish(22);
|
2395
|
-
|
2396
|
-
case 30:
|
2397
|
-
_context15.next = 32;
|
2398
|
-
return commit(results);
|
2399
|
-
|
2400
|
-
case 32:
|
2401
|
-
_context15.next = 37;
|
2402
|
-
break;
|
2403
|
-
|
2404
|
-
case 34:
|
2405
|
-
_context15.prev = 34;
|
2406
|
-
_context15.t1 = _context15['catch'](1);
|
2407
|
-
|
2408
|
-
if (_context15.t1 != "cancelpwd") {
|
2409
|
-
_message2.default.error(_context15.t1);
|
2410
|
-
setTimeout(function () {
|
2411
|
-
that.handleCzk();
|
2412
|
-
}, 500);
|
2413
|
-
}
|
2414
|
-
|
2415
|
-
case 37:
|
2416
|
-
case 'end':
|
2417
|
-
return _context15.stop();
|
2418
|
-
}
|
2419
|
-
}
|
2420
|
-
}, _callee15, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
|
2421
|
-
}));
|
2422
|
-
|
2423
|
-
return function handleUserInputs(_x9) {
|
2424
|
-
return _ref18.apply(this, arguments);
|
2425
|
-
};
|
2426
|
-
}();
|
2427
|
-
|
2428
|
-
var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
|
2322
|
+
var that, curmode, promises, _enumController$getEn22, _PayStyle, handleUserInputs, _commit;
|
2429
2323
|
|
2430
2324
|
return _regenerator2.default.wrap(function _callee16$(_context16) {
|
2431
2325
|
while (1) {
|
@@ -2436,9 +2330,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2436
2330
|
promises = [];
|
2437
2331
|
|
2438
2332
|
if (curmode.value > 0) {
|
2439
|
-
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
|
2333
|
+
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), _PayStyle = _enumController$getEn22.PayStyle;
|
2440
2334
|
|
2441
|
-
if (curmode.paymentType ===
|
2335
|
+
if (curmode.paymentType === _PayStyle.hyczk) {
|
2442
2336
|
if (curmode.cardTypeEnum === 'BALANCE_CARD') {
|
2443
2337
|
!curmode.freePaymentPasswordStore && _this2.setState({
|
2444
2338
|
confirmStatus: true
|
@@ -2451,64 +2345,168 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2451
2345
|
}
|
2452
2346
|
}
|
2453
2347
|
|
2454
|
-
|
2455
|
-
|
2456
|
-
var
|
2457
|
-
|
2458
|
-
|
2459
|
-
|
2460
|
-
|
2461
|
-
|
2462
|
-
|
2348
|
+
if (curmode.paymentType !== PayStyle.hyczk || curmode.freePaymentPasswordStore || !curmode.isNeedPassword) {
|
2349
|
+
handleUserInputs = function () {
|
2350
|
+
var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
|
2351
|
+
var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
|
2352
|
+
|
2353
|
+
return _regenerator2.default.wrap(function _callee15$(_context15) {
|
2354
|
+
while (1) {
|
2355
|
+
switch (_context15.prev = _context15.next) {
|
2356
|
+
case 0:
|
2357
|
+
results = [];
|
2358
|
+
_context15.prev = 1;
|
2359
|
+
_iteratorNormalCompletion2 = true;
|
2360
|
+
_didIteratorError2 = false;
|
2361
|
+
_iteratorError2 = undefined;
|
2362
|
+
_context15.prev = 5;
|
2363
|
+
_iterator2 = (0, _getIterator3.default)(promises);
|
2364
|
+
|
2365
|
+
case 7:
|
2366
|
+
if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
|
2367
|
+
_context15.next = 16;
|
2368
|
+
break;
|
2369
|
+
}
|
2370
|
+
|
2371
|
+
p = _step2.value;
|
2372
|
+
_context15.next = 11;
|
2373
|
+
return p;
|
2374
|
+
|
2375
|
+
case 11:
|
2376
|
+
_result2 = _context15.sent;
|
2377
|
+
|
2378
|
+
results.push(_result2);
|
2379
|
+
|
2380
|
+
case 13:
|
2381
|
+
_iteratorNormalCompletion2 = true;
|
2382
|
+
_context15.next = 7;
|
2463
2383
|
break;
|
2464
|
-
}
|
2465
2384
|
|
2466
|
-
|
2467
|
-
|
2385
|
+
case 16:
|
2386
|
+
_context15.next = 22;
|
2387
|
+
break;
|
2388
|
+
|
2389
|
+
case 18:
|
2390
|
+
_context15.prev = 18;
|
2391
|
+
_context15.t0 = _context15['catch'](5);
|
2392
|
+
_didIteratorError2 = true;
|
2393
|
+
_iteratorError2 = _context15.t0;
|
2394
|
+
|
2395
|
+
case 22:
|
2396
|
+
_context15.prev = 22;
|
2397
|
+
_context15.prev = 23;
|
2468
2398
|
|
2469
|
-
|
2470
|
-
|
2471
|
-
|
2472
|
-
|
2399
|
+
if (!_iteratorNormalCompletion2 && _iterator2.return) {
|
2400
|
+
_iterator2.return();
|
2401
|
+
}
|
2402
|
+
|
2403
|
+
case 25:
|
2404
|
+
_context15.prev = 25;
|
2405
|
+
|
2406
|
+
if (!_didIteratorError2) {
|
2407
|
+
_context15.next = 28;
|
2408
|
+
break;
|
2409
|
+
}
|
2410
|
+
|
2411
|
+
throw _iteratorError2;
|
2473
2412
|
|
2474
|
-
|
2475
|
-
|
2413
|
+
case 28:
|
2414
|
+
return _context15.finish(25);
|
2476
2415
|
|
2477
|
-
|
2478
|
-
|
2416
|
+
case 29:
|
2417
|
+
return _context15.finish(22);
|
2479
2418
|
|
2480
|
-
|
2481
|
-
|
2419
|
+
case 30:
|
2420
|
+
_context15.next = 32;
|
2421
|
+
return _commit(results);
|
2422
|
+
|
2423
|
+
case 32:
|
2424
|
+
_context15.next = 37;
|
2482
2425
|
break;
|
2483
|
-
}
|
2484
2426
|
|
2485
|
-
|
2486
|
-
|
2487
|
-
|
2488
|
-
_promise2.default.resolve();
|
2489
|
-
_context14.next = 15;
|
2490
|
-
break;
|
2427
|
+
case 34:
|
2428
|
+
_context15.prev = 34;
|
2429
|
+
_context15.t1 = _context15['catch'](1);
|
2491
2430
|
|
2492
|
-
|
2493
|
-
|
2494
|
-
|
2431
|
+
if (_context15.t1 != "cancelpwd") {
|
2432
|
+
_message2.default.error(_context15.t1);
|
2433
|
+
setTimeout(function () {
|
2434
|
+
that.handleCzk();
|
2435
|
+
}, 500);
|
2436
|
+
}
|
2495
2437
|
|
2496
|
-
|
2497
|
-
|
2498
|
-
|
2438
|
+
case 37:
|
2439
|
+
case 'end':
|
2440
|
+
return _context15.stop();
|
2441
|
+
}
|
2499
2442
|
}
|
2500
|
-
}
|
2501
|
-
}
|
2502
|
-
}));
|
2443
|
+
}, _callee15, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
|
2444
|
+
}));
|
2503
2445
|
|
2504
|
-
|
2505
|
-
|
2506
|
-
|
2507
|
-
|
2446
|
+
return function handleUserInputs(_x9) {
|
2447
|
+
return _ref18.apply(this, arguments);
|
2448
|
+
};
|
2449
|
+
}();
|
2508
2450
|
|
2509
|
-
|
2451
|
+
_commit = function () {
|
2452
|
+
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(values) {
|
2453
|
+
var result;
|
2454
|
+
return _regenerator2.default.wrap(function _callee14$(_context14) {
|
2455
|
+
while (1) {
|
2456
|
+
switch (_context14.prev = _context14.next) {
|
2457
|
+
case 0:
|
2458
|
+
if (!(values.length > 0)) {
|
2459
|
+
_context14.next = 6;
|
2460
|
+
break;
|
2461
|
+
}
|
2510
2462
|
|
2511
|
-
|
2463
|
+
_context14.next = 3;
|
2464
|
+
return that.store.validePwd(values[0]);
|
2465
|
+
|
2466
|
+
case 3:
|
2467
|
+
_context14.t0 = _context14.sent;
|
2468
|
+
_context14.next = 7;
|
2469
|
+
break;
|
2470
|
+
|
2471
|
+
case 6:
|
2472
|
+
_context14.t0 = "";
|
2473
|
+
|
2474
|
+
case 7:
|
2475
|
+
result = _context14.t0;
|
2476
|
+
|
2477
|
+
if (!(result == "")) {
|
2478
|
+
_context14.next = 13;
|
2479
|
+
break;
|
2480
|
+
}
|
2481
|
+
|
2482
|
+
//成功
|
2483
|
+
//返回
|
2484
|
+
that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
2485
|
+
_promise2.default.resolve();
|
2486
|
+
_context14.next = 15;
|
2487
|
+
break;
|
2488
|
+
|
2489
|
+
case 13:
|
2490
|
+
_context14.next = 15;
|
2491
|
+
return _promise2.default.reject(result);
|
2492
|
+
|
2493
|
+
case 15:
|
2494
|
+
case 'end':
|
2495
|
+
return _context14.stop();
|
2496
|
+
}
|
2497
|
+
}
|
2498
|
+
}, _callee14, _this3);
|
2499
|
+
}));
|
2500
|
+
|
2501
|
+
return function _commit(_x8) {
|
2502
|
+
return _ref17.apply(this, arguments);
|
2503
|
+
};
|
2504
|
+
}();
|
2505
|
+
|
2506
|
+
handleUserInputs(promises);
|
2507
|
+
}
|
2508
|
+
|
2509
|
+
case 5:
|
2512
2510
|
case 'end':
|
2513
2511
|
return _context16.stop();
|
2514
2512
|
}
|
@@ -2717,27 +2715,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2717
2715
|
|
2718
2716
|
_modalWraper2.default.confirm({
|
2719
2717
|
className: 'not-selectable-voucher',
|
2720
|
-
title: '
|
2721
|
-
icon: false,
|
2718
|
+
title: '以下零售单尚未生成零售结算单,不能进行收款',
|
2722
2719
|
content: _react2.default.createElement(
|
2723
|
-
'
|
2720
|
+
'ul',
|
2724
2721
|
null,
|
2725
|
-
|
2726
|
-
|
2727
|
-
|
2728
|
-
|
2729
|
-
|
2730
|
-
|
2731
|
-
|
2732
|
-
null,
|
2733
|
-
notSelectableVoucherList.map(function (o) {
|
2734
|
-
return _react2.default.createElement(
|
2735
|
-
'li',
|
2736
|
-
null,
|
2737
|
-
o.Code
|
2738
|
-
);
|
2739
|
-
})
|
2740
|
-
)
|
2722
|
+
notSelectableVoucherList.map(function (o) {
|
2723
|
+
return _react2.default.createElement(
|
2724
|
+
'li',
|
2725
|
+
null,
|
2726
|
+
o.Code
|
2727
|
+
);
|
2728
|
+
})
|
2741
2729
|
)
|
2742
2730
|
});
|
2743
2731
|
return _context18.abrupt('return');
|
@@ -2784,7 +2772,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2784
2772
|
case 18:
|
2785
2773
|
returnAmount1 = 0;
|
2786
2774
|
_context18.next = 21;
|
2787
|
-
return _this2.store.commit(_this2.props.bTest, _this2.context.viewModel.data);
|
2775
|
+
return _this2.store.commit(_this2.props.bTest, _this2.context.viewModel.data, _this2.context);
|
2788
2776
|
|
2789
2777
|
case 21:
|
2790
2778
|
_result3 = _context18.sent;
|
@@ -4980,7 +4968,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4980
4968
|
_react2.default.createElement(
|
4981
4969
|
_modal2.default,
|
4982
4970
|
(0, _defineProperty3.default)({
|
4983
|
-
wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '')
|
4971
|
+
wrapClassName: 'djq ' + _index.hotKey.hotKeyBindClass('5', 'modify-password') + ' ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4984
4972
|
width: '400px',
|
4985
4973
|
visible: this.state.showSetPwdModal,
|
4986
4974
|
backdropClosable: false,
|
@@ -5012,7 +5000,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5012
5000
|
_react2.default.createElement(
|
5013
5001
|
_modal2.default,
|
5014
5002
|
(0, _defineProperty3.default)({
|
5015
|
-
wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '')
|
5003
|
+
wrapClassName: 'djq ' + _index.hotKey.hotKeyBindClass('5', 'confirmPwdWraper') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5016
5004
|
width: '400px',
|
5017
5005
|
visible: this.state.confirmStatus,
|
5018
5006
|
backdropClosable: false,
|
@@ -5042,6 +5030,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5042
5030
|
placeholder: '',
|
5043
5031
|
maxLength: 6,
|
5044
5032
|
labelName: '\u50A8\u503C\u4F59\u989D\u5BC6\u7801',
|
5033
|
+
ok: this.handleConfirmPwdModal,
|
5045
5034
|
getConfirmPwd: this.getConfirmPwd,
|
5046
5035
|
params: 'pay',
|
5047
5036
|
amount: this.store.paymode.currentMode && (0, _utils.getFixedNumber)(this.store.paymode.currentMode.value)
|