tplus-components-touch 3.41.3 → 3.41.6

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.
Files changed (38) hide show
  1. package/dist/components/billSearch/index.js +16 -39
  2. package/dist/components/billSearch/index.js.map +1 -1
  3. package/dist/components/cloudPrint/BTPrintFormatUtil.js +2 -2
  4. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  5. package/dist/components/cloudPrint/index.js +891 -631
  6. package/dist/components/cloudPrint/index.js.map +1 -1
  7. package/dist/components/cloudPrint/printDispatch.js +132 -41
  8. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  9. package/dist/components/cloudPrint/printTemplate/dialy_one.json +239 -0
  10. package/dist/components/cloudPrint/printTemplate/duty_one.json +239 -0
  11. package/dist/components/cloudPrint/printTemplate/retail_one.json +208 -0
  12. package/dist/components/cloudPrint/printTemplate/retail_two.json +220 -0
  13. package/dist/components/cloudPrint/printTemplate/storage_one.json +129 -0
  14. package/dist/components/cloudPrint/printTemplate/template.js +52 -0
  15. package/dist/components/cloudPrint/printTemplate/template.js.map +1 -0
  16. package/dist/components/commonForm/formControl/index.js +1 -1
  17. package/dist/components/commonForm/formControl/index.js.map +1 -1
  18. package/dist/components/deliverySearch/index.js +6 -2
  19. package/dist/components/deliverySearch/index.js.map +1 -1
  20. package/dist/components/hotKey/index.js +5 -0
  21. package/dist/components/hotKey/index.js.map +1 -1
  22. package/dist/components/inventorySearch/tab.js +7 -2
  23. package/dist/components/inventorySearch/tab.js.map +1 -1
  24. package/dist/components/loading/loadingContent.js +6 -3
  25. package/dist/components/loading/loadingContent.js.map +1 -1
  26. package/dist/components/message/index.js +4 -5
  27. package/dist/components/message/index.js.map +1 -1
  28. package/dist/components/notification/index.js +11 -12
  29. package/dist/components/notification/index.js.map +1 -1
  30. package/dist/components/progressState/EmptyAndErrorView.js +5 -7
  31. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  32. package/dist/components/settlement/settlement.js +105 -113
  33. package/dist/components/settlement/settlement.js.map +1 -1
  34. package/dist/components/settlement/settlementStore.js +16 -26
  35. package/dist/components/settlement/settlementStore.js.map +1 -1
  36. package/dist/components/touchTable/index.js +5 -3
  37. package/dist/components/touchTable/index.js.map +1 -1
  38. package/package.json +2 -2
@@ -463,17 +463,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
463
463
  } else {
464
464
  item.badge = { text: '', position: '', className: '' };
465
465
  }
466
- if (!item.IsPresent) {
467
- discountRetailTotalAount += item.RetailPrice * item.Quantity;
468
- }
469
466
  if (item.PromotionDetails && item.PromotionDetails.length > 0) {
470
467
  count++;
471
468
  }
472
469
  item.InventoryName = item.Inventory.Name;
473
470
  item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
474
- discountPrototypeTotalAmount += item.DetailDiscountAmount;
471
+ if (!item.IsPresent) {
472
+ discountPrototypeTotalAmount += item.DetailDiscountAmount;
473
+ item.TotalDiscount = item.DetailDiscountAmount;
474
+ } else {
475
+ item.TotalDiscount = 0;
476
+ }
475
477
  //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
476
- item.TotalDiscount = item.DetailDiscountAmount;
477
478
  item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
478
479
  item.UnitName = item.Unit.Name;
479
480
  item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -484,7 +485,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
484
485
  dataSource: dataSource,
485
486
  discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
486
487
  discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
487
- discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
488
+ discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + parseFloat(discountPrototypeTotalAmount))
488
489
  });
489
490
  return count;
490
491
  };
