tplus-components-touch 3.33.7 → 3.33.11

package/dist/components/settlement/settlement.js

@@ -204,6 +204,8 @@ var _index = require('../../index');
 
 var _tplusPoslogin = require('tplus-poslogin');
 
+var _tplusApi = require('tplus-api');
+
 var _index2 = require('./prototypeTable/index');
 
 var _index3 = _interopRequireDefault(_index2);
@@ -1942,147 +1944,96 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(args) {
+      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
-            var _this5 = this;
-
-            var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result, currentZeroTime, voucherDateTime;
+          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+            var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee11$(_context11) {
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
               while (1) {
-                switch (_context11.prev = _context11.next) {
+                switch (_context10.prev = _context10.next) {
                   case 0:
                     results = [];
-                    _context11.prev = 1;
+                    _context10.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context11.prev = 5;
+                    _context10.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context11.next = 16;
+                      _context10.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context11.next = 11;
+                    _context10.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context11.sent;
+                    _result = _context10.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context11.next = 7;
+                    _context10.next = 7;
                     break;
 
                   case 16:
-                    _context11.next = 22;
+                    _context10.next = 22;
                     break;
 
                   case 18:
-                    _context11.prev = 18;
-                    _context11.t0 = _context11['catch'](5);
+                    _context10.prev = 18;
+                    _context10.t0 = _context10['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context11.t0;
+                    _iteratorError = _context10.t0;
 
                   case 22:
-                    _context11.prev = 22;
-                    _context11.prev = 23;
+                    _context10.prev = 22;
+                    _context10.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context11.prev = 25;
+                    _context10.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context11.next = 28;
+                      _context10.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context11.finish(25);
+                    return _context10.finish(25);
 
                   case 29:
-                    return _context11.finish(22);
+                    return _context10.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    currentZeroTime = new Date(new Date().toDateString()).getTime();
-                    voucherDateTime = new Date(VoucherDate).getTime();
-                    // let isUpdate1 = await isUpdateDate && isUpdateDate();
-
-                    if (!isUpdateDate) {
-                      _context11.next = 37;
-                      break;
-                    }
-
-                    isUpdateDate(function () {
-                      var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(result1) {
-                        return _regenerator2.default.wrap(function _callee10$(_context10) {
-                          while (1) {
-                            switch (_context10.prev = _context10.next) {
-                              case 0:
-                                if (result1) {
-                                  if (voucherDateTime < currentZeroTime) {
-                                    setVoucherDate();
-                                  }
-                                }
-                                _context10.next = 3;
-                                return commit(results);
-
-                              case 3:
-                              case 'end':
-                                return _context10.stop();
-                            }
-                          }
-                        }, _callee10, _this5);
-                      }));
-
-                      return function (_x7) {
-                        return _ref20.apply(this, arguments);
-                      };
-                    }());
-                    _context11.next = 43;
-                    break;
-
-                  case 37:
-                    if (!(voucherDateTime < currentZeroTime)) {
-                      _context11.next = 41;
-                      break;
-                    }
-
-                    this.store.setVoucherDate();
-                    _context11.next = 41;
-                    return commit(results);
-
-                  case 41:
-                    _context11.next = 43;
+                    _context10.next = 33;
                     return commit(results);
 
-                  case 43:
-                    _context11.next = 47;
+                  case 33:
+                    _context10.next = 37;
                     break;
 
-                  case 45:
-                    _context11.prev = 45;
-                    _context11.t1 = _context11['catch'](1);
+                  case 35:
+                    _context10.prev = 35;
+                    _context10.t1 = _context10['catch'](1);
 
-                  case 47:
+                  case 37:
                   case 'end':
-                    return _context11.stop();
+                    return _context10.stop();
                 }
               }
-            }, _callee11, this, [[1, 45], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee10, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
           return function handleUserInputs(_x6) {
@@ -2090,11 +2041,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit, _this2$props3, isUpdateDate, type, VoucherDate, setVoucherDate;
+        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        return _regenerator2.default.wrap(function _callee12$(_context12) {
+        return _regenerator2.default.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context12.prev = _context12.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
@@ -2116,7 +2067,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context12.next = 13;
+                  _context11.next = 13;
                   break;
                 }
 
@@ -2124,11 +2075,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context12.abrupt('return');
+                return _context11.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context12.next = 19;
+                  _context11.next = 19;
                   break;
                 }
 
@@ -2137,7 +2088,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context12.next = 19;
+                  _context11.next = 19;
                   break;
                 }
 
@@ -2145,7 +2096,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context12.abrupt('return');
+                return _context11.abrupt('return');
 
               case 19:
                 promises = [];
@@ -2154,14 +2105,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context12.next = 27;
+                  _context11.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context12.next = 27;
+                  _context11.next = 27;
                   break;
                 }
 
@@ -2169,7 +2120,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context12.abrupt('return');
+                return _context11.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2257,19 +2208,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   };
                 }();
 
