tplus-components-touch 3.26.1 → 3.27.1

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.
@@ -591,10 +591,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
591
591
  // czkVisible: true
592
592
  // })
593
593
  // }
594
- // }
594
+ // }
595
595
  // // else {
596
596
  // // Message.warn('请先录入会员');
597
- // // }
597
+ // // }
598
598
  // // this.setState({
599
599
  // // czkVisible: true,
600
600
  // // });
@@ -606,7 +606,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
606
606
  _this2.setState({
607
607
  czkVisible: true
608
608
  });
609
- // currentMode && getFixedNumber(brefund?currentMode.value:Math.min(currentMode.value,currentMode.maxamount,currentMode.member.balance))
610
609
  var brefund = _this2.store.brefund;
611
610
 
612
611
  var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
@@ -696,7 +695,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
696
695
  _this2.setState({
697
696
  czkVisible: false,
698
697
  storageValue: '0.00',
699
- czkValue: null
698
+ czkvalue: null
700
699
  });
701
700
  _this2.closeRfCard();
702
701
  _this2.store.paymode.calcMemberBalance();
@@ -723,7 +722,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
723
722
  _this2.setState({
724
723
  czkVisible: false,
725
724
  storageValue: '0.00',
726
- czkValue: null
725
+ czkvalue: null
727
726
  });
728
727
  _this2.closeRfCard();
729
728
  _keyboard2.default.close();
@@ -2494,57 +2493,178 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2494
2493
  };
2495
2494
  }();
2496
2495
 
