tplus-components-touch 3.43.1 → 3.45.1

package/dist/components/settlement/settlement.js

@@ -227,6 +227,7 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
 var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
   (0, _inherits3.default)(Settlement, _React$Component);
 
+  // 复核结算方式快捷键列表
   function Settlement(props) {
     var _this3 = this;
 
@@ -269,16 +270,31 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       czkValue: null,
       isInputMember: false,
       selectedRowIndex: 0,
-      isNotAutoFocus: true
-      // 复核结算方式快捷键列表
-    };
+      isNotAutoFocus: true };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
     _this2.hotkeydebounced = null;
     _this2.hotkeydebouncedPayMode = "";
+    _this2.voucherRunningFast = false;
     _this2.currentInput = null;
 
+    _this2.getIsReturn = function () {
+      var dataModal = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data;
+      return dataModal.IdbusiType === 35 || dataModal.IdbusiType === 40; //40预售退货类型。
+    };
+
+    _this2.getBoriginReturn = function () {
+      var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+      return boriginReturn || false;
+    };
+
+    _this2.getNotBoriginReturn = function () {
+      var isReturn = _this2.getIsReturn();
+      var boriginReturn = _this2.getBoriginReturn();
+      return isReturn && !boriginReturn;
+    };
+
     _this2.resizeSettlementToolBtns = function () {
       var newStyle = _this2.store.newStyle;
       var isMemberStorePage = _this2.props.isMemberStorePage;
@@ -413,14 +429,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.handleGuestShow(amount < 0 ? 2 : 3, amount);
       setTimeout(function () {
         _this2.handleDefault();
-        //  // 单据模式 临时性获取第一个结算方式焦点
-        // // document.querySelector('.modeItem:nth-child(1) .content input').focus()
         var _this2$store = _this2.store,
             paymode = _this2$store.paymode,
             brefund = _this2$store.brefund,
             newStyle = _this2$store.newStyle;
 
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -632,36 +646,37 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.showCzkModal = function () {
       var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append) {
-        var _enumController$getEn2, PayStyle, _ref2, isInputMember, memberdata1;
+        var _ref2, isInputMember, _enumController$getEn2, PayStyle, ctMode, memberId, returnType, memberdata1;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this2.connectRfCard();
+                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
+                ctMode = _this2.store && _this2.store.paymode && _this2.store.paymode.currentMode;
+                memberId = ctMode && ctMode.memberId;
+                returnType = _this2.getNotBoriginReturn();
 
+                _this2.connectRfCard();
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
-                _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
+                _context.t0 = isInputMember && memberId;
 
                 if (!_context.t0) {
-                  _context.next = 9;
+                  _context.next = 12;
                   break;
                 }
 
-                _context.next = 8;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+                _context.next = 11;
+                return _this2.store.updateCurrentMode(memberId, returnType);
 
-              case 8:
+              case 11:
                 _context.t0 = _context.sent;
 
-              case 9:
+              case 12:
                 memberdata1 = _context.t0;
 
-                _this2.setState({
-                  czkVisible: true
-                });
+                _this2.setState({ czkVisible: true });
                 if (memberdata1 && memberdata1.length === 1) {
                   _this2.handleCzkMoreData(true);
                   _this2.store.handleCzkData(memberdata1[0]);
@@ -677,7 +692,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }, 300);
                 }
 
-              case 12:
+              case 15:
               case 'end':
                 return _context.stop();
             }
@@ -721,7 +736,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleCzkData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      var _enumController$getEn3, PayStyle;
+      var _enumController$getEn3, PayStyle, returnType;
 
       return _regenerator2.default.wrap(function _callee2$(_context2) {
         while (1) {
@@ -733,43 +748,44 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 5;
+                _context2.next = 6;
                 break;
               }
 
-              _context2.next = 5;
-              return _this2.store.loadCzk(_this2.czkInput.input.value);
+              returnType = _this2.getNotBoriginReturn();
+              _context2.next = 6;
+              return _this2.store.loadCzk(_this2.czkInput.input.value, returnType);
 
-            case 5:
+            case 6:
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
 
               _message2.default.error("请录入储值卡！");
               return _context2.abrupt('return');
 
-            case 8:
+            case 9:
               if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
               })) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
 
               _message2.default.error("该储值卡已使用。");
               return _context2.abrupt('return');
 