-                _this2$props3 = _this2.props, isUpdateDate = _this2$props3.isUpdateDate, type = _this2$props3.type;
-                VoucherDate = _this2.store.dto.VoucherDate;
-                setVoucherDate = _this2.store.setVoucherDate;
-
-
                 handleUserInputs(promises);
 
-              case 33:
+              case 30:
               case 'end':
-                return _context12.stop();
+                return _context11.stop();
             }
           }
-        }, _callee12, _this3);
+        }, _callee11, _this3);
       }));
 
       return function (_x4) {
@@ -2277,91 +2223,91 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(promises) {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          return _regenerator2.default.wrap(function _callee14$(_context14) {
+          return _regenerator2.default.wrap(function _callee13$(_context13) {
             while (1) {
-              switch (_context14.prev = _context14.next) {
+              switch (_context13.prev = _context13.next) {
                 case 0:
                   results = [];
-                  _context14.prev = 1;
+                  _context13.prev = 1;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context14.prev = 5;
+                  _context13.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context14.next = 16;
+                    _context13.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context14.next = 11;
+                  _context13.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context14.sent;
+                  _result2 = _context13.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = true;
-                  _context14.next = 7;
+                  _context13.next = 7;
                   break;
 
                 case 16:
-                  _context14.next = 22;
+                  _context13.next = 22;
                   break;
 
                 case 18:
-                  _context14.prev = 18;
-                  _context14.t0 = _context14['catch'](5);
+                  _context13.prev = 18;
+                  _context13.t0 = _context13['catch'](5);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context14.t0;
+                  _iteratorError2 = _context13.t0;
 
                 case 22:
-                  _context14.prev = 22;
-                  _context14.prev = 23;
+                  _context13.prev = 22;
+                  _context13.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context14.prev = 25;
+                  _context13.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context14.next = 28;
+                    _context13.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context14.finish(25);
+                  return _context13.finish(25);
 
                 case 29:
-                  return _context14.finish(22);
+                  return _context13.finish(22);
 
                 case 30:
-                  _context14.next = 32;
+                  _context13.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context14.next = 37;
+                  _context13.next = 37;
                   break;
 
                 case 34:
-                  _context14.prev = 34;
-                  _context14.t1 = _context14['catch'](1);
+                  _context13.prev = 34;
+                  _context13.t1 = _context13['catch'](1);
 
-                  if (_context14.t1 != "cancelpwd") {
-                    _message2.default.error(_context14.t1);
+                  if (_context13.t1 != "cancelpwd") {
+                    _message2.default.error(_context13.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2369,27 +2315,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context14.stop();
+                  return _context13.stop();
               }
             }
-          }, _callee14, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee13, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
-        return function handleUserInputs(_x9) {
-          return _ref24.apply(this, arguments);
+        return function handleUserInputs(_x8) {
+          return _ref23.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref22, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
-      return _regenerator2.default.wrap(function _callee15$(_context15) {
+      return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref22 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref22.isNewRetailBCPos;
+              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
@@ -2410,33 +2356,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(values) {
+                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
-                  return _regenerator2.default.wrap(function _callee13$(_context13) {
+                  return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                      switch (_context13.prev = _context13.next) {
+                      switch (_context12.prev = _context12.next) {
                         case 0:
                           if (!(values.length > 0)) {
-                            _context13.next = 6;
+                            _context12.next = 6;
                             break;
                           }
 
-                          _context13.next = 3;
+                          _context12.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context13.t0 = _context13.sent;
-                          _context13.next = 7;
+                          _context12.t0 = _context12.sent;
+                          _context12.next = 7;
                           break;
 
                         case 6:
-                          _context13.t0 = "";
+                          _context12.t0 = "";
 
                         case 7:
-                          result = _context13.t0;
+                          result = _context12.t0;
 
                           if (!(result == "")) {
-                            _context13.next = 13;
+                            _context12.next = 13;
                             break;
                           }
 
@@ -2444,23 +2390,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           //返回
                           that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
                           _promise2.default.resolve();
-                          _context13.next = 15;
+                          _context12.next = 15;
                           break;
 
                         case 13:
-                          _context13.next = 15;
+                          _context12.next = 15;
                           return _promise2.default.reject(result);
 
                         case 15:
                         case 'end':
-                          return _context13.stop();
+                          return _context12.stop();
                       }
                     }
-                  }, _callee13, _this3);
+                  }, _callee12, _this3);
                 }));
 
-                return function commit(_x8) {
-                  return _ref23.apply(this, arguments);
+                return function commit(_x7) {
+                  return _ref22.apply(this, arguments);
                 };
               }();
 
@@ -2468,10 +2414,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 7:
             case 'end':
-              return _context15.stop();
+              return _context14.stop();
           }
         }
-      }, _callee15, _this3);
+      }, _callee14, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2511,15 +2457,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(paymode) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
-        return _regenerator2.default.wrap(function _callee16$(_context16) {
+        return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
-            switch (_context16.prev = _context16.next) {
+            switch (_context15.prev = _context15.next) {
               case 0:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context16.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context15.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2527,8 +2473,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref26 = that.state || {},
-                          confirmPwd = _ref26.confirmPwd;
+                      var _ref25 = that.state || {},
+                          confirmPwd = _ref25.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2618,8 +2564,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref27 = that.state || {},
-                                    confirmPwd = _ref27.confirmPwd;
+                                var _ref26 = that.state || {},
+                                    confirmPwd = _ref26.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2653,14 +2599,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 3:
               case 'end':
-                return _context16.stop();
+                return _context15.stop();
             }
           }
-        }, _callee16, _this3);
+        }, _callee15, _this3);
       }));
 