2497
- _this2.btnDebounced = function (type, bquick) {
2498
- _this2.setState({
2499
- bquick: bquick
2500
- });
2496
+ _this2.btnDebounced = function () {
2497
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
2498
+ var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, dto, IPMSG, _ref26, _ref26$data, nonProductMap, freightProductDTOList, len, names, temphtml, _ref27, freight, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
2501
2499
 
2502
- var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
2503
- PayStyle = _enumController$getEn22.PayStyle;
2500
+ return _regenerator2.default.wrap(function _callee14$(_context14) {
2501
+ while (1) {
2502
+ switch (_context14.prev = _context14.next) {
2503
+ case 0:
2504
+ _ref25 = _this2.context.viewModel.data || {}, IdbusiType = _ref25.IdbusiType, CustomerPhone = _ref25.CustomerPhone, DistributionMode = _ref25.DistributionMode;
2505
+ //预订时,若没录入买家手机号,或配送方式为快递时,弹框买家信息确认框
2504
2506
 
2505
- var _this2$store7 = _this2.store,
2506
- paymode = _this2$store7.paymode,
2507
- brefund = _this2$store7.brefund,
2508
- boriginReturn = _this2$store7.boriginReturn,
2509
- newStyle = _this2$store7.newStyle;
2507
+ if (!(IdbusiType == 38)) {
2508
+ _context14.next = 46;
2509
+ break;
2510
+ }
2510
2511
 
2512
+ if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
2513
+ _context14.next = 5;
2514
+ break;
2515
+ }
2511
2516
 
2512
- if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
2517
+ _context14.next = 5;
2518
+ return _this2.props.openBuyerModal();
2513
2519
 
2514
- var status = false;
2515
- paymode.thePaymodes.forEach(function (v) {
2516
- if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
2517
- status = true;
2518
- }
2519
- });
2520
- _this2.setState({
2521
- isXianjin: status ? true : false
2522
- });
2520
+ case 5:
2521
+ if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
2522
+ _context14.next = 46;
2523
+ break;
2524
+ }
2523
2525
 
2524
- if (_this2.btndebounced) {
2525
- return;
2526
- }
2527
- _this2.btndebounced = (0, _debounce3.default)(function () {
2528
- if (bquick) {
2529
- _this2.quickSettle(type);
2530
- } else {
2531
- _this2.showModal();
2532
- }
2533
- }, 1000, {
2534
- 'leading': true,
2535
- 'trailing': false
2536
- });
2537
- _this2.btndebounced();
2538
- setTimeout(function () {
2539
- _this2.btndebounced.cancel();
2540
- _this2.btndebounced = null;
2541
- }, 2000);
2542
- };
2526
+ _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
2527
+ dto = _this2.context.viewModel.data.cut();
2528
+
2529
+ dto.AddressLng = '116.244057';
2530
+ dto.AddressLat = '40.068669';
2531
+ dto.Address = '北清路68号用友产业园东区19C座';
2532
+ dto.Province = '北京市';
2533
+ dto.City = '北京市';
2534
+ dto.District = '海淀区';
2535
+ // cc结算调用
2536
+ IPMSG = {};
2537
+
2538
+ if (!!window.localStorage.IPMSG) {
2539
+ IPMSG = JSON.parse(window.localStorage.IPMSG);
2540
+ }
2541
+ _context14.next = 18;
2542
+ return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: dto });
2543
+
2544
+ case 18:
2545
+ _ref26 = _context14.sent;
2546
+ _ref26$data = _ref26.data;
2547
+ nonProductMap = _ref26$data.nonProductMap;
2548
+ freightProductDTOList = _ref26$data.freightProductDTOList;
2549
+ len = nonProductMap.length;
2550
+
2551
+ if (!(len > 0)) {
2552
+ _context14.next = 29;
2553
+ break;
2554
+ }
2555
+
2556
+ names = [];
2557
+ temphtml = [];
2558
+
2559
+ nonProductMap.forEach(function (obj, index) {
2560
+ for (var key in obj) {
2561
+ names.push('【' + key + '】');
2562
+ temphtml.push(index + 1 + '、' + obj[key]);
2563
+ }
2564
+ });
2565
+
2566
+ _modalWraper2.default.warning({
2567
+ title: '不可配送商品',
2568
+ content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join(';')
2569
+ });
2570
+ return _context14.abrupt('return');
2571
+
2572
+ case 29:
2573
+ _context14.next = 31;
2574
+ return _this2.props.openWareHouseModal(freightProductDTOList);
2575
+
2576
+ case 31:
2577
+
2578
+ dto = _this2.context.viewModel.data.cut();
2579
+ dto.AddressLng = '116.244057';
2580
+ dto.AddressLat = '40.068669';
2581
+ dto.Address = '北清路68号用友产业园东区19C座';
2582
+ dto.Province = '北京市';
2583
+ dto.City = '北京市';
2584
+ dto.District = '海淀区';
2585
+
2586
+ _context14.next = 40;
2587
+ return getPosFreight({ cip: IPMSG.query || "", dto: dto });
2588
+
2589
+ case 40:
2590
+ _ref27 = _context14.sent;
2591
+ freight = _ref27.data.freight;
2592
+
2593
+ updataFreight(freight);
2594
+ _context14.next = 45;
2595
+ return _this2.props.updataFreight(freight);
2596
+
2597
+ case 45:
2598
+ console.log('zlf获取运费', freight);
2599
+
2600
+ case 46:
2601
+
2602
+ _this2.setState({
2603
+ bquick: bquick
2604
+ });
2605
+ _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
2606
+ _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
2607
+
2608
+ if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
2609
+ _context14.next = 51;
2610
+ break;
2611
+ }
2612
+
2613
+ return _context14.abrupt('return', false);
2614
+
2615
+ case 51:
2616
+ status = false;
2617
+
2618
+ paymode.thePaymodes.forEach(function (v) {
2619
+ if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
2620
+ status = true;
2621
+ }
2622
+ });
2623
+ _this2.setState({
2624
+ isXianjin: status ? true : false
2625
+ });
2626
+
2627
+ if (!_this2.btndebounced) {
2628
+ _context14.next = 56;
2629
+ break;
2630
+ }
2631
+
2632
+ return _context14.abrupt('return');
2633
+
2634
+ case 56:
2635
+ _this2.btndebounced = (0, _debounce3.default)(function () {
2636
+ if (bquick) {
2637
+ _this2.quickSettle(type);
2638
+ } else {
2639
+ _this2.showModal();
2640
+ }
2641
+ }, 1000, {
2642
+ 'leading': true,
2643
+ 'trailing': false
2644
+ });
2645
+ _this2.btndebounced();
2646
+ setTimeout(function () {
2647
+ _this2.btndebounced.cancel();
2648
+ _this2.btndebounced = null;
2649
+ }, 2000);
2650
+
2651
+ case 59:
2652
+ case 'end':
2653
+ return _context14.stop();
2654
+ }
2655
+ }
2656
+ }, _callee14, _this3);
2657
+ }));
2658
+
2659
+ return function (_x8, _x9) {
2660
+ return _ref24.apply(this, arguments);
2661
+ };
2662
+ }();
2543
2663
 