-            case 11:
+            case 12:
               if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                _context2.next = 14;
+                _context2.next = 15;
                 break;
               }
 
               _message2.default.error("实收金额应等于应收金额。");
               return _context2.abrupt('return');
 
-            case 14:
+            case 15:
 
               _this2.setState({
                 czkVisible: false,
@@ -780,7 +796,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _this2.store.paymode.calcMemberBalance();
               _this2.handleCzk();
 
-            case 18:
+            case 19:
             case 'end':
               return _context2.stop();
           }
@@ -1008,11 +1024,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 200);
 
       // TODO: 测试优惠券支付
-
-      var _ref10 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref10.isNewRetailBCPos;
-
-      if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
+      if (!_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
       }
     };
@@ -1094,8 +1106,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref11 = paymode || {},
-          paymodes = _ref11.paymodes;
+      var _ref10 = paymode || {},
+          paymodes = _ref10.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1354,10 +1366,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.setCurrentModeValue = function (val, max) {
+      var returnType = _this2.getNotBoriginReturn();
+
       var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn13.PayStyle;
 
-      var reg = /^[\d.]+$/g;
+      var reg = returnType ? /^[\d.-]+$/g : /^[\d.]+$/g;
       if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk || _this2.store.paymode.currentMode.paymentType === PayStyle.jfdx) {
         if (!val) {
           _this2.setState({
@@ -1446,15 +1460,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
         return;
       }
-
-      var _ref12 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref12.isNewRetailBCPos;
-
-      if (isNewRetailBCPos) {
-        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
-      } else {
-        _this2.store.paymode.calcDjqValue(q);
-      }
+      _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
     };
@@ -1484,15 +1490,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
       _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-        var memberdata1;
+        var returnType, memberdata1;
         return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _context5.next = 2;
-                return _this2.store.loadCzk(v);
+                returnType = _this2.getNotBoriginReturn();
+                _context5.next = 3;
+                return _this2.store.loadCzk(v, returnType);
 
-              case 2:
+              case 3:
                 memberdata1 = _context5.sent;
 
                 if (memberdata1 && memberdata1.length === 1) {
@@ -1509,7 +1516,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   });
                 }
 
-              case 4:
+              case 5:
               case 'end':
                 return _context5.stop();
             }