@@ -1007,11 +1008,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1007
1008
  }, 200);
1008
1009
 
1009
1010
  // TODO: 测试优惠券支付
1010
-
1011
- var _ref10 = _mutantsUtil.platform || {},
1012
- isNewRetailBCPos = _ref10.isNewRetailBCPos;
1013
-
1014
- if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
1011
+ if (!_this2.store.paymode.currentMode.boriginReturn) {
1015
1012
  _this2.store.getCouponList();
1016
1013
  }
1017
1014
  };
@@ -1093,8 +1090,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1093
1090
  };
1094
1091
 
1095
1092
  _this2.checkOfflineEnable = function (paymode, key) {
1096
- var _ref11 = paymode || {},
1097
- paymodes = _ref11.paymodes;
1093
+ var _ref10 = paymode || {},
1094
+ paymodes = _ref10.paymodes;
1098
1095
 
1099
1096
  var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
1100
1097
 
@@ -1216,6 +1213,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1216
1213
  };
1217
1214
 
1218
1215
  _this2.onTabsClick = function (key, bookType) {
1216
+ if (!_this2.isDjqValidated(key)) {
1217
+ return;
1218
+ };
1219
+ var _this2$store3 = _this2.store,
1220
+ paymode = _this2$store3.paymode,
1221
+ brefund = _this2$store3.brefund,
1222
+ boriginReturn = _this2$store3.boriginReturn;
1223
+
1219
1224
  var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
1220
1225
  PayStyle = _enumController$getEn9.PayStyle,
1221
1226
  Differentiate = _enumController$getEn9.Differentiate;
@@ -1232,10 +1237,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1232
1237
  var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
1233
1238
  MultiPay = _enumController$getEn10.MultiPay;
1234
1239
 
1235
- var _this2$store3 = _this2.store,
1236
- paymode = _this2$store3.paymode,
1237
- brefund = _this2$store3.brefund,
1238
- boriginReturn = _this2$store3.boriginReturn;
1239
1240
  var noAlreadyWarn = _this2.state.noAlreadyWarn;
1240
1241
 
1241
1242
  if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
@@ -1441,15 +1442,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1441
1442
  _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
1442
1443
  return;
1443
1444
  }
1444
-
1445
- var _ref12 = _mutantsUtil.platform || {},
1446
- isNewRetailBCPos = _ref12.isNewRetailBCPos;
1447
-
1448
- if (isNewRetailBCPos) {
1449
- _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
1450
- } else {
1451
- _this2.store.paymode.calcDjqValue(q);
1452
- }
1445
+ _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
1453
1446
  // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
1454
1447
  // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
1455
1448
  };
@@ -1522,6 +1515,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1522
1515
  };
1523
1516
 
1524
1517
  _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
1518
+ if (!_this2.isDjqValidated(mode.paymentType)) {
1519
+ return;
1520
+ };
1525
1521
  // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
1526
1522
  // return Message.error("付订金时不可使用零售抵现类结算方式!");
1527
1523
  // }
@@ -1722,6 +1718,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1722
1718
 