-      return function (_x10) {
-        return _ref25.apply(this, arguments);
+      return function (_x9) {
+        return _ref24.apply(this, arguments);
       };
     }();
 
@@ -2714,8 +2660,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref28 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref28.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2847,9 +2793,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var that = _this2;
       var isStoredValueCard = false;
       var discountPrototypeTotalAmount = _this2.state.discountPrototypeTotalAmount;
-      var _this2$props4 = _this2.props,
-          isReturn = _this2$props4.isReturn,
-          type = _this2$props4.type;
+      var _this2$props3 = _this2.props,
+          isReturn = _this2$props3.isReturn,
+          type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
       // 付款弹窗
@@ -3296,19 +3242,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        MemberMeStorageCardInputByKeyBoard = _ref29.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref29.ICCardServer,
-        ICCardPassword = _ref29.ICCardPassword;
+    var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref28.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref28.ICCardServer,
+        ICCardPassword = _ref28.ICCardPassword;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref30 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref30.isHorizontalPad,
-        isHorizontalSunMi = _ref30.isHorizontalSunMi;
+    var _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3354,7 +3300,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     //IC卡连接
     value: function connectRfCard() {
-      var _this6 = this;
+      var _this5 = this;
 
       //客户端环境下，并开启了启用IC卡。
       if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -3365,7 +3311,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           } else {
             result = { connectCardStatus: true, connectCardError: '' };
           }
-          _this6.setState(result);
+          _this5.setState(result);
         });
       }
     }
@@ -3374,7 +3320,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'readRfCard',
     value: function readRfCard() {
-      var _this7 = this;
+      var _this6 = this;
 
       //客户端环境下，并开启了启用IC卡。
       if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -3391,15 +3337,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
           if (ret.status === 0) {
             _message2.default.error(ret.value);
-            _this7.connectRfCard(); //读取失败后，重新连接一下。
+            _this6.connectRfCard(); //读取失败后，重新连接一下。
             return;
           } else if (ret.status === 1) {
             // this.searchMember(ret.value);
             // this.czkInput.input["value"]=ret.value;
-            _this7.setState({
+            _this6.setState({
               czkValue: ret.value
             });
-            _this7.loadCzk(ret.value);
+            _this6.loadCzk(ret.value);
           }
         });
       }