@@ -1615,8 +1622,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.hotkeydebounced = null;
       }
       _this2.hotkeydebounced = (0, _debounce3.default)(function () {
-        // let { type, amount, totalVariety, totalQuantity, isReturn, quantityDetail,memberDisabled } = this.props
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -1625,7 +1631,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         if (!notsettle && !_this2.checkSettleDisabled(paymode, thePaymodes)) {
           _this2.handleSettle();
         } else if ((thePaymodes || []).length > 0) {
-
           // 根据currentIndex  = paymethodeId 获取当前支付方式位置
           var payIndex = -1;
           thePaymodes.forEach(function (paymodes, index) {
@@ -1817,7 +1822,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, _this2$store6, getSettleGift, isFull, type, resp1;
+      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, isFull, resp1;
 
       return _regenerator2.default.wrap(function _callee8$(_context8) {
         while (1) {
@@ -1877,31 +1882,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
               };
 
-              _this2$store6 = _this2.store, getSettleGift = _this2$store6.getSettleGift, isFull = _this2$store6.isFull;
-              type = _this2.props.type;
-              resp1 = false;
-
-              if (!(type !== 1)) {
-                _context8.next = 20;
-                break;
-              }
-
-              _context8.prev = 11;
-              _context8.next = 14;
-              return getSettleGift();
+              isFull = _this2.store.isFull;
+              _context8.next = 10;
+              return _this2.settleGiftOpenedInRunningFast();
 
-            case 14:
+            case 10:
               resp1 = _context8.sent;
-              _context8.next = 20;
-              break;
-
-            case 17:
-              _context8.prev = 17;
-              _context8.t0 = _context8['catch'](11);
-
-              console.log("获取支付礼包getSettleGift失败");
 
-            case 20:
 
               setTimeout(function () {
                 if (window.__loadingModal) {
@@ -1935,25 +1922,80 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.cancelState();
               }, 0);
 
-            case 21:
+            case 12:
             case 'end':
               return _context8.stop();
           }
         }
-      }, _callee8, _this3, [[11, 17]]);
+      }, _callee8, _this3);
+    }));
+    _this2.settleGiftOpenedInRunningFast = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
+      var resp, isCheckGift, vocherPayGift, getSettleGift, type;
+      return _regenerator2.default.wrap(function _callee9$(_context9) {
+        while (1) {
+          switch (_context9.prev = _context9.next) {
+            case 0:
+              resp = false;
+              isCheckGift = true;
+
+              if (_this2.voucherRunningFast) {
+                vocherPayGift = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherPayGift');
+
+                if (!vocherPayGift || vocherPayGift == 'false') {
+                  isCheckGift = false;
+                }
+              }
+
+              if (!isCheckGift) {
+                _context9.next = 16;
+                break;
+              }
+
+              getSettleGift = _this2.store.getSettleGift;
+              type = _this2.props.type;
+
+              if (!(type != 1)) {
+                _context9.next = 16;
+                break;
+              }
+
+              _context9.prev = 7;
+              _context9.next = 10;
+              return getSettleGift();
+
+            case 10:
+              resp = _context9.sent;
+              _context9.next = 16;
+              break;
+
+            case 13:
+              _context9.prev = 13;
+              _context9.t0 = _context9['catch'](7);
+
+              console.log("获取支付礼包getSettleGift失败");
+
+            case 16:
+              return _context9.abrupt('return', resp);
+
+            case 17:
+            case 'end':
+              return _context9.stop();
+          }
+        }
+      }, _callee9, _this3, [[7, 13]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref16 = dt || {},
-          guestshow_enable = _ref16.guestshow_enable,
-          guestshow_clear = _ref16.guestshow_clear,
-          guestshow_welcome = _ref16.guestshow_welcome,
-          guestshow_collect = _ref16.guestshow_collect,
-          guestshow_refund = _ref16.guestshow_refund,
-          guestshow_change = _ref16.guestshow_change;
+      var _ref15 = dt || {},
+          guestshow_enable = _ref15.guestshow_enable,
+          guestshow_clear = _ref15.guestshow_clear,
+          guestshow_welcome = _ref15.guestshow_welcome,
+          guestshow_collect = _ref15.guestshow_collect,
+          guestshow_refund = _ref15.guestshow_refund,
+          guestshow_change = _ref15.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1988,115 +2030,115 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(args) {
         var handleUserInputs = function () {
-          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee10$(_context10) {
+            return _regenerator2.default.wrap(function _callee11$(_context11) {
               while (1) {
-                switch (_context10.prev = _context10.next) {
+                switch (_context11.prev = _context11.next) {
                   case 0:
                     results = [];
-                    _context10.prev = 1;
+                    _context11.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context10.prev = 5;
+                    _context11.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context10.next = 16;
+                      _context11.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context10.next = 11;
+                    _context11.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context10.sent;
+                    _result = _context11.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context10.next = 7;
+                    _context11.next = 7;
                     break;
 
                   case 16:
-                    _context10.next = 22;
+                    _context11.next = 22;
                     break;
 
                   case 18:
-                    _context10.prev = 18;
-                    _context10.t0 = _context10['catch'](5);
+                    _context11.prev = 18;
+                    _context11.t0 = _context11['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context10.t0;
+                    _iteratorError = _context11.t0;
 
                   case 22:
-                    _context10.prev = 22;
-                    _context10.prev = 23;
+                    _context11.prev = 22;
+                    _context11.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context10.prev = 25;
+                    _context11.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context10.next = 28;
+                      _context11.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context10.finish(25);
+                    return _context11.finish(25);
 
                   case 29:
-                    return _context10.finish(22);
+                    return _context11.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context10.next = 33;
+                    _context11.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context10.next = 37;
+                    _context11.next = 37;
                     break;
 
                   case 35:
-                    _context10.prev = 35;
-                    _context10.t1 = _context10['catch'](1);
+                    _context11.prev = 35;
+                    _context11.t1 = _context11['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context10.stop();
+                    return _context11.stop();
                 }
               }
-            }, _callee10, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee11, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
           return function handleUserInputs(_x6) {
-            return _ref19.apply(this, arguments);
+            return _ref18.apply(this, arguments);
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        return _regenerator2.default.wrap(function _callee11$(_context11) {
+        return _regenerator2.default.wrap(function _callee12$(_context12) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context12.prev = _context12.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
                 });
                 console.log("settlement.handleSettle开始执行，参数：", +args);
                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
-                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
+                _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
                 isQuickPay = args === 'quickPay';
                 that = _this2;
                 status = false;
@@ -2111,7 +2153,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context11.next = 13;
+                  _context12.next = 13;
                   break;
                 }
 
@@ -2119,11 +2161,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context11.abrupt('return');
+                return _context12.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context11.next = 19;
+                  _context12.next = 19;
                   break;
                 }
 
@@ -2132,7 +2174,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context11.next = 19;
+                  _context12.next = 19;
                   break;
                 }
 
@@ -2140,7 +2182,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context11.abrupt('return');
+                return _context12.abrupt('return');
 
               case 19:
                 promises = [];
@@ -2149,14 +2191,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context11.next = 27;
+                  _context12.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context11.next = 27;
+                  _context12.next = 27;
                   break;
                 }
 
@@ -2164,7 +2206,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context11.abrupt('return');
+                return _context12.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2174,27 +2216,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                  var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
                     var result;
-                    return _regenerator2.default.wrap(function _callee9$(_context9) {
+                    return _regenerator2.default.wrap(function _callee10$(_context10) {
                       while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context10.prev = _context10.next) {
                           case 0:
-                            _context9.next = 2;
+                            _context10.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context9.sent;
+                            result = _context10.sent;
 
                             if (!(result === true)) {
-                              _context9.next = 8;
+                              _context10.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context9.next = 23;
+                            _context10.next = 23;
                             break;
 
                           case 8:
@@ -2211,24 +2253,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context9.next = 20;
+                              _context10.next = 20;
                               break;
                             }
 
-                            _context9.t0 = result.Code || result.code;
-                            _context9.next = _context9.t0 === 'RE_Settle_UnReturn' ? 14 : _context9.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context10.t0 = result.Code || result.code;
+                            _context10.next = _context10.t0 === 'RE_Settle_UnReturn' ? 14 : _context10.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context9.abrupt('break', 20);
+                            return _context10.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context9.abrupt('break', 20);
+                            return _context10.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -2236,19 +2278,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context9.next = 23;
+                            _context10.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context9.stop();
+                            return _context10.stop();
                         }
                       }
-                    }, _callee9, _this3);
+                    }, _callee10, _this3);
                   }));
 
                   return function commit(_x5) {
-                    return _ref18.apply(this, arguments);
+                    return _ref17.apply(this, arguments);
                   };
                 }();
 
@@ -2256,102 +2298,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context11.stop();
+                return _context12.stop();
             }
           }