2544
2664
  _this2.onCzkChange = function (v) {
2545
2665
  // console.log("czk change:"+new Date().toLocaleTimeString())
2546
- var _ref24 = _mutantsUtil.platform || {},
2547
- isNewRetailBCPos = _ref24.isNewRetailBCPos;
2666
+ var _ref28 = _mutantsUtil.platform || {},
2667
+ isNewRetailBCPos = _ref28.isNewRetailBCPos;
2548
2668
 
2549
2669
  if (!isNewRetailBCPos) {
2550
2670
  _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2950,9 +3070,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
2950
3070
  };
2951
3071
 
2952
3072
  _this2.checkCurrentModeHaveMutex = function (type) {
2953
- var _this2$store8 = _this2.store,
2954
- paymode = _this2$store8.paymode,
2955
- newStyle = _this2$store8.newStyle;
3073
+ var _this2$store9 = _this2.store,
3074
+ paymode = _this2$store9.paymode,
3075
+ newStyle = _this2$store9.newStyle;
2956
3076
 
2957
3077
  var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
2958
3078
  PayStyle = _enumController$getEn27.PayStyle;
@@ -3125,29 +3245,30 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3125
3245
 
3126
3246
  _this2.hasElectron = hasElectron;
3127
3247
 
3128
- var _ref25 = _mutantsMicrofx.localStore.get('user') || {},
3129
- _ref25$loginInfo = _ref25.loginInfo;
3248
+ var _ref29 = _mutantsMicrofx.localStore.get('user') || {},
3249
+ _ref29$loginInfo = _ref29.loginInfo;
3130
3250
 
3131
- _ref25$loginInfo = _ref25$loginInfo === undefined ? {} : _ref25$loginInfo;
3132
- var MemberMeStorageCardInputByKeyBoard = _ref25$loginInfo.MemberMeStorageCardInputByKeyBoard,
3133
- ICCardServer = _ref25$loginInfo.ICCardServer,
3134
- ICCardPassword = _ref25$loginInfo.ICCardPassword;
3251
+ _ref29$loginInfo = _ref29$loginInfo === undefined ? {} : _ref29$loginInfo;
3252
+ var ICCardServer = _ref29$loginInfo.ICCardServer,
3253
+ ICCardPassword = _ref29$loginInfo.ICCardPassword,
3254
+ Book = _ref29$loginInfo.Book,
3255
+ PercentageWhenBook = _ref29$loginInfo.PercentageWhenBook;
3135
3256
 
3136
- _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
3137
3257
  _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
3138
3258
  _this2.iCCardPassword = ICCardPassword; //IC卡密码
3259
+ _this2.isBook = Book;
3260
+ _this2.percentageWhenBook = PercentageWhenBook;
3139
3261
  //移动端环境下,没有读取IC卡的方式。
3140
3262
 
3141
- var _ref26 = _mutantsUtil.platform || {},
3142
- isHorizontalPad = _ref26.isHorizontalPad,
3143
- isHorizontalSunMi = _ref26.isHorizontalSunMi;
3263
+ var _ref30 = _mutantsUtil.platform || {},
3264
+ isHorizontalPad = _ref30.isHorizontalPad,
3265
+ isHorizontalSunMi = _ref30.isHorizontalSunMi;
3144
3266
 
3145
3267
  _this2.isHorizontalPad = !!isHorizontalPad;
3146
3268
  _this2.isHorizontalSunMi = !!isHorizontalSunMi;
3147
3269
  _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
3148
3270
  _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
3149
3271
  _this2.setTimer = null;
3150
- _this2.keypressStime = null;
3151
3272
  return _this2;
3152
3273
  }
3153
3274
 
@@ -3374,11 +3495,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3374
3495
  discountTotalAmount = _state2.discountTotalAmount,
3375
3496
  discountRetailTotalAount = _state2.discountRetailTotalAount,
3376
3497
  discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
3377
- storageValue = _state2.storageValue,
3378
- czkValue = _state2.czkValue;
3498
+ storageValue = _state2.storageValue;
3379
3499
 
3380
- var _ref27 = _mutantsUtil.platform || {},
3381
- isNewRetailBCPos = _ref27.isNewRetailBCPos;
3500
+ var _ref31 = _mutantsUtil.platform || {},
3501
+ isNewRetailBCPos = _ref31.isNewRetailBCPos;
3382
3502
 
3383
3503
  var _store2 = this.store,
3384
3504
  paymode = _store2.paymode,
@@ -3397,6 +3517,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3397
3517
 
3398
3518
  var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
3399
3519
  var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
3520
+
3521
+ //收订金
3522
+
3523
+ var _ref32 = this.context && this.context.viewModel && this.context.viewModel.data,
3524
+ IdbusiType = _ref32.IdbusiType,
3525
+ DistributionMode = _ref32.DistributionMode;
3526
+
3527
+ if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
3528
+ totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
3529
+ }
3530
+ if (IdbusiType == 39) {
3531
+ totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
3532
+ }
3533
+
3400
3534
  // 单据模式