@@ -3427,11 +3373,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     //jfdx
 
 
-    /**
-     *
-     * @param {*} thePaymodes 支付方式列表
-     * @param {*} currenIndex  当前支付方式下标
-     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
+    /**
+     *
+     * @param {*} thePaymodes 支付方式列表
+     * @param {*} currenIndex  当前支付方式下标
+     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
     // 处理客显显示功能
@@ -3446,7 +3392,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'onKeyboardChange',
     value: function onKeyboardChange(key) {
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
       if (this.currentInput) {
+        if (this.store.paymode.currentMode) {
+          var paymentType1 = this.store.paymode.currentMode.paymentType;
+          if (paymentType1 === PayStyle.djq || paymentType1 === PayStyle.hyczk || paymentType1 === PayStyle.jfdx) {
+            return;
+          }
+        }
         var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
         if (!isNaN(value) || value == '-') {
           this.currentInput.value = value;
@@ -3457,11 +3412,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'renderToolbtn',
     value: function renderToolbtn(mode, index) {
-      var _this8 = this;
+      var _this7 = this;
 
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn32.PayIcon,
-          PayStyle = _enumController$getEn32.PayStyle;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn33.PayIcon,
+          PayStyle = _enumController$getEn33.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3494,7 +3449,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return _react2.default.createElement(
         'div',
         { key: index + "", className: paymodeDisabled + ' ' + paymodeSelected + ' paymode  hotkey_' + this.compoundHotkeysList[hotkeyIndex], onClick: function onClick() {
-            _this8.onTabsClick(mode.paymentType);
+            _this7.onTabsClick(mode.paymentType);
           } },
         _react2.default.createElement(
           'div',
@@ -3531,13 +3486,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'render',
     value: function render() {
-      var _this9 = this;
+      var _this8 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayIcon2 = _enumController$getEn33.PayIcon2,
-          PayStyle = _enumController$getEn33.PayStyle,
-          Differentiate = _enumController$getEn33.Differentiate;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayIcon2 = _enumController$getEn34.PayIcon2,
+          PayStyle = _enumController$getEn34.PayStyle,
+          Differentiate = _enumController$getEn34.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3550,8 +3505,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           newPassConfirm = _state2.newPassConfirm,
           newPass = _state2.newPass;
 
-      var _ref31 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref31.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3572,7 +3527,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
-        return !(_this9.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
+        return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
       }) : paymode.thePaymodes;
       var paymodes = paymode.paymodes,
           settle = paymode.settle,
@@ -3614,11 +3569,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref32 = quantityDetail || {},
-          _ref32$buyQuantity = _ref32.buyQuantity,
-          buyQuantity = _ref32$buyQuantity === undefined ? 0 : _ref32$buyQuantity,
-          _ref32$returnQuantity = _ref32.returnQuantity,
-          returnQuantity = _ref32$returnQuantity === undefined ? 0 : _ref32$returnQuantity;
+      var _ref31 = quantityDetail || {},
+          _ref31$buyQuantity = _ref31.buyQuantity,
+          buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
+          _ref31$returnQuantity = _ref31.returnQuantity,
+          returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3642,7 +3597,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
-            return _this9.billingSettlementDocumnet = r;
+            return _this8.billingSettlementDocumnet = r;
           } },
         this.props.MemberPoints ? _react2.default.createElement(
           'div',
@@ -3772,9 +3727,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             return _react2.default.createElement(
               _button2.default,
               { className: (0, _classnames4.default)({ "quick": true, "quick2": type == 1 }), key: 'paymentType_' + p.paymentType, onClick: function onClick() {
-                  _this9.btnDebounced(p.paymentType, true);
+                  _this8.btnDebounced(p.paymentType, true);
                 },
-                disabled: productsIsEmpty || type != 1 && _this9.checkModeDisabled(p.paymentType, (_this9.context.viewModel.data.TotalTaxAmount || 0 - _this9.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
+                disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn) },
               _react2.default.createElement(
                 'div',
                 { className: (0, _classnames4.default)((_classnames2 = {}, (0, _defineProperty3.default)(_classnames2, iconclass, true), (0, _defineProperty3.default)(_classnames2, "icon", true), _classnames2)) },
@@ -3790,7 +3745,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           _react2.default.createElement(
             _button2.default,
             { key: 'settle', className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }), onClick: function onClick() {
-                _this9.btnDebounced();
+                _this8.btnDebounced();
               }, disabled: productsIsEmpty },
             this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
           )
@@ -3818,7 +3773,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 'div',
                 null,
                 (0, _map3.default)(paymodes, function (mode, index) {
-                  return _this9.renderToolbtn(mode, index);
+                  return _this8.renderToolbtn(mode, index);
                 })
               ),
               paymodes.length > carouselStart && this.paymodesCarouselList(params, paymodes, carouselStart)
@@ -3855,28 +3810,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
                           className: _index.hotKey.hotKeyNotFilter(),
                           onClick: function onClick() {
-                            _this9.editModal(index, mode.paymentType, boriginReturn);
+                            _this8.editModal(index, mode.paymentType, boriginReturn);
                           }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
                           className: _index.hotKey.hotKeyNotFilter(),
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
                           onClick: function onClick(e) {
-                            return _this9.onHotKeyClick2(index, mode, paymode, e);
+                            return _this8.onHotKeyClick2(index, mode, paymode, e);
                           },
                           onBlur: function onBlur(e) {
-                            return _this9.onBlur(index, e);
+                            return _this8.onBlur(index, e);
                           },
                           onFocus: function onFocus(e) {
-                            return _this9.onFocusHack(index, mode, paymode, e);
+                            return _this8.onFocusHack(index, mode, paymode, e);
                           },
                           onChange: function onChange(e) {
-                            return _this9.handleChange(index, e);
+                            return _this8.handleChange(index, e);
                           }
                         })
                       ),
                       _react2.default.createElement(
                         'span',
                         { className: 'minus', onClick: function onClick() {
-                            _this9.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
+                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
                           } },
                         _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
@@ -3922,7 +3877,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
                         _button2.default,
                         { onClick: function onClick() {
-                            _this9.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
                           }, className: 'addCard btn-border-primary' },
                         _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
                         _react2.default.createElement(
@@ -4163,7 +4118,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   '\u8BF7\u6DFB\u52A0\u7ED3\u7B97\u65B9\u5F0F'
                 ),
                 (0, _map3.default)(thePaymodes, function (mode, mindex) {
-                  var isReturn = _this9.props.isReturn;
+                  var isReturn = _this8.props.isReturn;
 
                   var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
                     return m.paymentType === PayStyle.smzf;
@@ -4207,7 +4162,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'div',
                           { className: 'hotkey' },
-                          _this9.isHorizontalPad ? '' : _this9.compoundHotkeysList[hotkeyIndex] || ''
+                          _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[hotkeyIndex] || ''
                         )
                       ),
                       _react2.default.createElement(
@@ -4215,8 +4170,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         { className: (0, _classnames4.default)({ "content": true }) },
                         mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
 
-                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this9.compoundHotkeysList[hotkeyIndex]),
-                          disabled: _this9.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
+                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
+                          disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
                           onClick: function onClick() {
                             // let czkinput = document.getElementById('inputS' + index);
                             // if (mode.paymentType === PayStyle.hyczk) {
@@ -4229,10 +4184,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
                             if (mode.paymentType == PayStyle.hyczk) {
                               if (themodeHyczk && themodeHyczk.length === 0) {
-                                _this9.onHotKeyClick1(mode, index, boriginReturn);
+                                _this8.onHotKeyClick1(mode, index, boriginReturn);
                               }
                             } else {
-                              _this9.onHotKeyClick1(mode, index, boriginReturn);
+                              _this8.onHotKeyClick1(mode, index, boriginReturn);
                             }
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
@@ -4240,20 +4195,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }), function (sum, m) {
                             return Math.Add(sum, m.value);
                           }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
-                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this9.compoundHotkeysList[hotkeyIndex]),
-                          disabled: _this9.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this9.checkScanDisabled(mode.paymentType),
+                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
+                          disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
                           onClick: function onClick(e) {
-                            return _this9.onHotKeyClick2(index, mode, paymode, e);
+                            return _this8.onHotKeyClick2(index, mode, paymode, e);
                           },
                           onBlur: function onBlur(e) {
-                            return _this9.onBlur(index, e);
+                            return _this8.onBlur(index, e);
                           },
                           onFocus: function onFocus(e) {
-                            return _this9.onFocusHack(index, mode, paymode, e);
+                            return _this8.onFocusHack(index, mode, paymode, e);
                           },
                           onChange: function onChange(e) {
-                            return _this9.handleChange(index, e);
+                            return _this8.handleChange(index, e);
                           }
                         })
                       )
@@ -4302,7 +4257,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
                           _button2.default,
                           { onClick: function onClick() {
-                              return _this9.onHotKeyClick1(mode, index, boriginReturn);
+                              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(
@@ -4369,7 +4324,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   'div',
                   null,
                   (0, _map3.default)(paymodes, function (mode, index) {
-                    return _this9.renderToolbtn(mode, index);
+                    return _this8.renderToolbtn(mode, index);
                   })
                 ),
                 paymodes.length > carouselStart2 && this.paymodesCarouselList(params, paymodes, carouselStart2)
@@ -4480,24 +4435,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         { className: (0, _classnames4.default)({ "content": true }) },
                         mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
                           onClick: function onClick() {
-                            _this9.editModal(index, mode.paymentType);
+                            _this8.editModal(index, mode.paymentType);
                           }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
                           onBlur: function onBlur(e) {
-                            return _this9.onBlur(index, e);
+                            return _this8.onBlur(index, e);
                           },
                           onChange: function onChange(e) {
-                            return _this9.handleChange(index, e);
+                            return _this8.handleChange(index, e);
                           },
                           onFocus: function onFocus(e) {
-                            return _this9.onFocusHack(index, mode, paymode, e);
+                            return _this8.onFocusHack(index, mode, paymode, e);
                           }
                         })
                       ),
                       _react2.default.createElement(
                         'div',
                         { className: 'minus', onClick: function onClick() {
-                            _this9.onDelPay(index);
+                            _this8.onDelPay(index);
                           } },
                         _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
@@ -4687,7 +4642,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 // _map(_sortBy(thePaymodes, pay => pay['order'] || 0), (mode) => {
                 (0, _map3.default)(thePaymodes, function (mode, mindex) {
-                  var isReturn = _this9.props.isReturn;
+                  var isReturn = _this8.props.isReturn;
 
                   var hasSMZF = (0, _find3.default)(thePaymodes, function (m) {
                     return m.paymentType === PayStyle.smzf;
@@ -4731,7 +4686,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'div',
                           { className: 'hotkey' },
-                          _this9.isHorizontalPad ? '' : _this9.compoundHotkeysList[mindex] || ""
+                          _this8.isHorizontalPad ? '' : _this8.compoundHotkeysList[mindex] || ""
                         )
                       ),
                       _react2.default.createElement(
@@ -4739,32 +4694,32 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         { className: (0, _classnames4.default)({ "content": true }) },
                         mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index
                           // className={classnames({'paymode':mode.paymentType == PayStyle.hyczk?(_findIndex(thePaymodes,(m)=>{return m.paymentType==PayStyle.hyczk;})==mindex?true:false):true})}
-                          , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this9.compoundHotkeysList[hotkeyIndex])
+                          , className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
                           // className="paymode"
-                          , disabled: _this9.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
+                          , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
                           onClick: function onClick() {
-                            _this9.onHotKeyClick1(mode, index, boriginReturn);
+                            _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;
                           }), function (sum, m) {
                             return Math.Add(sum, m.value);
                           }, 0)) : (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
-                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this9.compoundHotkeysList[hotkeyIndex])
+                          className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex])
                           // className="paymode"
-                          , disabled: _this9.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this9.checkScanDisabled(mode.paymentType),
+                          , disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
                           onClick: function onClick(e) {
-                            return _this9.onHotKeyClick2(index, mode, paymode, e);
+                            return _this8.onHotKeyClick2(index, mode, paymode, e);
                           },
                           onBlur: function onBlur(e) {
-                            return _this9.onBlur(index, e);
+                            return _this8.onBlur(index, e);
                           },
                           onFocus: function onFocus(e) {
-                            return _this9.onFocusHack(index, mode, paymode, e);
+                            return _this8.onFocusHack(index, mode, paymode, e);
                           },
                           onChange: function onChange(e) {
-                            return _this9.handleChange(index, e);
+                            return _this8.handleChange(index, e);
                           }
                         })
                       )
@@ -4947,79 +4902,79 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u624B\u673A\u53F7/\u50A8\u503C\u5361\u53F7',
                   className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
-                    return _this9.onCzkChange(e.target.value);
+                    return _this8.onCzkChange(e.target.value);
                   },
                   defaultValue: currentMode && currentMode.storageCardNo,
                   value: czkValue,
                   ref: function ref(input) {
-                    return _this9.czkInput = input;
+                    return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref33 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
+                    var _ref32 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
                       var time, _paymode;
 
-                      return _regenerator2.default.wrap(function _callee17$(_context17) {
+                      return _regenerator2.default.wrap(function _callee16$(_context16) {
                         while (1) {
-                          switch (_context17.prev = _context17.next) {
+                          switch (_context16.prev = _context16.next) {
                             case 0:
                               if (!(e.keyCode == 13)) {
-                                _context17.next = 14;
+                                _context16.next = 14;
                                 break;
                               }
 
                               time = Date.parse(new Date());
 
-                              if (!(_this9.isStorageCardInputType && time - _this9.keypressStime > 350)) {
-                                _context17.next = 7;
+                              if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
+                                _context16.next = 7;
                                 break;
                               }
 
                               _message2.default.warn('储值卡不可键盘录入，请刷卡!');
-                              _this9.keypressStime = null;
-                              _this9.setState({
+                              _this8.keypressStime = null;
+                              _this8.setState({
                                 czkValue: null
                               });
-                              return _context17.abrupt('return');
+                              return _context16.abrupt('return');
 
                             case 7:
-                              _this9.keypressStime = null;
-                              _context17.next = 10;
-                              return _this9.loadCzk(e.target.value);
+                              _this8.keypressStime = null;
+                              _context16.next = 10;
+                              return _this8.loadCzk(e.target.value);
 
                             case 10:
-                              _paymode = _this9.store.paymode;
+                              _paymode = _this8.store.paymode;
 
                               if (!_paymode.currentMode.storageCardNo) {
-                                _this9.setState({
+                                _this8.setState({
                                   czkvalue: null
                                 });
                               }
-                              _context17.next = 15;
+                              _context16.next = 15;
                               break;
 
                             case 14:
-                              if (!_this9.keypressStime && e.keyCode !== 8) {
-                                _this9.keypressStime = Date.parse(new Date());
+                              if (!_this8.keypressStime && e.keyCode !== 8) {
+                                _this8.keypressStime = Date.parse(new Date());
                               }
 
                             case 15:
                             case 'end':
-                              return _context17.stop();
+                              return _context16.stop();
                           }
                         }
-                      }, _callee17, _this9);
+                      }, _callee16, _this8);
                     }));
 
-                    return function (_x12) {
-                      return _ref33.apply(this, arguments);
+                    return function (_x11) {
+                      return _ref32.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
-                    _this9.inputTarget = _this9.czkInput.input;
-                    !_this9.state.prototypeVisible && _keyboard2.default.open(function (v) {
-                      var value = _keyboard2.default.getNewValue(_this9.inputTarget, _this9.inputTarget.value, v);
-                      _this9.onCzkChange(value);
-                    }, _this9.czkKeyboardOnOk, _this9.czkKeyboardOnClose)();
+                    _this8.inputTarget = _this8.czkInput.input;
+                    !_this8.state.prototypeVisible && _keyboard2.default.open(function (v) {
+                      var value = _keyboard2.default.getNewValue(_this8.inputTarget, _this8.inputTarget.value, v);
+                      _this8.onCzkChange(value);
+                    }, _this8.czkKeyboardOnOk, _this8.czkKeyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
@@ -5031,7 +4986,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               /* 扫描组件 */
               this.isHorizontalPad && _react2.default.createElement(_scan2.default, { ref: function ref(scan) {
-                  return _this9.scanObj = scan;
+                  return _this8.scanObj = scan;
                 }, onChange: this.onScanCzkResult })
             ),
             _react2.default.createElement(
@@ -5065,22 +5020,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   className: _index.hotKey.hotKeyNotFilter('input'),
                   value: storageValue,
                   onChange: function onChange(event) {
-                    _this9.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
+                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
-                  ref: function ref(_ref34) {
-                    return _this9["inputCzkAmount"] = _ref34;
+                  ref: function ref(_ref33) {
+                    return _this8["inputCzkAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
-                    _this9.inputkey = "inputCzkAmount";
+                    _this8.inputkey = "inputCzkAmount";
                     _keyboard2.default.open(function (v) {
-                      var value = _keyboard2.default.getNewValue(_this9[_this9.inputkey].input, _this9[_this9.inputkey].input.value, v);
-                      _this9.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.balance));
-                    }, _this9.keyboardOnOk, _this9.keyboardOnClose)();
+                      var value = _keyboard2.default.getNewValue(_this8[_this8.inputkey].input, _this8[_this8.inputkey].input.value, v);
+                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.balance));
+                    }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
-                    _this9.setCurrentModeValue((0, _utils.getFixedNumber)(_this9.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.balance));
+                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.balance));
                   }
                 })
               )
