tplus-components-touch 3.25.2 → 3.26.1

package/dist/components/inventorySearch/store.js

@@ -170,8 +170,11 @@ var InventoryStore = (_class = function () {
   }, {
     key: 'search1',
     value: function search1(key, IsInCludeZero) {
+      // if (tabNumber == 1) {
       this.params.IsInCludeZero = IsInCludeZero;
       this.getList1((0, _extends3.default)({}, this.params, { Key: key, IsInCludeZero: IsInCludeZero }));
+      // } else if (tabNumber == 2) {
+      // }
     }
   }, {
     key: 'search2',
@@ -203,13 +206,11 @@ var InventoryStore = (_class = function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.prev = 0;
-
                 this.loading = true;
-                _context2.next = 4;
+                _context2.next = 3;
                 return _api2.default.searchInventoryAvailableQuantity(params);
 
-              case 4:
+              case 3:
                 _ref5 = _context2.sent;
                 TotalPage = _ref5.TotalPage;
                 Data = _ref5.Data;
@@ -223,22 +224,13 @@ var InventoryStore = (_class = function () {
                   _this2.TotalPage1 = TotalPage;
                   _this2.loading = false;
                 });
-                _context2.next = 16;
-                break;
-
-              case 12:
-                _context2.prev = 12;
-                _context2.t0 = _context2['catch'](0);
 
-                console.error('getList1获取库存信息报错', _context2.t0);
-                this.loading = false;
-
-              case 16:
+              case 9:
               case 'end':
                 return _context2.stop();
             }
           }
-        }, _callee2, this, [[0, 12]]);
+        }, _callee2, this);
       }));
 
       function getList1(_x2) {
@@ -259,13 +251,11 @@ var InventoryStore = (_class = function () {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.prev = 0;
-
                 this.loading = true;
-                _context3.next = 4;
+                _context3.next = 3;
                 return _api2.default.searchInventoryAvailableQuantity(params);
 
-              case 4:
+              case 3:
                 _ref7 = _context3.sent;
                 TotalPage = _ref7.TotalPage;
                 Data = _ref7.Data;
@@ -284,22 +274,12 @@ var InventoryStore = (_class = function () {
                   _this3.loading = false;
                 });
 
-                _context3.next = 16;
-                break;
-
-              case 12:
-                _context3.prev = 12;
-                _context3.t0 = _context3['catch'](0);
-
-                console.error('getList2获取库存信息报错', _context3.t0);
-                this.loading = false;
-
-              case 16:
+              case 9:
               case 'end':
                 return _context3.stop();
             }
           }
-        }, _callee3, this, [[0, 12]]);
+        }, _callee3, this);
       }));
 
       function getList2(_x3) {
@@ -315,6 +295,7 @@ var InventoryStore = (_class = function () {
         item.key = i;
         return item;
       });
+      // return [];
     }
   }, {
     key: 'toJSList2',

package/dist/components/inventorySearch/store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/inventorySearch/store.js"],"names":["InventoryStore","params","Key","IsQueryAround","IsInCludeZero","CurrentPage","PageSize","IdStore","getSearchDesigns","InventorySearchApi","getPOSSearchDesigns","list","searchDesigns","sort","a","b","ShowIndex","key","getList1","getList2","pageNo","pageSize","type","loading","searchInventoryAvailableQuantity","TotalPage","Data","TotalCount","Message","error","list1","TotalPage1","console","list2","map","item","i","WarehouseName","StoreName","TotalPage2","action","observable","computed"],"mappings":"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","file":"store.js","sourcesContent":["import { observable, transaction, map, computed, when, reaction, runInAction, action, toJS, autorun } from 'mobx';\r\nimport InventorySearchApi from './api';\r\nimport Message from '../message';\r\n\r\nexport default class InventoryStore {\r\n\r\n  constructor() {\r\n  }\r\n  @action init({ IdStore }) {\r\n    this.getSearchDesigns();\r\n    // this.getList1(this.params);\r\n    // this.getList2({...this.params, IsQueryAround: true});\r\n    this.params.IdStore = IdStore;\r\n  }\r\n\r\n  @observable list1 = []; // 自家门店 的库存\r\n  @observable list2 = []; // 周边门店 的库存\r\n  @observable TotalPage1 = 0;\r\n  @observable TotalPage2 = 0;\r\n  @observable loading = false;\r\n  @observable searchDesigns = [];\r\n\r\n  params = {\r\n    Key: '',\r\n    IsQueryAround: false,\r\n    IsInCludeZero: false,\r\n    CurrentPage: 1,\r\n    PageSize: 15,\r\n    IdStore: ''\r\n  }\r\n\r\n  @action async getSearchDesigns() {\r\n    let {list} = await InventorySearchApi.getPOSSearchDesigns('Inventory');\r\n    runInAction(() => {\r\n      this.searchDesigns = list.sort((a, b) => a.ShowIndex - b.ShowIndex);;\r\n    })\r\n  }\r\n\r\n  search1(key, IsInCludeZero) {\r\n    this.params.IsInCludeZero = IsInCludeZero;\r\n    this.getList1({ ...this.params, Key: key, IsInCludeZero: IsInCludeZero });\r\n  }\r\n\r\n  search2(key, IsInCludeZero) {\r\n    this.params.IsInCludeZero = IsInCludeZero;\r\n    this.getList2({ ...this.params, Key: key, IsQueryAround: true, IsInCludeZero: IsInCludeZero });\r\n  }\r\n\r\n\r\n  searchMore(key, pageNo, pageSize = 15, type) {\r\n    if (type == 1) {\r\n      this.getList1({ ...this.params, Key: key, CurrentPage: pageNo, PageSize: pageSize });\r\n    } else if (type == 2) {\r\n      this.getList2({ ...this.params, Key: key, IsQueryAround: true, CurrentPage: pageNo, PageSize: pageSize });\r\n    }\r\n  }\r\n\r\n  @action async getList1(params) {\r\n    try {\r\n      this.loading = true;\r\n      let { TotalPage, Data, TotalCount } = await InventorySearchApi.searchInventoryAvailableQuantity(params);\r\n      if (!TotalCount || TotalCount == 0) {\r\n        Message.error('无库存信息')\r\n      }\r\n      runInAction(() => {\r\n        this.list1 = Data;\r\n        this.TotalPage1 = TotalPage;\r\n        this.loading = false;\r\n      })\r\n    } catch (ex) {\r\n      console.error('getList1获取库存信息报错', ex);\r\n      this.loading = false;\r\n    }\r\n  }\r\n\r\n  @action async getList2(params) {\r\n    try {\r\n      this.loading = true;\r\n      let { TotalPage, Data, TotalCount } = await InventorySearchApi.searchInventoryAvailableQuantity(params);\r\n      if (!TotalCount || TotalCount == 0) {\r\n        Message.error('无库存信息')\r\n      }\r\n      runInAction(() => {\r\n        this.list2 = Data && Data.map((item, i) => {\r\n          item.key = i;\r\n          item.WarehouseName = item.StoreName;\r\n          return item;\r\n        })\r\n        this.TotalPage2 = TotalPage;\r\n        this.loading = false;\r\n      })\r\n\r\n    } catch (ex) {\r\n      console.error('getList2获取库存信息报错', ex);\r\n      this.loading = false;\r\n    }\r\n  }\r\n\r\n  @computed get toJSList1() {\r\n    return toJS(this.list1).map((item, i) => {\r\n      item.key = i;\r\n      return item;\r\n    })\r\n  }\r\n\r\n  @computed get toJSList2() {\r\n    return toJS(this.list2);\r\n  }\r\n\r\n  @computed get toJSSearchDesigns() {\r\n    return toJS(this.searchDesigns);\r\n  }\r\n}"]}
+{"version":3,"sources":["tplus-components-touch/components/inventorySearch/store.js"],"names":["InventoryStore","params","Key","IsQueryAround","IsInCludeZero","CurrentPage","PageSize","IdStore","getSearchDesigns","InventorySearchApi","getPOSSearchDesigns","list","searchDesigns","sort","a","b","ShowIndex","key","getList1","getList2","pageNo","pageSize","type","loading","searchInventoryAvailableQuantity","TotalPage","Data","TotalCount","Message","error","list1","TotalPage1","list2","map","item","i","WarehouseName","StoreName","TotalPage2","action","observable","computed"],"mappings":"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","file":"store.js","sourcesContent":["import { observable, transaction, map, computed, when, reaction, runInAction, action, toJS, autorun } from 'mobx';\r\nimport InventorySearchApi from './api';\r\nimport Message from '../message';\r\n\r\nexport default class InventoryStore {\r\n\r\n  constructor() {\r\n  }\r\n  @action init({ IdStore }) {\r\n    this.getSearchDesigns();\r\n    // this.getList1(this.params);\r\n    // this.getList2({...this.params, IsQueryAround: true});\r\n    this.params.IdStore = IdStore;\r\n  }\r\n\r\n  @observable list1 = []; // 自家门店 的库存\r\n  @observable list2 = []; // 周边门店 的库存\r\n  @observable TotalPage1 = 0;\r\n  @observable TotalPage2 = 0;\r\n  @observable loading = false;\r\n  @observable searchDesigns = [];\r\n\r\n  params = {\r\n    Key: '',\r\n    IsQueryAround: false,\r\n    IsInCludeZero: false,\r\n    CurrentPage: 1,\r\n    PageSize: 15,\r\n    IdStore: ''\r\n  }\r\n\r\n  @action async getSearchDesigns() {\r\n    let {list} = await InventorySearchApi.getPOSSearchDesigns('Inventory');\r\n    runInAction(() => {\r\n      this.searchDesigns = list.sort((a, b) => a.ShowIndex - b.ShowIndex);;\r\n    })\r\n  }\r\n\r\n  search1(key, IsInCludeZero) {\r\n    // if (tabNumber == 1) {\r\n    this.params.IsInCludeZero = IsInCludeZero;\r\n    this.getList1({ ...this.params, Key: key, IsInCludeZero: IsInCludeZero });\r\n    // } else if (tabNumber == 2) {\r\n    // }\r\n  }\r\n\r\n  search2(key, IsInCludeZero) {\r\n    this.params.IsInCludeZero = IsInCludeZero;\r\n    this.getList2({ ...this.params, Key: key, IsQueryAround: true, IsInCludeZero: IsInCludeZero });\r\n  }\r\n\r\n\r\n  searchMore(key, pageNo, pageSize = 15, type) {\r\n    if (type == 1) {\r\n      this.getList1({ ...this.params, Key: key, CurrentPage: pageNo, PageSize: pageSize });\r\n    } else if (type == 2) {\r\n      this.getList2({ ...this.params, Key: key, IsQueryAround: true, CurrentPage: pageNo, PageSize: pageSize });\r\n    }\r\n  }\r\n\r\n  @action async getList1(params) {\r\n    this.loading = true;\r\n    let { TotalPage, Data, TotalCount } = await InventorySearchApi.searchInventoryAvailableQuantity(params);\r\n    if (!TotalCount || TotalCount == 0) {\r\n      Message.error('无库存信息')\r\n    }\r\n    runInAction(() => {\r\n      this.list1 = Data;\r\n      this.TotalPage1 = TotalPage;\r\n      this.loading = false;\r\n    })\r\n  }\r\n\r\n  @action async getList2(params) {\r\n    this.loading = true;\r\n    let { TotalPage, Data, TotalCount } = await InventorySearchApi.searchInventoryAvailableQuantity(params);\r\n    if (!TotalCount || TotalCount == 0) {\r\n      Message.error('无库存信息')\r\n    }\r\n    runInAction(() => {\r\n      this.list2 = Data && Data.map((item, i) => {\r\n        item.key = i;\r\n        item.WarehouseName = item.StoreName;\r\n        return item;\r\n      })\r\n      this.TotalPage2 = TotalPage;\r\n      this.loading = false;\r\n    })\r\n  }\r\n\r\n  @computed get toJSList1() {\r\n    return toJS(this.list1).map((item, i) => {\r\n      item.key = i;\r\n      return item;\r\n    });\r\n    // return [];\r\n  }\r\n\r\n  @computed get toJSList2() {\r\n    return toJS(this.list2);\r\n  }\r\n\r\n  @computed get toJSSearchDesigns() {\r\n    return toJS(this.searchDesigns);\r\n  }\r\n}"]}

package/dist/components/settlement/settlement.js

@@ -606,6 +606,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.setState({
           czkVisible: true
         });
+        // currentMode && getFixedNumber(brefund?currentMode.value:Math.min(currentMode.value,currentMode.maxamount,currentMode.member.balance))
         var brefund = _this2.store.brefund;
 
         var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
@@ -695,7 +696,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   czkVisible: false,
                   storageValue: '0.00',
-                  czkvalue: null
+                  czkValue: null
                 });
                 _this2.closeRfCard();
                 _this2.store.paymode.calcMemberBalance();
@@ -722,7 +723,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.setState({
         czkVisible: false,
         storageValue: '0.00',
-        czkvalue: null
+        czkValue: null
       });
       _this2.closeRfCard();
       _keyboard2.default.close();
@@ -3124,13 +3125,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref25 = _mutantsMicrofx.stores.user || {},
+    var _ref25 = _mutantsMicrofx.localStore.get('user') || {},
         _ref25$loginInfo = _ref25.loginInfo;
 
     _ref25$loginInfo = _ref25$loginInfo === undefined ? {} : _ref25$loginInfo;
-    var ICCardServer = _ref25$loginInfo.ICCardServer,
+    var MemberMeStorageCardInputByKeyBoard = _ref25$loginInfo.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref25$loginInfo.ICCardServer,
         ICCardPassword = _ref25$loginInfo.ICCardPassword;
 
+    _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
@@ -3144,6 +3147,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
     _this2.setTimer = null;
+    _this2.keypressStime = null;
     return _this2;
   }
 