3401
3535
  var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
3402
3536
  return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
@@ -3441,11 +3575,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3441
3575
  quantity4 = 0;
3442
3576
  var sumQuantity = 0; //数量总和的值,包括称重的。
3443
3577
 
3444
- var _ref28 = quantityDetail || {},
3445
- _ref28$buyQuantity = _ref28.buyQuantity,
3446
- buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
3447
- _ref28$returnQuantity = _ref28.returnQuantity,
3448
- returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
3578
+ var _ref33 = quantityDetail || {},
3579
+ _ref33$buyQuantity = _ref33.buyQuantity,
3580
+ buyQuantity = _ref33$buyQuantity === undefined ? 0 : _ref33$buyQuantity,
3581
+ _ref33$returnQuantity = _ref33.returnQuantity,
3582
+ returnQuantity = _ref33$returnQuantity === undefined ? 0 : _ref33$returnQuantity;
3449
3583
 
3450
3584
  var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
3451
3585
  quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3464,9 +3598,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3464
3598
  }
3465
3599
 
3466
3600
  var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
3467
- var themodeHyczk = thePaymodes.filter(function (mode) {
3468
- return mode.paymentType === PayStyle.hyczk && mode.value !== '0.00';
3469
- });
3470
3601
  return _react2.default.createElement(
3471
3602
  'div',
3472
3603
  { className: 'billingSettlement', ref: function ref(r) {
@@ -3672,6 +3803,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3672
3803
  _react2.default.createElement(
3673
3804
  'div',
3674
3805
  { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
3806
+ _react2.default.createElement(
3807
+ 'div',
3808
+ { className: 'lefticon primary-color', onClick: function onClick() {
3809
+ _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
3810
+ } },
3811
+ _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
3812
+ ),
3675
3813
  _react2.default.createElement(
3676
3814
  'div',
3677
3815
  { className: (0, _classnames4.default)({ "name": true }) },
@@ -3701,12 +3839,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3701
3839
  }
3702
3840
  })
3703
3841
  ),
3704
- _react2.default.createElement(
3705
- 'span',
3706
- { className: 'minus', onClick: function onClick() {
3707
- _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
3842
+ !isNeedPasswordForStoragePay && _react2.default.createElement(
3843
+ 'div',
3844
+ { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
3845
+ onClick: function onClick() {
3846
+ _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
3708
3847
  } },
3709
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
3848
+ _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
3710
3849
  )
3711
3850
  ),
3712
3851
  mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3745,19 +3884,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
3745
3884
  'span',
3746
3885
  { className: 'fl' },
3747
3886
  (0, _utils.getFixedNumber)(mode.balance)
3748
- ),
3749
- _react2.default.createElement('br', null),
3750
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && _react2.default.createElement(
3751
- _button2.default,
3752
- { onClick: function onClick() {
3753
- _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
3754
- }, className: 'addCard btn-border-primary' },
3755
- _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
3756
- _react2.default.createElement(
3757
- 'span',
3758
- null,
3759
- '\u6DFB\u52A0\u5361'
3760
- )
3761
3887
  )
3762
3888
  )
3763
3889
  );
@@ -4054,14 +4180,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4054
4180
  // return;
4055
4181
  // }
4056
4182
  // }
4057
- // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4058
- if (mode.paymentType == PayStyle.hyczk) {
4059
- if (themodeHyczk && themodeHyczk.length === 0) {
4060
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4061
- }
4062
- } else {
4063
- _this8.onHotKeyClick1(mode, index, boriginReturn);
4064
- }
4183
+ // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
4184
+ _this8.onHotKeyClick1(mode, index, boriginReturn);
4065
4185
  },