@@ -5207,16 +5162,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   maxLength: 6,
                   value: newPass,
                   ref: function ref(input) {
-                    return _this9.inputNewAmount = input;
+                    return _this8.inputNewAmount = input;
                   },
                   onChange: function onChange(value) {
-                    return _this9.setPwdValue('newPass', value.target.value);
+                    return _this8.setPwdValue('newPass', value.target.value);
                   },
                   onBlur: function onBlur(value) {
-                    return _this9.handleBlur('newPass');
+                    return _this8.handleBlur('newPass');
                   },
                   onPressEnter: function onPressEnter() {
-                    return _this9.onPressEnterCzk('newPass');
+                    return _this8.onPressEnterCzk('newPass');
                   }
                 })
               )
@@ -5239,16 +5194,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   maxLength: 6,
                   value: newPassConfirm,
                   ref: function ref(input) {
-                    return _this9.inputConfirmAmount = input;
+                    return _this8.inputConfirmAmount = input;
                   },
                   onChange: function onChange(value) {
-                    return _this9.setPwdValue('newPassConfirm', value.target.value);
+                    return _this8.setPwdValue('newPassConfirm', value.target.value);
                   },
                   onBlur: function onBlur(value) {
-                    return _this9.handleBlur('newPassConfirm');
+                    return _this8.handleBlur('newPassConfirm');
                   },
                   onPressEnter: function onPressEnter() {
-                    return _this9.onPressEnterCzk('newPassConfirm');
+                    return _this8.onPressEnterCzk('newPassConfirm');
                   }
                 })
               )