1723
1719
  _modalWraper2.default.confirm({
1724
1720
  className: 'tplus-confirm-modal',
1721
+ zIndex: 1007,
1725
1722
  content: _react2.default.createElement(
1726
1723
  'div',
1727
1724
  { className: 'unReturn' },
@@ -1938,13 +1935,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1938
1935
  if (_this2.hasElectron === false) return;
1939
1936
  var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
1940
1937
 
1941
- var _ref16 = dt || {},
1942
- guestshow_enable = _ref16.guestshow_enable,
1943
- guestshow_clear = _ref16.guestshow_clear,
1944
- guestshow_welcome = _ref16.guestshow_welcome,
1945
- guestshow_collect = _ref16.guestshow_collect,
1946
- guestshow_refund = _ref16.guestshow_refund,
1947
- guestshow_change = _ref16.guestshow_change;
1938
+ var _ref14 = dt || {},
1939
+ guestshow_enable = _ref14.guestshow_enable,
1940
+ guestshow_clear = _ref14.guestshow_clear,
1941
+ guestshow_welcome = _ref14.guestshow_welcome,
1942
+ guestshow_collect = _ref14.guestshow_collect,
1943
+ guestshow_refund = _ref14.guestshow_refund,
1944
+ guestshow_change = _ref14.guestshow_change;
1948
1945
 
1949
1946
  var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
1950
1947
  if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1979,9 +1976,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
1979
1976
  };
1980
1977
 
1981
1978
  _this2.handleSettle = function () {
1982
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
1979
+ var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
1983
1980
  var handleUserInputs = function () {
1984
- var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
1981
+ var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
1985
1982
  var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
1986
1983
 
1987
1984
  return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -2072,7 +2069,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2072
2069
  }));
2073
2070
 
2074
2071
  return function handleUserInputs(_x6) {
2075
- return _ref19.apply(this, arguments);
2072
+ return _ref17.apply(this, arguments);
2076
2073
  };
2077
2074
  }();
2078
2075
 
@@ -2165,7 +2162,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2165
2162
  });
2166
2163
 
2167
2164
  commit = function () {
2168
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
2165
+ var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
2169
2166
  var result;
2170
2167
  return _regenerator2.default.wrap(function _callee9$(_context9) {
2171
2168
  while (1) {
@@ -2239,7 +2236,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2239
2236
  }));
2240
2237
 
2241
2238
  return function commit(_x5) {
2242
- return _ref18.apply(this, arguments);
2239
+ return _ref16.apply(this, arguments);
2243
2240
  };
2244
2241
  }();
2245
2242
 
@@ -2254,13 +2251,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2254
2251
  }));
2255
2252
 
2256
2253
  return function (_x4) {
2257
- return _ref17.apply(this, arguments);
2254
+ return _ref15.apply(this, arguments);
2258
2255
  };
2259
2256
  }();
2260
2257
 
2261
2258
  _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
2262
2259
  var handleUserInputs = function () {
2263
- var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
2260
+ var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
2264
2261
  var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
2265
2262
 
2266
2263
  return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -2357,11 +2354,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2357
2354
  }));
2358
2355
 
2359
2356
  return function handleUserInputs(_x8) {
2360
- return _ref23.apply(this, arguments);
2357
+ return _ref20.apply(this, arguments);
2361
2358
  };
2362
2359
  }();
2363
2360
 
2364
- var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
2361
+ var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
2365
2362
 