4066
4186
  value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
4067
4187
  return tm.paymentType == PayStyle.hyczk;
@@ -4125,19 +4245,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4125
4245
  'span',
4126
4246
  { className: 'balance fr' },
4127
4247
  '\u652F\u4ED8\u91D1\u989D\uFF1A'
4128
- ),
4129
- _react2.default.createElement('br', null),
4130
- themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
4131
- _button2.default,
4132
- { onClick: function onClick() {
4133
- return _this8.onHotKeyClick1(mode, index, boriginReturn);
4134
- }, className: 'addCard btn-border-primary' },
4135
- _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
4136
- _react2.default.createElement(
4137
- 'span',
4138
- null,
4139
- '\u6DFB\u52A0\u5361'
4140
- )
4141
4248
  )
4142
4249
  );
4143
4250
  })
@@ -4297,7 +4404,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4297
4404
  { key: index + '', className: 'modeItem' },
4298
4405
  _react2.default.createElement(
4299
4406
  'div',
4300
- { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
4407
+ { className: 'main ' + (currentIndex == index && 'settlement-pay-item-border') },
4408
+ _react2.default.createElement(
4409
+ 'div',
4410
+ { className: 'lefticon', onClick: function onClick() {
4411
+ _this8.onDelPay(index);
4412
+ } },
4413
+ _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
4414
+ ),
4301
4415
  _react2.default.createElement(
4302
4416
  'div',
4303
4417
  { className: (0, _classnames4.default)({ "name": true }) },
@@ -4322,12 +4436,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4322
4436
  }
4323
4437
  })
4324
4438
  ),