@@ -5308,22 +5263,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     // onChange={this.onDjqChange}
                     // value={currentMode && currentMode.member.cardNo}
                     , ref: function ref(input) {
-                      return _this9.inputdjq = input;
+                      return _this8.inputdjq = input;
                     },
                     onKeyDown: function onKeyDown(e) {
                       if (e.keyCode == 13) {
-                        _this9.addDjq(e.target.value);
+                        _this8.addDjq(e.target.value);
                       }
                     },
                     onFocus: function onFocus(e) {
-                      _this9.inputTarget = _this9.inputdjq.input;
+                      _this8.inputTarget = _this8.inputdjq.input;
                       _keyboard2.default.open(function (v) {
-                        var value = _keyboard2.default.getNewValue(_this9.inputTarget, _this9.inputTarget.value, v);
-                        _this9.onDjqChange(value, true);
-                      }, _this9.djqKeyboardOnOk, _this9.djqKeyboardOnClose)();
+                        var value = _keyboard2.default.getNewValue(_this8.inputTarget, _this8.inputTarget.value, v);
+                        _this8.onDjqChange(value, true);
+                      }, _this8.djqKeyboardOnOk, _this8.djqKeyboardOnClose)();
                     },
                     onBlur: function onBlur(e) {
-                      _keyboard2.default.close();_this9.inputdjq.input.value = '';
+                      _keyboard2.default.close();_this8.inputdjq.input.value = '';
                     }
                   })
                 ),