@@ -3370,7 +3374,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountTotalAmount = _state2.discountTotalAmount,
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
-          storageValue = _state2.storageValue;
+          storageValue = _state2.storageValue,
+          czkValue = _state2.czkValue;
 
       var _ref27 = _mutantsUtil.platform || {},
           isNewRetailBCPos = _ref27.isNewRetailBCPos;
@@ -3459,6 +3464,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
 
       var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
+      var themodeHyczk = thePaymodes.filter(function (mode) {
+        return mode.paymentType === PayStyle.hyczk && mode.value !== '0.00';
+      });
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
@@ -3664,13 +3672,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'lefticon primary-color', onClick: function onClick() {
-                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
-                      ),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -3700,13 +3701,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
-                        'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                      _react2.default.createElement(
+                        'span',
+                        { className: 'minus', onClick: function onClick() {
+                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3745,6 +3745,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         'span',
                         { className: 'fl' },
                         (0, _utils.getFixedNumber)(mode.balance)
+                      ),
+                      _react2.default.createElement('br', null),
+                      themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && _react2.default.createElement(
+                        _button2.default,
+                        { onClick: function onClick() {
+                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                          }, className: 'addCard btn-border-primary' },
+                        _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
+                        _react2.default.createElement(
+                          'span',
+                          null,
+                          '\u6DFB\u52A0\u5361'
+                        )
                       )
                     )
                   );