-        }, _callee11, _this3);
+        }, _callee12, _this3);
       }));
 
       return function (_x4) {
-        return _ref17.apply(this, arguments);
+        return _ref16.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
       var handleUserInputs = function () {
-        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          return _regenerator2.default.wrap(function _callee13$(_context13) {
+          return _regenerator2.default.wrap(function _callee14$(_context14) {
             while (1) {
-              switch (_context13.prev = _context13.next) {
+              switch (_context14.prev = _context14.next) {
                 case 0:
                   results = [];
-                  _context13.prev = 1;
+                  _context14.prev = 1;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context13.prev = 5;
+                  _context14.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context13.next = 16;
+                    _context14.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context13.next = 11;
+                  _context14.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context13.sent;
+                  _result2 = _context14.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = true;
-                  _context13.next = 7;
+                  _context14.next = 7;
                   break;
 
                 case 16:
-                  _context13.next = 22;
+                  _context14.next = 22;
                   break;
 
                 case 18:
-                  _context13.prev = 18;
-                  _context13.t0 = _context13['catch'](5);
+                  _context14.prev = 18;
+                  _context14.t0 = _context14['catch'](5);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context13.t0;
+                  _iteratorError2 = _context14.t0;
 
                 case 22:
-                  _context13.prev = 22;
-                  _context13.prev = 23;
+                  _context14.prev = 22;
+                  _context14.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context13.prev = 25;
+                  _context14.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context13.next = 28;
+                    _context14.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context13.finish(25);
+                  return _context14.finish(25);
 
                 case 29:
-                  return _context13.finish(22);
+                  return _context14.finish(22);
 
                 case 30:
-                  _context13.next = 32;
+                  _context14.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context13.next = 37;
+                  _context14.next = 37;
                   break;
 
                 case 34:
-                  _context13.prev = 34;
-                  _context13.t1 = _context13['catch'](1);
+                  _context14.prev = 34;
+                  _context14.t1 = _context14['catch'](1);
 
-                  if (_context13.t1 != "cancelpwd") {
-                    _message2.default.error(_context13.t1);
+                  if (_context14.t1 != "cancelpwd") {
+                    _message2.default.error(_context14.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2359,74 +2401,67 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context13.stop();
+                  return _context14.stop();
               }
             }
-          }, _callee13, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee14, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
         return function handleUserInputs(_x8) {
-          return _ref23.apply(this, arguments);
+          return _ref21.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
 
-      return _regenerator2.default.wrap(function _callee14$(_context14) {
+      return _regenerator2.default.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
-              if (isNewRetailBCPos) {
-                if (curmode.value > 0) {
-                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+              if (curmode.value > 0) {
+                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
-                  if (curmode.paymentType === PayStyle.hyczk) {
-                    if (curmode.cardTypeEnum === 'BALANCE_CARD') {
-                      !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
-                    } else {
-                      curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
-                    }
+                if (curmode.paymentType === PayStyle.hyczk) {
+                  if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                    !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                  } else {
+                    curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
                   }
                 }
-              } else {
-                if (curmode.member.needPwd && curmode.value > 0) {
-                  promises.push(that.inputPwd(curmode));
-                }
               }
 
               commit = function () {
-                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(values) {
                   var result;
-                  return _regenerator2.default.wrap(function _callee12$(_context12) {
+                  return _regenerator2.default.wrap(function _callee13$(_context13) {
                     while (1) {
-                      switch (_context12.prev = _context12.next) {
+                      switch (_context13.prev = _context13.next) {
                         case 0:
                           if (!(values.length > 0)) {
-                            _context12.next = 6;
+                            _context13.next = 6;
                             break;
                           }
 
-                          _context12.next = 3;
+                          _context13.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context12.t0 = _context12.sent;
-                          _context12.next = 7;
+                          _context13.t0 = _context13.sent;
+                          _context13.next = 7;
                           break;
 
                         case 6:
-                          _context12.t0 = "";
+                          _context13.t0 = "";
 
                         case 7:
-                          result = _context12.t0;
+                          result = _context13.t0;
 
                           if (!(result == "")) {
-                            _context12.next = 13;
+                            _context13.next = 13;
                             break;
                           }
 
@@ -2434,34 +2469,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           //返回
                           that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
                           _promise2.default.resolve();
-                          _context12.next = 15;
+                          _context13.next = 15;
                           break;
 
                         case 13:
-                          _context12.next = 15;
+                          _context13.next = 15;
                           return _promise2.default.reject(result);
 
                         case 15:
                         case 'end':
-                          return _context12.stop();
+                          return _context13.stop();
                       }
                     }
-                  }, _callee12, _this3);
+                  }, _callee13, _this3);
                 }));
 
                 return function commit(_x7) {
-                  return _ref22.apply(this, arguments);
+                  return _ref20.apply(this, arguments);
                 };
               }();
 
               handleUserInputs(promises);
 
-            case 7:
+            case 6:
             case 'end':
-              return _context14.stop();
+              return _context15.stop();
           }
         }
-      }, _callee14, _this3);
+      }, _callee15, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2501,15 +2536,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(paymode) {
         var that, confirmPwd;
-        return _regenerator2.default.wrap(function _callee15$(_context15) {
+        return _regenerator2.default.wrap(function _callee16$(_context16) {
           while (1) {
-            switch (_context15.prev = _context15.next) {
+            switch (_context16.prev = _context16.next) {
               case 0:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context15.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context16.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2517,8 +2552,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref25 = that.state || {},
-                          confirmPwd = _ref25.confirmPwd;
+                      var _ref23 = that.state || {},
+                          confirmPwd = _ref23.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2609,8 +2644,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 _ref26 = that.state || {},
-                                    confirmPwd = _ref26.confirmPwd;
+                                var _ref24 = that.state || {},
+                                    confirmPwd = _ref24.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2644,24 +2679,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 3:
               case 'end':
-                return _context15.stop();
+                return _context16.stop();
             }
           }
-        }, _callee15, _this3);
+        }, _callee16, _this3);
       }));
 
       return function (_x9) {
-        return _ref24.apply(this, arguments);
+        return _ref22.apply(this, arguments);
       };
     }();
 
     _this2.btnDebounced = function () {
-      var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
-        var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
+      var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(type, bquick) {
+        var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, productStore, checkResult, _enumController$getEn23, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
 
-        return _regenerator2.default.wrap(function _callee16$(_context16) {
+        return _regenerator2.default.wrap(function _callee17$(_context17) {
           while (1) {
-            switch (_context16.prev = _context16.next) {
+            switch (_context17.prev = _context17.next) {
               case 0:
                 IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
                 CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
@@ -2670,7 +2705,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context16.next = 14;
+                  _context17.next = 14;
                   break;
                 }
 
@@ -2681,11 +2716,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(isEnableSerialNumber && resultObj && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE'))) {
-                  _context16.next = 9;
+                  _context17.next = 9;
                   break;
                 }
 
-                return _context16.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送'));
+                return _context17.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送'));
 
               case 9:
 
@@ -2694,31 +2729,49 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
 
                 if (!(!CustomerPhone && !_this2.context.viewModel.data.Member.Mobilephone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context16.next = 14;
+                  _context17.next = 14;
                   break;
                 }
 
                 title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
-                _context16.next = 14;
+                _context17.next = 14;
                 return _this2.props.openBuyerModal(title);
 
               case 14:
 
+                // 极速模式错误校验
+
+                productStore = _mutantsMicrofx.stores.productStore;
+                _context17.next = 17;
+                return productStore.checkShouldSettlement();
+
+              case 17:
+                checkResult = _context17.sent;
+
+                if (checkResult) {
+                  _context17.next = 20;
+                  break;
+                }
+
+                return _context17.abrupt('return', false);
+
+              case 20:
+
                 _this2.setState({
                   bquick: bquick,
                   isInputMember: true
                 });
                 _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
-                _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
+                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
 
                 if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
-                  _context16.next = 19;
+                  _context17.next = 25;
                   break;
                 }
 
-                return _context16.abrupt('return', false);
+                return _context17.abrupt('return', false);
 
-              case 19:
+              case 25:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2731,13 +2784,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context16.next = 24;
+                  _context17.next = 30;
                   break;
                 }
 
-                return _context16.abrupt('return');
+                return _context17.abrupt('return');
 
-              case 24:
+              case 30:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2754,23 +2807,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 27:
+              case 33:
               case 'end':
-                return _context16.stop();
+                return _context17.stop();
             }
           }
-        }, _callee16, _this3);
+        }, _callee17, _this3);
       }));
 
       return function (_x10, _x11) {
-        return _ref27.apply(this, arguments);
+        return _ref25.apply(this, arguments);
       };
     }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref28 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref28.isNewRetailBCPos;
+      var _ref26 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref26.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2808,7 +2861,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.debounced) {
         _this2.debounced.cancel();
         _this2.debounced = null;
-        // console.log("debounce canceled");
       }
       if (!isKeyBorad) {
         _this2.debounced = (0, _debounce3.default)(function () {
@@ -2984,7 +3036,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           keyboard: false,
           closable: false,
           backdropStyle: {
-            'z-index': '1004'
+            'zIndex': '1004'
           },
           width: 440,
           content: _react2.default.createElement(
@@ -3201,9 +3253,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCurrentModeHaveMutex = function (type) {
-      var _this2$store9 = _this2.store,
-          paymode = _this2$store9.paymode,
-          newStyle = _this2$store9.newStyle;
+      var _this2$store8 = _this2.store,
+          paymode = _this2$store8.paymode,
+          newStyle = _this2$store8.newStyle;
 
       var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn28.PayStyle;
@@ -3379,12 +3431,12 @@ 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,
-        PreSellOrBook = _ref29.PreSellOrBook,
-        PercentageWhenBook = _ref29.PercentageWhenBook;
+    var _ref27 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref27.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref27.ICCardServer,
+        ICCardPassword = _ref27.ICCardPassword,
+        PreSellOrBook = _ref27.PreSellOrBook,
+        PercentageWhenBook = _ref27.PercentageWhenBook;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
@@ -3393,9 +3445,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref30 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref30.isHorizontalPad,
-        isHorizontalSunMi = _ref30.isHorizontalSunMi;
+    var _ref28 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref28.isHorizontalPad,
+        isHorizontalSunMi = _ref28.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3404,6 +3456,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.setTimer = null;
     _this2.keypressStime = null;
     _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
+    _this2.voucherRunningFast = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherRunningFast') == '1';
     return _this2;
   }
 
@@ -3432,6 +3485,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     }
 
+    //是否退货
+
+
+    //原单退货状态
+
+
+    //非原单退货状态
+
+
     //对结算按钮超出的处理
 
   }, {
@@ -3534,15 +3596,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
      * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
+    // 极速模式下是否开启了支付有礼功能
+
     // 处理客显显示功能
 
+
     //that[`inputS${paymode.paymethodId}`]
 
   }, {
     key: 'isNoProductTip',
     value: function isNoProductTip(nonProductMap) {
-      var _ref31 = this.context.viewModel.data || {},
-          RetailDetails = _ref31.RetailDetails;
+      var _ref29 = this.context.viewModel.data || {},
+          RetailDetails = _ref29.RetailDetails;
 
       var temphtml = [];
       if ((0, _keys2.default)(nonProductMap).length > 0) {
@@ -3729,10 +3794,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           newPassConfirm = _state2.newPassConfirm,
           newPass = _state2.newPass,
           isNotAutoFocus = _state2.isNotAutoFocus;
-
-      var _ref32 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref32.isNewRetailBCPos;
-
       var _store2 = this.store,
           paymode = _store2.paymode,
           brefund = _store2.brefund,
@@ -3748,7 +3809,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           noIsMinAmount = _props.noIsMinAmount;
       // 原单退货
 
-      var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
+      var boriginReturn = this.getBoriginReturn();
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
 
       //收订金
@@ -3817,11 +3878,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref33 = quantityDetail || {},
-          _ref33$buyQuantity = _ref33.buyQuantity,
-          buyQuantity = _ref33$buyQuantity === undefined ? 0 : _ref33$buyQuantity,
-          _ref33$returnQuantity = _ref33.returnQuantity,
-          returnQuantity = _ref33$returnQuantity === undefined ? 0 : _ref33$returnQuantity;
+      var _ref30 = quantityDetail || {},
+          _ref30$buyQuantity = _ref30.buyQuantity,
+          buyQuantity = _ref30$buyQuantity === undefined ? 0 : _ref30$buyQuantity,
+          _ref30$returnQuantity = _ref30.returnQuantity,
+          returnQuantity = _ref30$returnQuantity === undefined ? 0 : _ref30$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4013,7 +4074,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             onClose: this.handleCancel,
             visible: this.state.visible,
             destroyOnClose: true,
-            className: 'settlement-wraper',
+            className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : null),
             style: { 'zIndex': 1006 }
           },
           _react2.default.createElement(
@@ -4284,7 +4345,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             onClose: this.handleCancel,
             visible: this.state.visible,
             destroyOnClose: true,
-            className: 'settlement-wraper',
+            className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : ''),
             style: { 'zIndex': 1006 }
           },
           _react2.default.createElement(
@@ -4594,7 +4655,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           {
-            wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
+            wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '400px',
             visible: this.state.czkVisible,
             maskClosable: false,
@@ -4706,22 +4767,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref34 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
+                    var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(e) {
                       var time, _paymode;
 
-                      return _regenerator2.default.wrap(function _callee17$(_context17) {
+                      return _regenerator2.default.wrap(function _callee18$(_context18) {
                         while (1) {
-                          switch (_context17.prev = _context17.next) {
+                          switch (_context18.prev = _context18.next) {
                             case 0:
                               if (!(e.keyCode == 13)) {
-                                _context17.next = 14;
+                                _context18.next = 14;
                                 break;
                               }
 
                               time = Date.parse(new Date());
 
                               if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
-                                _context17.next = 7;
+                                _context18.next = 7;
                                 break;
                               }
 
@@ -4730,11 +4791,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               _this8.setState({
                                 czkValue: null
                               });
-                              return _context17.abrupt('return');
+                              return _context18.abrupt('return');
 
                             case 7:
                               _this8.keypressStime = null;
-                              _context17.next = 10;
+                              _context18.next = 10;
                               return _this8.loadCzk(e.target.value);
 
                             case 10:
@@ -4745,7 +4806,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                   czkvalue: null
                                 });
                               }
-                              _context17.next = 15;
+                              _context18.next = 15;
                               break;
 
                             case 14:
@@ -4755,14 +4816,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                             case 15:
                             case 'end':
-                              return _context17.stop();
+                              return _context18.stop();
                           }
                         }
-                      }, _callee17, _this8);
+                      }, _callee18, _this8);
                     }));
 
                     return function (_x13) {
-                      return _ref34.apply(this, arguments);
+                      return _ref31.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4819,8 +4880,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _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(_ref35) {
-                    return _this8["inputCzkAmount"] = _ref35;
+                  ref: function ref(_ref32) {
+                    return _this8["inputCzkAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -4872,7 +4933,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           {
-            wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
+            wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '400px',
             visible: this.state.moreCzkVisible,
             maskClosable: false,
@@ -4914,7 +4975,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           (0, _defineProperty3.default)({
-            wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
+            wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
             width: '400px',
             visible: this.state.showSetPwdModal,
             backdropClosable: false,
@@ -5011,7 +5072,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           {
-            wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : ''),
+            wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '810px',
             visible: this.state.djqVisible,
             maskClosable: false,
@@ -5335,7 +5396,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           {
-            wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
+            wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '420px',
             visible: this.state.jfdxVisible,
             maskClosable: false,
@@ -5490,8 +5551,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _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(_ref36) {
-                    return _this8["inputJfdxAmount"] = _ref36;
+                  ref: function ref(_ref33) {
+                    return _this8["inputJfdxAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";