@@ -5357,7 +5312,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 { className: 'col3' },
                 _react2.default.createElement(_ticon2.default, { type: 'saomiao1', className: 'icon', onClick: this.changeScanProduct }),
                 _react2.default.createElement(_scan2.default, { ref: function ref(scan) {
-                    return _this9.scanObj = scan;
+                    return _this8.scanObj = scan;
                   }, onChange: this.onScanDjqResult })
               )
             ),
@@ -5368,10 +5323,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 'div',
                 { className: 'djq2' },
                 currentMode && currentMode.djqs && currentMode.djqs.length > 0 ? (0, _map3.default)(currentMode.djqs || [], function (q, index) {
-                  if (!_this9.state.couponLight && !q.count) {
+                  if (!_this8.state.couponLight && !q.count) {
                     return;
                   }
-                  if (_this9.state.couponLight && q.count && q.count === 1) {
+                  if (_this8.state.couponLight && q.count && q.count === 1) {
                     return;
                   }
                   return _react2.default.createElement(
@@ -5386,7 +5341,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          q.amount
+                          q.nominalAmount
                         ),
                         _react2.default.createElement(
                           'span',
@@ -5425,7 +5380,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)('djqRight', { 'djqRightSelected': q.checked }), onClick: function onClick(e) {
-                          return q.IsEnable ? _this9.djqChecked(q, _this9.props.dto) : null;
+                          return q.IsEnable ? _this8.djqChecked(q, _this8.props.dto) : null;
                         } },
                       q.checked ? _react2.default.createElement(_ticon2.default, { className: 'checkIcon primary-color', type: 'xuanzhong1' }) : _react2.default.createElement('span', { className: '' + (q.IsEnable ? 'noxuanzhong' : 'noxuanzhong1') }),
                       q.checked ? _react2.default.createElement(
@@ -5732,22 +5687,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   type: 'text',
                   value: storageValue,
                   onChange: function onChange(e) {
-                    _this9.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
+                    _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref35) {
-                    return _this9["inputJfdxAmount"] = _ref35;
+                  ref: function ref(_ref34) {
+                    return _this8["inputJfdxAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
-                    _this9.inputkey = "inputJfdxAmount";
+                    _this8.inputkey = "inputJfdxAmount";
                     _keyboard2.default.open(function (v) {
-                      var value = _keyboard2.default.getNewValue(_this9[_this9.inputkey].input, _this9[_this9.inputkey].input.value, v);
-                      _this9.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
-                    }, _this9.keyboardOnOk, _this9.keyboardOnClose)();
+                      var value = _keyboard2.default.getNewValue(_this8[_this8.inputkey].input, _this8[_this8.inputkey].input.value, v);
+                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
+                    }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
-                    _this9.setCurrentModeValue((0, _utils.getFixedNumber)(_this9.inputJfdxAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.exchangable));
+                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputJfdxAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   }
                 })
               )