@@ -4042,7 +4055,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             //   }
                             // }
                             // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
-                            _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            if (mode.paymentType == PayStyle.hyczk) {
+                              if (themodeHyczk && themodeHyczk.length === 0) {
+                                _this8.onHotKeyClick1(mode, index, boriginReturn);
+                              }
+                            } else {
+                              _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            }
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
                             return tm.paymentType == PayStyle.hyczk;
@@ -4106,6 +4125,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           'span',
                           { className: 'balance fr' },
                           '\u652F\u4ED8\u91D1\u989D\uFF1A'
+                        ),
+                        _react2.default.createElement('br', null),
+                        themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
+                          _button2.default,
+                          { onClick: function onClick() {
+                              return _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            }, className: 'addCard btn-border-primary' },
+                          _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
+                          _react2.default.createElement(
+                            'span',
+                            null,
+                            '\u6DFB\u52A0\u5361'
+                          )
                         )
                       );
                     })
@@ -4265,14 +4297,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     { key: index + '', className: 'modeItem' },
                     _react2.default.createElement(
                       'div',
-                      { className: 'main ' + (currentIndex == index && 'settlement-pay-item-border') },
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'lefticon', onClick: function onClick() {
-                            _this8.onDelPay(index);
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
-                      ),
+                      { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4297,13 +4322,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
+                      _react2.default.createElement(
                         'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode('', 'noPlaySetPwd');
+                        { className: 'minus', onClick: function onClick() {
+                            _this8.onDelPay(index);
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4519,7 +4543,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
-                      _react2.default.createElement('div', { className: 'lefticon' }),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4654,7 +4677,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             visible: this.state.czkVisible,
             maskClosable: false,
             destroyOnClose: true,
-            title: "余额结算",
+            title: "储值结算",
             onCancel: this.handleCzkCancel,
             keyboard: false,
             centered: !this.isHorizontalPad ? true : false,
@@ -4742,29 +4765,84 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 null,
-                '\u4F59\u989D\u5361\u53F7\uFF1A'
+                '\u50A8\u503C\u5361\u53F7\uFF1A'
               ),
               _react2.default.createElement(
                 'span',
                 null,
                 _react2.default.createElement(_input2.default, {
                   type: 'text',
-                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
+                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u50A8\u503C\u5361'
                   // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
                   , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
                   defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
-                  value: this.state.czkValue,
+                  value: czkValue,
                   ref: function ref(input) {
                     return _this8.czkInput = input;
                   },
-                  onKeyDown: function onKeyDown(e) {
-                    if (e.keyCode == 13) {
-                      _this8.loadCzk(e.target.value);
-                    }
-                  },
+                  onKeyDown: function () {
+                    var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(e) {
+                      var time, _paymode;
+
+                      return _regenerator2.default.wrap(function _callee14$(_context14) {
+                        while (1) {
+                          switch (_context14.prev = _context14.next) {
+                            case 0:
+                              if (!(e.keyCode == 13)) {
+                                _context14.next = 14;
+                                break;
+                              }
+
+                              time = Date.parse(new Date());
+
+                              if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
+                                _context14.next = 7;
+                                break;
+                              }
+
+                              _message2.default.warn('储值卡不可键盘录入，请刷卡!');
+                              _this8.keypressStime = null;
+                              _this8.setState({
+                                czkValue: null
+                              });
+                              return _context14.abrupt('return');
+
+                            case 7:
+                              _this8.keypressStime = null;
+                              _context14.next = 10;
+                              return _this8.loadCzk(e.target.value);
+
+                            case 10:
+                              _paymode = _this8.store.paymode;
+
+                              if (!_paymode.currentMode.StorageCardNo) {
+                                _this8.setState({
+                                  czkvalue: null
+                                });
+                              }
+                              _context14.next = 15;
+                              break;
+
+                            case 14:
+                              if (!_this8.keypressStime && e.keyCode !== 8) {
+                                _this8.keypressStime = Date.parse(new Date());
+                              }
+
+                            case 15:
+                            case 'end':
+                              return _context14.stop();
+                          }
+                        }
+                      }, _callee14, _this8);
+                    }));
+
+                    return function (_x9) {
+                      return _ref29.apply(this, arguments);
+                    };
+                  }(),
                   onFocus: function onFocus(e) {
                     _this8.inputTarget = _this8.czkInput.input;
                     !_this8.state.prototypeVisible && _keyboard2.default.open(function (v) {
@@ -4819,8 +4897,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref29) {
-                    return _this8["inputCzkAmount"] = _ref29;
+                  ref: function ref(_ref30) {
+                    return _this8["inputCzkAmount"] = _ref30;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5437,8 +5515,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref30) {
-                    return _this8["inputJfdxAmount"] = _ref30;
+                  ref: function ref(_ref31) {
+                    return _this8["inputJfdxAmount"] = _ref31;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";