4325
- _react2.default.createElement(
4439
+ !isNeedPasswordForStoragePay && _react2.default.createElement(
4326
4440
  'div',
4327
- { className: 'minus', onClick: function onClick() {
4328
- _this8.onDelPay(index);
4441
+ { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
4442
+ onClick: function onClick() {
4443
+ _this8.appendCzkmode('', 'noPlaySetPwd');
4329
4444
  } },
4330
- _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
4445
+ _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
4331
4446
  )
4332
4447
  ),
4333
4448
  mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4543,6 +4658,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4543
4658
  _react2.default.createElement(
4544
4659
  'div',
4545
4660
  { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
4661
+ _react2.default.createElement('div', { className: 'lefticon' }),
4546
4662
  _react2.default.createElement(
4547
4663
  'div',
4548
4664
  { className: (0, _classnames4.default)({ "name": true }) },
@@ -4677,7 +4793,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4677
4793
  visible: this.state.czkVisible,
4678
4794
  maskClosable: false,
4679
4795
  destroyOnClose: true,
4680
- title: "储值结算",
4796
+ title: "余额结算",
4681
4797
  onCancel: this.handleCzkCancel,
4682
4798
  keyboard: false,
4683
4799
  centered: !this.isHorizontalPad ? true : false,
@@ -4765,84 +4881,29 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4765
4881
  _react2.default.createElement(
4766
4882
  'span',
4767
4883
  null,
4768
- '\u50A8\u503C\u5361\u53F7\uFF1A'
4884
+ '\u4F59\u989D\u5361\u53F7\uFF1A'
4769
4885
  ),
4770
4886
  _react2.default.createElement(
4771
4887
  'span',
4772
4888
  null,
4773
4889
  _react2.default.createElement(_input2.default, {
4774
4890
  type: 'text',
4775
- placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u50A8\u503C\u5361'
4891
+ placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
4776
4892
  // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
4777
4893
  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
4778
4894
  onChange: function onChange(e) {
4779
4895
  return _this8.onCzkChange(e.target.value);
4780
4896
  },
4781
4897
  defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
4782
- value: czkValue,
4898
+ value: this.state.czkValue,
4783
4899
  ref: function ref(input) {
4784
4900
  return _this8.czkInput = input;
4785
4901
  },
4786
- onKeyDown: function () {
4787
- var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(e) {
4788
- var time, _paymode;
4789
-
4790
- return _regenerator2.default.wrap(function _callee14$(_context14) {
4791
- while (1) {
4792
- switch (_context14.prev = _context14.next) {
4793
- case 0:
4794
- if (!(e.keyCode == 13)) {
4795
- _context14.next = 14;
4796
- break;
4797
- }
4798
-
4799
- time = Date.parse(new Date());
4800
-
4801
- if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
4802
- _context14.next = 7;
4803
- break;
4804
- }
4805
-
4806
- _message2.default.warn('储值卡不可键盘录入,请刷卡!');
4807
- _this8.keypressStime = null;
4808
- _this8.setState({
4809
- czkValue: null
4810
- });
4811
- return _context14.abrupt('return');
4812
-
4813
- case 7:
4814
- _this8.keypressStime = null;
4815
- _context14.next = 10;
4816
- return _this8.loadCzk(e.target.value);
4817
-
4818
- case 10:
4819
- _paymode = _this8.store.paymode;
4820
-
4821
- if (!_paymode.currentMode.StorageCardNo) {
4822
- _this8.setState({
4823
- czkvalue: null
4824
- });
4825
- }
4826
- _context14.next = 15;
4827
- break;
4828
-
4829
- case 14:
4830
- if (!_this8.keypressStime && e.keyCode !== 8) {
4831
- _this8.keypressStime = Date.parse(new Date());
4832
- }
4833
-
4834
- case 15:
4835
- case 'end':
4836
- return _context14.stop();
4837
- }
4838
- }
4839
- }, _callee14, _this8);
4840
- }));
4841
-
4842
- return function (_x9) {
4843
- return _ref29.apply(this, arguments);
4844
- };
4845
- }(),
4902
+ onKeyDown: function onKeyDown(e) {
4903
+ if (e.keyCode == 13) {
4904
+ _this8.loadCzk(e.target.value);
4905
+ }
4906
+ },
4846
4907
  onFocus: function onFocus(e) {
4847
4908
  _this8.inputTarget = _this8.czkInput.input;
4848
4909
  !_this8.state.prototypeVisible && _keyboard2.default.open(function (v) {
@@ -4897,8 +4958,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
4897
4958
  _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
4898
4959
  },
4899
4960
  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
4900
- ref: function ref(_ref30) {
4901
- return _this8["inputCzkAmount"] = _ref30;
4961
+ ref: function ref(_ref34) {
4962
+ return _this8["inputCzkAmount"] = _ref34;
4902
4963
  },
4903
4964
  onFocus: function onFocus(e) {
4904
4965
  _this8.inputkey = "inputCzkAmount";
@@ -5515,8 +5576,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
5515
5576
  _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
5516
5577
  },
5517
5578
  defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
5518
- ref: function ref(_ref31) {
5519
- return _this8["inputJfdxAmount"] = _ref31;
5579
+ ref: function ref(_ref35) {
5580
+ return _this8["inputJfdxAmount"] = _ref35;
5520
5581
  },
5521
5582
  onFocus: function onFocus(e) {
5522
5583
  _this8.inputkey = "inputJfdxAmount";