2366
2363
  return _regenerator2.default.wrap(function _callee14$(_context14) {
2367
2364
  while (1) {
@@ -2370,28 +2367,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2370
2367
  that = _this2;
2371
2368
  curmode = _this2.store.paymode.currentMode;
2372
2369
  promises = [];
2373
- _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
2374
2370
 
2375
- if (isNewRetailBCPos) {
2376
- if (curmode.value > 0) {
2377
- _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
2371
+ if (curmode.value > 0) {
2372
+ _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
2378
2373
 
2379
- if (curmode.paymentType === PayStyle.hyczk) {
2380
- if (curmode.cardTypeEnum === 'BALANCE_CARD') {
2381
- !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
2382
- } else {
2383
- curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
2384
- }
2374
+ if (curmode.paymentType === PayStyle.hyczk) {
2375
+ if (curmode.cardTypeEnum === 'BALANCE_CARD') {
2376
+ !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
2377
+ } else {
2378
+ curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
2385
2379
  }
2386
2380
  }
2387
- } else {
2388
- if (curmode.member.needPwd && curmode.value > 0) {
2389
- promises.push(that.inputPwd(curmode));
2390
- }
2391
2381
  }
2392
2382
 
2393
2383
  commit = function () {
2394
- var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
2384
+ var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
2395
2385
  var result;
2396
2386
  return _regenerator2.default.wrap(function _callee12$(_context12) {
2397
2387
  while (1) {
@@ -2441,13 +2431,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2441
2431
  }));
2442
2432
 
2443
2433
  return function commit(_x7) {
2444
- return _ref22.apply(this, arguments);
2434
+ return _ref19.apply(this, arguments);
2445
2435
  };
2446
2436
  }();
2447
2437
 
2448
2438
  handleUserInputs(promises);
2449
2439
 
2450
- case 7:
2440
+ case 6:
2451
2441
  case 'end':
2452
2442
  return _context14.stop();
2453
2443
  }
@@ -2492,7 +2482,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2492
2482
  };
2493
2483
 
2494
2484
  _this2.inputPwd = function () {
2495
- var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
2485
+ var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
2496
2486
  var that, confirmPwd;
2497
2487
  return _regenerator2.default.wrap(function _callee15$(_context15) {
2498
2488
  while (1) {
@@ -2508,8 +2498,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2508
2498
  // if (v !== '') {
2509
2499
  modal.destroy();
2510
2500
 
2511
- var _ref25 = that.state || {},
2512
- confirmPwd = _ref25.confirmPwd;
2501
+ var _ref22 = that.state || {},
2502
+ confirmPwd = _ref22.confirmPwd;
2513
2503
 
2514
2504
  setTimeout(function () {
2515
2505
  paymode.authCode = v;
@@ -2600,8 +2590,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2600
2590
  type: 'primary', size: 'large', onClick: function onClick() {
2601
2591
  var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
2602
2592
 
2603
- var _ref26 = that.state || {},
2604
- confirmPwd = _ref26.confirmPwd;
2593
+ var _ref23 = that.state || {},
2594
+ confirmPwd = _ref23.confirmPwd;
2605
2595
  // if (v !== '') {
2606
2596
 
2607
2597
 
@@ -2642,12 +2632,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2642
2632
  }));
2643
2633
 
2644
2634
  return function (_x9) {
2645
- return _ref24.apply(this, arguments);
2635
+ return _ref21.apply(this, arguments);
2646
2636
  };
2647
2637
  }();
2648
2638
 
2649
2639
  _this2.btnDebounced = function () {
2650
- var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
2640
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
2651
2641
  var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
2652
2642
 
2653
2643
  return _regenerator2.default.wrap(function _callee16$(_context16) {
@@ -2754,14 +2744,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2754
2744
  }));
2755
2745
 
2756
2746
  return function (_x10, _x11) {
2757
- return _ref27.apply(this, arguments);
2747
+ return _ref24.apply(this, arguments);
2758
2748
  };
2759
2749
  }();
2760
2750
 
2761
2751
  _this2.onCzkChange = function (v) {
2762
- // console.log("czk change:"+new Date().toLocaleTimeString())
2763
- var _ref28 = _mutantsUtil.platform || {},
2764
- isNewRetailBCPos = _ref28.isNewRetailBCPos;
2752
+ var _ref25 = _mutantsUtil.platform || {},
2753
+ isNewRetailBCPos = _ref25.isNewRetailBCPos;
2765
2754
 
2766
2755
  if (!isNewRetailBCPos) {
2767
2756
  _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2772,13 +2761,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2772
2761
  _this2.setState({
2773
2762
  czkValue: v
2774
2763
  });
2775
- // if(this.debounced){
2776
- // this.debounced.cancel();
2777
- // this.debounced=null;
2778
- // // console.log("debounce canceled");
2779
- // }
2780
- // this.debounced=_debounce(()=>{this.loadCzk(v)},2000);
2781
- // this.debounced();
2782
2764
  };
2783
2765
 
2784
2766
  _this2.czkKeyboardOnOk = function (e) {
@@ -3370,12 +3352,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3370
3352
 
3371
3353
  _this2.hasElectron = hasElectron;
3372
3354
 
3373
- var _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
3374
- MemberMeStorageCardInputByKeyBoard = _ref29.MemberMeStorageCardInputByKeyBoard,
3375
- ICCardServer = _ref29.ICCardServer,
3376
- ICCardPassword = _ref29.ICCardPassword,
3377
- PreSellOrBook = _ref29.PreSellOrBook,
3378
- PercentageWhenBook = _ref29.PercentageWhenBook;
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;
3379
3361
 
3380
3362
  _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
3381
3363
  _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
@@ -3384,9 +3366,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3384
3366
  _this2.percentageWhenBook = PercentageWhenBook;
3385
3367
  //移动端环境下,没有读取IC卡的方式。
3386
3368
 
3387
- var _ref30 = _mutantsUtil.platform || {},
3388
- isHorizontalPad = _ref30.isHorizontalPad,
3389
- isHorizontalSunMi = _ref30.isHorizontalSunMi;
3369
+ var _ref27 = _mutantsUtil.platform || {},
3370
+ isHorizontalPad = _ref27.isHorizontalPad,
3371
+ isHorizontalSunMi = _ref27.isHorizontalSunMi;
3390
3372
 
3391
3373
  _this2.isHorizontalPad = !!isHorizontalPad;
3392
3374
  _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3503,6 +3485,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3503
3485
 
3504
3486
  //jfdx
3505
3487
 
3488
+ }, {
3489
+ key: 'isDjqValidated',
3490
+ value: function isDjqValidated(key) {
3491
+ var paymode = this.store.paymode;
3492
+
3493
+ var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3494
+ PayStyle = _enumController$getEn32.PayStyle;
3495
+
3496
+ if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
3497
+ _message2.default.warn('实收金额已大于应收金额,不允许使用优惠券');
3498
+ return false;
3499
+ }
3500
+ return true;
3501
+ }
3506
3502
 
3507
3503
  /**
3508
3504
  *
@@ -3518,8 +3514,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3518
3514
  }, {
3519
3515
  key: 'isNoProductTip',
3520
3516
  value: function isNoProductTip(nonProductMap) {
3521
- var _ref31 = this.context.viewModel.data || {},
3522
- RetailDetails = _ref31.RetailDetails;
3517
+ var _ref28 = this.context.viewModel.data || {},
3518
+ RetailDetails = _ref28.RetailDetails;
3523
3519
 
3524
3520
  var temphtml = [];
3525
3521
  if ((0, _keys2.default)(nonProductMap).length > 0) {
@@ -3593,8 +3589,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3593
3589
  }, {
3594
3590
  key: 'onKeyboardChange',
3595
3591
  value: function onKeyboardChange(key) {
3596
- var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
3597
- PayStyle = _enumController$getEn32.PayStyle;
3592
+ var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3593
+ PayStyle = _enumController$getEn33.PayStyle;
3598
3594
 
3599
3595
  if (this.currentInput) {
3600
3596
  if (this.store.paymode.currentMode) {
@@ -3615,9 +3611,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3615
3611
  value: function renderToolbtn(mode, index, bookType) {
3616
3612
  var _this7 = this;
3617
3613
 
3618
- var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
3619
- PayIcon = _enumController$getEn33.PayIcon,
3620
- PayStyle = _enumController$getEn33.PayStyle;
3614
+ var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3615
+ PayIcon = _enumController$getEn34.PayIcon,
3616
+ PayStyle = _enumController$getEn34.PayStyle;
3621
3617
 
3622
3618
  var isReturn = this.props.isReturn;
3623
3619
  var _store = this.store,
@@ -3689,11 +3685,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3689
3685
  value: function render() {
3690
3686
  var _this8 = this;
3691
3687
 
3692
- var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
3693
- PayIcon = _enumController$getEn34.PayIcon,
3694
- PayIcon2 = _enumController$getEn34.PayIcon2,
3695
- PayStyle = _enumController$getEn34.PayStyle,
3696
- Differentiate = _enumController$getEn34.Differentiate;
3688
+ var _enumController$getEn35 = _mutantsUtil.enumController.getEnumOj(),
3689
+ PayIcon = _enumController$getEn35.PayIcon,
3690
+ PayIcon2 = _enumController$getEn35.PayIcon2,
3691
+ PayStyle = _enumController$getEn35.PayStyle,
3692
+ Differentiate = _enumController$getEn35.Differentiate;
3697
3693
 
3698
3694
  var _state2 = this.state,
3699
3695
  btnDissabled = _state2.btnDissabled,
@@ -3706,10 +3702,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3706
3702
  newPassConfirm = _state2.newPassConfirm,
3707
3703
  newPass = _state2.newPass,
3708
3704
  isNotAutoFocus = _state2.isNotAutoFocus;
3709
-
3710
- var _ref32 = _mutantsUtil.platform || {},
3711
- isNewRetailBCPos = _ref32.isNewRetailBCPos;
3712
-
3713
3705
  var _store2 = this.store,
3714
3706
  paymode = _store2.paymode,
3715
3707
  brefund = _store2.brefund,
@@ -3794,11 +3786,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3794
3786
  quantity4 = 0;
3795
3787
  var sumQuantity = 0; //数量总和的值,包括称重的。
3796
3788
 
3797
- var _ref33 = quantityDetail || {},
3798
- _ref33$buyQuantity = _ref33.buyQuantity,
3799
- buyQuantity = _ref33$buyQuantity === undefined ? 0 : _ref33$buyQuantity,
3800
- _ref33$returnQuantity = _ref33.returnQuantity,
3801
- returnQuantity = _ref33$returnQuantity === undefined ? 0 : _ref33$returnQuantity;
3789
+ var _ref29 = quantityDetail || {},
3790
+ _ref29$buyQuantity = _ref29.buyQuantity,
3791
+ buyQuantity = _ref29$buyQuantity === undefined ? 0 : _ref29$buyQuantity,
3792
+ _ref29$returnQuantity = _ref29.returnQuantity,
3793
+ returnQuantity = _ref29$returnQuantity === undefined ? 0 : _ref29$returnQuantity;
3802
3794
 
3803
3795
  var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
3804
3796
  quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4683,7 +4675,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4683
4675
  return _this8.czkInput = input;
4684
4676
  },
4685
4677
  onKeyDown: function () {
4686
- var _ref34 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
4678
+ var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
4687
4679
  var time, _paymode;
4688
4680
 
4689
4681
  return _regenerator2.default.wrap(function _callee17$(_context17) {
@@ -4739,7 +4731,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4739
4731
  }));
4740
4732
 
4741
4733
  return function (_x13) {
4742
- return _ref34.apply(this, arguments);
4734
+ return _ref30.apply(this, arguments);
4743
4735
  };
4744
4736
  }(),
4745
4737
  onFocus: function onFocus(e) {
@@ -4796,8 +4788,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4796
4788
  _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
4797
4789
  },
4798
4790
  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
4799
- ref: function ref(_ref35) {
4800
- return _this8["inputCzkAmount"] = _ref35;
4791
+ ref: function ref(_ref31) {
4792
+ return _this8["inputCzkAmount"] = _ref31;
4801
4793
  },
4802
4794
  onFocus: function onFocus(e) {
4803
4795
  _this8.inputkey = "inputCzkAmount";
@@ -5467,8 +5459,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5467
5459
  _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
5468
5460
  },
5469
5461
  defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
5470
- ref: function ref(_ref36) {
5471
- return _this8["inputJfdxAmount"] = _ref36;
5462
+ ref: function ref(_ref32) {
5463
+ return _this8["inputJfdxAmount"] = _ref32;
5472
5464
  },
5473
5465
  onFocus: function onFocus(e) {
5474
5466
  _this8.inputkey = "inputJfdxAmount";