tplus-components-touch 3.23.1 → 3.23.5

package/dist/components/settlement/settlement.js

@@ -250,7 +250,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       discountRetailTotalAount: null,
       discountPrototypeTotalAmount: null,
       bquick: false,
-      currentKey: null };
+      currentKey: null,
+      couponLight: true,
+      storageValue: '0.00',
+      czkValue: null };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -276,7 +279,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           });
         }
         if (b.lastChild) {
-          if (bWidth < cWidth) {
+          // 原来bWidth < cWidth，过渡过程中右边按钮会隐藏，+20之后解决
+          if (bWidth < cWidth + 20) {
             b.lastChild.className = 'btns voucherMode';
           } else {
             b.lastChild.className = 'btns';
@@ -566,42 +570,51 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           duration: 4
         });
       } else {
-        if (isNewRetailBCPos) {
-          var isReturn = _this2.props.isReturn;
-
-          var sMember = _this2.store.member;
-          if (sMember && sMember.ID) {
-            // noPlaySetPwd 点击结算方式设置密码，点加号不设置
-            if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
-              _this2.setState({
-                newPass: '',
-                newPassConfirm: '',
-                showSetPwdModal: true
-              });
-            } else {
-              if (!sMember.StorageCardEnable) {
-                _message2.default.warn("该储值卡已停用");
-                return;
-              }
-              _this2.setState({
-                showSetPwdModal: false,
-                czkVisible: true
-              });
-            }
-          } else {
-            _message2.default.warn('请先录入会员');
-          }
-          // this.setState({
-          //   czkVisible: true,
-          // });
+        // if (isNewRetailBCPos) {
+        //   let { isReturn } = this.props;
+        //   let sMember = this.store.member;
+        //   if (!sMember.StorageCardEnable) {
+        //     Message.warn("该储值卡已停用");
+        //     return;
+        //   }
+        //   if (sMember && sMember.ID) {
+        //     // noPlaySetPwd 点击结算方式设置密码，点加号不设置
+        //     if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
+        //       this.setState({
+        //         newPass: '',
+        //         newPassConfirm: '',
+        //         showSetPwdModal: true
+        //       })
+        //     } else {
+        //       this.setState({
+        //         showSetPwdModal: false,
+        //         czkVisible: true
+        //       })
+        //     }
+        //   } 
+        //   // else {
+        //   //   Message.warn('请先录入会员');
+        //   // } 
+        //   // this.setState({
+        // //   czkVisible: true,
+        // // });
+        // } else {
+        //   this.setState({
+        //     czkVisible: true,
+        //   });
+        // }
+        _this2.setState({
+          czkVisible: true
+        });
+        if (currentMode.member.id) {
+          _this2.setState({
+            czkValue: currentMode.member.StorageCardNo
+          });
         } else {
           _this2.setState({
-            czkVisible: true
+            czkValue: null
           });
         }
-        // this.setState({
-        //   czkVisible: true,
-        // });
       }
       setTimeout(function () {
         if (!currentMode.member || !currentMode.member.id) {
@@ -618,7 +631,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.handleCzkOk = function () {
       var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
-        var sMember, _enumController$getEn3, PayStyle;
+        var _enumController$getEn3, PayStyle;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
@@ -632,66 +645,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //   });
                 //   return;
                 // }
-                sMember = _this2.store.member;
-
-                if (sMember.StorageCardEnable) {
-                  _context.next = 4;
-                  break;
-                }
-
-                _message2.default.warn("该储值卡已停用");
-                return _context.abrupt('return');
-
-              case 4:
                 _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
                 if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 8;
+                  _context.next = 4;
                   break;
                 }
 
-                _context.next = 8;
+                _context.next = 4;
                 return _this2.store.loadCzk(_this2.czkInput.input.value);
 
-              case 8:
+              case 4:
                 if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 11;
+                  _context.next = 7;
                   break;
                 }
 
                 _message2.default.error("请录入储值卡！");
                 return _context.abrupt('return');
 
-              case 11:
+              case 7:
                 if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
                   return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.member.id == _this2.store.paymode.currentMode.member.id;
                 })) {
-                  _context.next = 14;
+                  _context.next = 10;
                   break;
                 }
 
                 _message2.default.error("该储值卡已使用。");
                 return _context.abrupt('return');
 
-              case 14:
+              case 10:
                 if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                  _context.next = 17;
+                  _context.next = 13;
                   break;
                 }
 
                 _message2.default.error("实收金额应等于应收金额。");
                 return _context.abrupt('return');
 
-              case 17:
+              case 13:
 
                 _this2.setState({
-                  czkVisible: false
+                  czkVisible: false,
+                  storageValue: '0.00',
+                  czkvalue: null
                 });
                 _this2.closeRfCard();
                 _this2.store.paymode.calcMemberBalance();
                 _this2.handleCzk();
 
-              case 21:
+              case 17:
               case 'end':
                 return _context.stop();
             }
@@ -710,7 +714,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.store.clean();
       }
       _this2.setState({
-        czkVisible: false
+        czkVisible: false,
+        storageValue: '0.00',
+        czkvalue: null
       });
       _this2.closeRfCard();
       _keyboard2.default.close();
@@ -851,8 +857,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       _this2.store.setCurrentMode(id, PayStyle.djq);
       _this2.setState({
-        djqVisible: true
+        djqVisible: true,
+        couponLight: true
       });
+      _this2.store.paymode.calcCheckList();
       setTimeout(function () {
         _this2.inputdjq && _this2.inputdjq.input && _this2.inputdjq.input.focus();
       }, 200);
@@ -943,6 +951,31 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
+    _this2.checkOfflineEnable = function (paymode, key) {
+      var _ref8 = paymode || {},
+          paymodes = _ref8.paymodes;
+
+      var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
+
+      if (isOffline) {
+        if (paymodes) {
+          var currentPayMode = paymodes.find(function (item) {
+            return item.paymentType === key;
+          });
+          if (currentPayMode && !currentPayMode.offlineDisable) {
+            return true;
+          } else {
+            _message2.default.warn('\u79BB\u7EBF\u6A21\u5F0F\u4E0B\u4E0D\u652F\u6301\u6B64\u7ED3\u7B97\u65B9\u5F0F');
+            return false;
+          }
+        }
+        _message2.default.warn('\u79BB\u7EBF\u6A21\u5F0F\u4E0B\u7ED3\u7B97\u65B9\u5F0F\u6570\u636E\u9519\u8BEF');
+        return false;
+      } else {
+        return true;
+      }
+    };
+
     _this2.onTabsClick2 = function (paymode, brefund, themode, key) {
       var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn7.PayStyle,
@@ -1060,6 +1093,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
+
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
+
       if (_this2.checkModeDisabled(key, brefund, boriginReturn)) {
         return;
       }
@@ -1148,6 +1184,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleChange = function (index, e) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(_this2.store.paymode.currentFocus)) return;
       var currentInput = e.target;
       var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
       if (!isNaN(e.target.value) || e.target.value == '-') {
@@ -1158,6 +1195,40 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.setCurrentModeValue = function (val, max) {
+      var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn13.PayStyle;
+
+      var reg = /^[\d.]+$/g;
+      if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk) {
+        if (!val) {
+          _this2.setState({
+            storageValue: val
+          });
+        } else {
+          if (!reg.test(val)) {
+            return;
+          } else {
+            var value1 = val.split('.');
+            if (value1.length > 1) {
+              if (value1[1].length < 3) {
+                _this2.setState({
+                  storageValue: val
+                });
+              } else {
+                return;
+              }
+            } else {
+              if (val.length > 9) {
+                return;
+              } else {
+                _this2.setState({
+                  storageValue: val
+                });
+              }
+            }
+          }
+        }
+      }
       // let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
       var value = val;
       var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
@@ -1200,8 +1271,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.appendCzkmode = function (boriginReturn, params) {
-      var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn13.PayStyle;
+      var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn14.PayStyle;
 
       if (boriginReturn) {
         _message2.default.info('原单退货时不可以使用非原单的储值卡结算方式。');
@@ -1221,15 +1292,25 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.showCzkModal(-1, bappend, params);
     };
 
-    _this2.djqChecked = function (q) {
-      var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
-          Differentiate = _enumController$getEn14.Differentiate;
+    _this2.djqChecked = function (q, dto) {
+      var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+          Differentiate = _enumController$getEn15.Differentiate;
 
       if (_this2.store.paymode.currentMode.boriginReturn) {
         _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
         return;
       }
-      _this2.store.paymode.calcDjqValue(q);
+
+      var _ref9 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref9.isNewRetailBCPos;
+
+      if (isNewRetailBCPos) {
+        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+      } else {
+        _this2.store.paymode.calcDjqValue(q);
+      }
+      // 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);
     };
 
     _this2.addDjq = function () {
@@ -1242,8 +1323,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       //   return ;
       // }
       _this2.store.checkCoupon(v).then(function () {
-        _this2.inputdjq.input.value = '';
         _this2.inputdjq.input.focus();
+      }).finally(function () {
+        setTimeout(function () {
+          _this2.inputdjq.input.value = '';
+          var ele = document.getElementById('djqInput');
+          ele.value = '';
+        }, 100);
       });
     };
 
@@ -1251,9 +1337,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.czkdebounced) {
         return;
       }
-      _this2.czkdebounced = (0, _debounce3.default)(function () {
-        _this2.store.loadCzk(v);
-      }, 1000, {
+      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+        return _regenerator2.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return _this2.store.loadCzk(v);
+
+              case 2:
+                if (_this2.store.paymode.currentMode.StorageCardNo) {
+                  _this2.setState({
+                    czkValue: _this2.store.paymode.currentMode.StorageCardNo
+                  });
+                }
+
+              case 3:
+              case 'end':
+                return _context3.stop();
+            }
+          }
+        }, _callee3, _this3);
+      })), 1000, {
         'leading': true,
         'trailing': false
       });
@@ -1265,6 +1370,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
@@ -1288,8 +1394,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClickModal = function (mode, index, boriginReturn) {
-      var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn15.PayStyle;
+      var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn16.PayStyle;
 
       var brefund = _this2.store.brefund;
 
@@ -1304,6 +1410,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick2 = function (index, mode, paymode, e) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
@@ -1358,7 +1465,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           thePaymodes.forEach(function (paymodes, index) {
             if (paymodes.paymethodId == _this2.state.currentIndex) payIndex = index;
           });
-
           _this2.setFocusAndSelectionMode(thePaymodes, payIndex);
         }
       }, 500, {
@@ -1374,8 +1480,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.setFocusAndSelectionMode = function (thePaymodes, currentIndex) {
-      var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn16.PayStyle;
+      var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn17.PayStyle;
 
       var displayPayModeList = [].concat((0, _toConsumableArray3.default)(thePaymodes));
       // 复制支付方式列表
@@ -1398,13 +1504,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.findModlePayBySplice = function (thePaymodes, currenIndex, symbol) {
-      var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn17.PayStyle;
+      var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn18.PayStyle;
 
       var findIndex = currenIndex;
       var endCurrentMode = thePaymodes.find(function (mode, index) {
         findIndex++;
-        return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx;
+        return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx && _mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType, true);
       });
       if (endCurrentMode) return { mode: endCurrentMode, index: findIndex };
       return null;
@@ -1440,11 +1546,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
       var that;
-      return _regenerator2.default.wrap(function _callee4$(_context4) {
+      return _regenerator2.default.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               that = _this2;
 
@@ -1467,18 +1573,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 onOk: function onOk() {
                   var _this4 = this;
 
-                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                     var result;
-                    return _regenerator2.default.wrap(function _callee3$(_context3) {
+                    return _regenerator2.default.wrap(function _callee4$(_context4) {
                       while (1) {
-                        switch (_context3.prev = _context3.next) {
+                        switch (_context4.prev = _context4.next) {
                           case 0:
                             window.__queryingModal = (0, _utils.openQueryingModal)();
-                            _context3.next = 3;
+                            _context4.next = 3;
                             return that.store.querySettleResult();
 
                           case 3:
-                            result = _context3.sent;
+                            result = _context4.sent;
 
                             setTimeout(function () {
                               if (window.__queryingModal) {
@@ -1486,34 +1592,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 window.__queryingModal = null;
                               }
                             }, 0);
-                            _context3.t0 = result.Flag;
-                            _context3.next = _context3.t0 === "0" ? 8 : _context3.t0 === "1" ? 11 : _context3.t0 === "2" ? 13 : 15;
+                            _context4.t0 = result.Flag;
+                            _context4.next = _context4.t0 === "0" ? 8 : _context4.t0 === "1" ? 11 : _context4.t0 === "2" ? 13 : 15;
                             break;
 
                           case 8:
                             //成功
                             that.store.setDtoID(result.ID);
                             that.settleSuccess();
-                            return _context3.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 11:
                             //处理中
                             that.settleUnReturn();
                             // Message.info("结算正在处理中，请稍后再次查询。");
-                            return _context3.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 13:
                             //失败
                             _message2.default.info('\u7ED3\u7B97\u5931\u8D25\uFF0C\u539F\u56E0:' + result.Message + '\u3002');
                             // that.settleCanceled();
-                            return _context3.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 15:
                           case 'end':
-                            return _context3.stop();
+                            return _context4.stop();
                         }
                       }
-                    }, _callee3, _this4);
+                    }, _callee4, _this4);
                   }))();
                 },
                 onCancel: function onCancel() {
@@ -1523,10 +1629,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 2:
             case 'end':
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, _this3);
+      }, _callee5, _this3);
     }));
 
     _this2.settleCanceled = function () {
@@ -1535,15 +1641,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.cancelState();
     };
 
-    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-      var _enumController$getEn18, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
+    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+      var _enumController$getEn19, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
 
-      return _regenerator2.default.wrap(function _callee5$(_context5) {
+      return _regenerator2.default.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               //提示成功
-              _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn18.PayStyle;
+              _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn19.PayStyle;
               _this2$store$paymode = _this2.store.paymode, amount = _this2$store$paymode.amount, received = _this2$store$paymode.received, thePaymodes = _this2$store$paymode.thePaymodes;
               IdbusiType = _this2.store.dto.IdbusiType;
               charge = _this2.store.paymode.charge;
@@ -1582,6 +1688,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   //副屏-第二屏幕
                   if (_this.isHorizontalSunMi) {
                     window.sunMi_PresentationManager.sendMessageToSecondScreen(params);
+                    setTimeout(function () {
+                      window.sunMi_PresentationManager.sendMessageToSecondScreen({ step: 1 });
+                    }, 3000);
                   } else {
                     _mutantsMicrofx.nativeMs && _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReplyScreen', params);
                   }
@@ -1598,22 +1707,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               resp1 = false;
 
               if (!(type !== 1)) {
-                _context5.next = 20;
+                _context6.next = 20;
                 break;
               }
 
-              _context5.prev = 11;
-              _context5.next = 14;
+              _context6.prev = 11;
+              _context6.next = 14;
               return getSettleGift();
 
             case 14:
-              resp1 = _context5.sent;
-              _context5.next = 20;
+              resp1 = _context6.sent;
+              _context6.next = 20;
               break;
 
             case 17:
-              _context5.prev = 17;
-              _context5.t0 = _context5['catch'](11);
+              _context6.prev = 17;
+              _context6.t0 = _context6['catch'](11);
 
               console.log("获取支付礼包getSettleGift失败");
 
@@ -1642,7 +1751,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 } else if (MemberPoints && Number(amount) == Number(0)) {
                   message = "兑换成功";
                 }
-                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, stores, function () {
+                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, function () {
                   _this.handleGuestShow(5);
                 });
                 _this2.setState({ isXianjin: false });
@@ -1651,23 +1760,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 21:
             case 'end':
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5, _this3, [[11, 17]]);
+      }, _callee6, _this3, [[11, 17]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref10 = dt || {},
-          guestshow_enable = _ref10.guestshow_enable,
-          guestshow_clear = _ref10.guestshow_clear,
-          guestshow_welcome = _ref10.guestshow_welcome,
-          guestshow_collect = _ref10.guestshow_collect,
-          guestshow_refund = _ref10.guestshow_refund,
-          guestshow_change = _ref10.guestshow_change;
+      var _ref13 = dt || {},
+          guestshow_enable = _ref13.guestshow_enable,
+          guestshow_clear = _ref13.guestshow_clear,
+          guestshow_welcome = _ref13.guestshow_welcome,
+          guestshow_collect = _ref13.guestshow_collect,
+          guestshow_refund = _ref13.guestshow_refund,
+          guestshow_change = _ref13.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1702,108 +1811,108 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(args) {
+      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(args) {
         var handleUserInputs = function () {
-          var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(promises) {
+          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee7$(_context7) {
+            return _regenerator2.default.wrap(function _callee8$(_context8) {
               while (1) {
-                switch (_context7.prev = _context7.next) {
+                switch (_context8.prev = _context8.next) {
                   case 0:
                     results = [];
-                    _context7.prev = 1;
+                    _context8.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context7.prev = 5;
+                    _context8.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context7.next = 16;
+                      _context8.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context7.next = 11;
+                    _context8.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context7.sent;
+                    _result = _context8.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context7.next = 7;
+                    _context8.next = 7;
                     break;
 
                   case 16:
-                    _context7.next = 22;
+                    _context8.next = 22;
                     break;
 
                   case 18:
-                    _context7.prev = 18;
-                    _context7.t0 = _context7['catch'](5);
+                    _context8.prev = 18;
+                    _context8.t0 = _context8['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context7.t0;
+                    _iteratorError = _context8.t0;
 
                   case 22:
-                    _context7.prev = 22;
-                    _context7.prev = 23;
+                    _context8.prev = 22;
+                    _context8.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context7.prev = 25;
+                    _context8.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context7.next = 28;
+                      _context8.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context7.finish(25);
+                    return _context8.finish(25);
 
                   case 29:
-                    return _context7.finish(22);
+                    return _context8.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context7.next = 33;
+                    _context8.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context7.next = 37;
+                    _context8.next = 37;
                     break;
 
                   case 35:
-                    _context7.prev = 35;
-                    _context7.t1 = _context7['catch'](1);
+                    _context8.prev = 35;
+                    _context8.t1 = _context8['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context7.stop();
+                    return _context8.stop();
                 }
               }
-            }, _callee7, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee8, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
           return function handleUserInputs(_x4) {
-            return _ref13.apply(this, arguments);
+            return _ref16.apply(this, arguments);
           };
         }();
 
-        var _enumController$getEn19, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn20, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        return _regenerator2.default.wrap(function _callee8$(_context8) {
+        return _regenerator2.default.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
@@ -1819,7 +1928,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 // }
                 //
                 // testAsync(p);
-                _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn19.PayStyle;
+                _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
                 _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;
@@ -1835,7 +1944,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context8.next = 13;
+                  _context9.next = 13;
                   break;
                 }
 
@@ -1843,11 +1952,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context8.abrupt('return');
+                return _context9.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context8.next = 19;
+                  _context9.next = 19;
                   break;
                 }
 
@@ -1856,7 +1965,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context8.next = 19;
+                  _context9.next = 19;
                   break;
                 }
 
@@ -1864,7 +1973,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context8.abrupt('return');
+                return _context9.abrupt('return');
 
               case 19:
                 promises = [];
@@ -1873,14 +1982,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context8.next = 27;
+                  _context9.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context8.next = 27;
+                  _context9.next = 27;
                   break;
                 }
 
@@ -1888,7 +1997,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context8.abrupt('return');
+                return _context9.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -1898,27 +2007,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(values) {
+                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(values) {
                     var result;
-                    return _regenerator2.default.wrap(function _callee6$(_context6) {
+                    return _regenerator2.default.wrap(function _callee7$(_context7) {
                       while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context7.prev = _context7.next) {
                           case 0:
-                            _context6.next = 2;
+                            _context7.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context6.sent;
+                            result = _context7.sent;
 
                             if (!(result === true)) {
-                              _context6.next = 8;
+                              _context7.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context6.next = 23;
+                            _context7.next = 23;
                             break;
 
                           case 8:
@@ -1935,24 +2044,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context6.next = 20;
+                              _context7.next = 20;
                               break;
                             }
 
-                            _context6.t0 = result.Code || result.code;
-                            _context6.next = _context6.t0 === 'RE_Settle_UnReturn' ? 14 : _context6.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context7.t0 = result.Code || result.code;
+                            _context7.next = _context7.t0 === 'RE_Settle_UnReturn' ? 14 : _context7.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context6.abrupt('break', 20);
+                            return _context7.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context6.abrupt('break', 20);
+                            return _context7.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -1960,19 +2069,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context6.next = 23;
+                            _context7.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context6.stop();
+                            return _context7.stop();
                         }
                       }
-                    }, _callee6, _this3);
+                    }, _callee7, _this3);
                   }));
 
                   return function commit(_x3) {
-                    return _ref12.apply(this, arguments);
+                    return _ref15.apply(this, arguments);
                   };
                 }();
 
@@ -1980,102 +2089,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context8.stop();
+                return _context9.stop();
             }
           }
-        }, _callee8, _this3);
+        }, _callee9, _this3);
       }));
 
       return function (_x2) {
-        return _ref11.apply(this, arguments);
+        return _ref14.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
       var handleUserInputs = function () {
-        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          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;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context10.prev = 5;
+                  _context11.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context10.next = 16;
+                    _context11.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context10.next = 11;
+                  _context11.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context10.sent;
+                  _result2 = _context11.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = 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);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context10.t0;
+                  _iteratorError2 = _context11.t0;
 
                 case 22:
-                  _context10.prev = 22;
-                  _context10.prev = 23;
+                  _context11.prev = 22;
+                  _context11.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context10.prev = 25;
+                  _context11.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context10.next = 28;
+                    _context11.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context10.finish(25);
+                  return _context11.finish(25);
 
                 case 29:
-                  return _context10.finish(22);
+                  return _context11.finish(22);
 
                 case 30:
-                  _context10.next = 32;
+                  _context11.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context10.next = 37;
+                  _context11.next = 37;
                   break;
 
                 case 34:
-                  _context10.prev = 34;
-                  _context10.t1 = _context10['catch'](1);
+                  _context11.prev = 34;
+                  _context11.t1 = _context11['catch'](1);
 
-                  if (_context10.t1 != "cancelpwd") {
-                    _message2.default.error(_context10.t1);
+                  if (_context11.t1 != "cancelpwd") {
+                    _message2.default.error(_context11.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2083,34 +2192,38 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context10.stop();
+                  return _context11.stop();
               }
             }
-          }, _callee10, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee11, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
         return function handleUserInputs(_x6) {
-          return _ref17.apply(this, arguments);
+          return _ref20.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref15, isNewRetailBCPos, _enumController$getEn20, PayStyle, commit;
+      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn21, PayStyle, isNeedPasswordForStoragePay, 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:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+              _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
-                  _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
+                  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    promises.push(that.inputPwd(curmode));
+                    isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
+
+                    if (isNeedPasswordForStoragePay) {
+                      promises.push(that.inputPwd(curmode));
+                    }
                   }
                 }
               } else {
@@ -2120,33 +2233,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                var _ref19 = (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:
                           if (!(values.length > 0)) {
-                            _context9.next = 6;
+                            _context10.next = 6;
                             break;
                           }
 
-                          _context9.next = 3;
+                          _context10.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context9.t0 = _context9.sent;
-                          _context9.next = 7;
+                          _context10.t0 = _context10.sent;
+                          _context10.next = 7;
                           break;
 
                         case 6:
-                          _context9.t0 = "";
+                          _context10.t0 = "";
 
                         case 7:
-                          result = _context9.t0;
+                          result = _context10.t0;
 
                           if (!(result == "")) {
-                            _context9.next = 13;
+                            _context10.next = 13;
                             break;
                           }
 
@@ -2154,23 +2267,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           //返回
                           that.setCurrentFocusAndAddPay(curmode.paymentType);
                           _promise2.default.resolve();
-                          _context9.next = 15;
+                          _context10.next = 15;
                           break;
 
                         case 13:
-                          _context9.next = 15;
+                          _context10.next = 15;
                           return _promise2.default.reject(result);
 
                         case 15:
                         case 'end':
-                          return _context9.stop();
+                          return _context10.stop();
                       }
                     }
-                  }, _callee9, _this3);
+                  }, _callee10, _this3);
                 }));
 
                 return function commit(_x5) {
-                  return _ref16.apply(this, arguments);
+                  return _ref19.apply(this, arguments);
                 };
               }();
 
@@ -2178,10 +2291,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 7:
             case 'end':
-              return _context11.stop();
+              return _context12.stop();
           }
         }
-      }, _callee11, _this3);
+      }, _callee12, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2221,15 +2334,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(paymode) {
+      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(paymode) {
         var that, confirmPwd;
-        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:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context12.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context13.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2237,8 +2350,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref19 = that.state || {},
-                          confirmPwd = _ref19.confirmPwd;
+                      var _ref22 = that.state || {},
+                          confirmPwd = _ref22.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2328,8 +2441,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 _ref20 = that.state || {},
-                                    confirmPwd = _ref20.confirmPwd;
+                                var _ref23 = that.state || {},
+                                    confirmPwd = _ref23.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2358,19 +2471,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   setTimeout(function () {
                     that['inputS' + paymode.paymethodId] && that['inputS' + paymode.paymethodId].input.focus();
                     that.inputAmount && that.inputAmount.input.focus();
-                  }, 200);
+                  }, 300);
                 }));
 
               case 3:
               case 'end':
-                return _context12.stop();
+                return _context13.stop();
             }
           }
-        }, _callee12, _this3);
+        }, _callee13, _this3);
       }));
 
       return function (_x7) {
-        return _ref18.apply(this, arguments);
+        return _ref21.apply(this, arguments);
       };
     }();
 
@@ -2379,8 +2492,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         bquick: bquick
       });
 
-      var _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn21.PayStyle;
+      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn22.PayStyle;
 
       var _this2$store7 = _this2.store,
           paymode = _this2$store7.paymode,
@@ -2388,6 +2501,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store7.boriginReturn,
           newStyle = _this2$store7.newStyle;
 
+
+      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+
       var status = false;
       paymode.thePaymodes.forEach(function (v) {
         if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
@@ -2420,12 +2536,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref21 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref21.isNewRetailBCPos;
+      var _ref24 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
       }
+      if (!/^[0-9]*$/.test(v)) {
+        return;
+      }
+      _this2.setState({
+        czkValue: v
+      });
       // if(this.debounced){
       //   this.debounced.cancel();
       //   this.debounced=null;
@@ -2476,8 +2598,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCharge = function () {
-      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn22.PayStyle;
+      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn23.PayStyle;
 
       var paymode = _this2.store.paymode;
 
@@ -2524,8 +2646,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinPayment = function (payType, value) {
-      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn23.PayStyle;
+      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn24.PayStyle;
 
       var isManualIntoAmount = _this2.state.isManualIntoAmount;
 
@@ -2533,8 +2655,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinBalance = function (payType, value) {
-      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn24.PayStyle;
+      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn25.PayStyle;
       //找零金额-存在权限控制
 
 
@@ -2554,9 +2676,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var isManualIntoAmount = void 0;
       // 付款弹窗
       return new _promise2.default(function (resolve, reject) {
-        var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
-            PayStyle = _enumController$getEn25.PayStyle,
-            PayIcon2 = _enumController$getEn25.PayIcon2;
+        var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn26.PayStyle,
+            PayIcon2 = _enumController$getEn26.PayIcon2;
 
         var modal = (0, _asyncModal2.default)({
           onPressEnter: function onPressEnter() {
@@ -2825,8 +2947,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           paymode = _this2$store8.paymode,
           newStyle = _this2$store8.newStyle;
 
-      var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn26.PayStyle;
+      var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn27.PayStyle;
 
       var payTypeList = [PayStyle.SQBPAY, PayStyle.CSYH, PayStyle.smzf];
       var payTypeFilterList = payTypeList.filter(function (filterType) {
@@ -2847,15 +2969,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkModeDisabled = function (type, brefund, boriginReturn) {
-      var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn27.PayStyle;
+      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn28.PayStyle;
 
       return (brefund && (type == PayStyle.wx || type == PayStyle.zfb || type == PayStyle.smzf || type == PayStyle.jfdx || type == PayStyle.djq || type == PayStyle.SQBPAY || type == PayStyle.CSYH) || boriginReturn && type == PayStyle.hyczk) && !(boriginReturn && (type == PayStyle.wx || type == PayStyle.zfb)) || _this2.checkCurrentModeHaveMutex(type);
     };
 
     _this2.checkSettleDisabled = function (paymode, thePaymodes) {
-      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn28.PayStyle;
+      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn29.PayStyle;
 
       console.log("settlement.checkSettleDisabled开始执行，参数：", { paymode: paymode, thePaymodes: thePaymodes });
       if (paymode.amount == 0 && paymode.received == 0) {
@@ -2901,8 +3023,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.editCzkModal = function () {
-      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn29.PayStyle;
+      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn30.PayStyle;
 
       (0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
         if (mode.paymentType == PayStyle.hyczk) {
@@ -2988,22 +3110,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
+    _this2.couponClick = function () {
+      _this2.setState({
+        couponLight: !_this2.state.couponLight
+      });
+    };
+
     _this2.hasElectron = hasElectron;
 
-    var _ref22 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref22$loginInfo = _ref22.loginInfo;
+    var _ref25 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref25$loginInfo = _ref25.loginInfo;
 
-    _ref22$loginInfo = _ref22$loginInfo === undefined ? {} : _ref22$loginInfo;
-    var ICCardServer = _ref22$loginInfo.ICCardServer,
-        ICCardPassword = _ref22$loginInfo.ICCardPassword;
+    _ref25$loginInfo = _ref25$loginInfo === undefined ? {} : _ref25$loginInfo;
+    var ICCardServer = _ref25$loginInfo.ICCardServer,
+        ICCardPassword = _ref25$loginInfo.ICCardPassword;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref23 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref23.isHorizontalPad,
-        isHorizontalSunMi = _ref23.isHorizontalSunMi;
+    var _ref26 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref26.isHorizontalPad,
+        isHorizontalSunMi = _ref26.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3150,9 +3278,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this7 = this;
 
-      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn30.PayIcon,
-          PayStyle = _enumController$getEn30.PayStyle;
+      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn31.PayIcon,
+          PayStyle = _enumController$getEn31.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3224,21 +3352,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn31.PayIcon,
-          PayIcon2 = _enumController$getEn31.PayIcon2,
-          PayStyle = _enumController$getEn31.PayStyle,
-          Differentiate = _enumController$getEn31.Differentiate;
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn32.PayIcon,
+          PayIcon2 = _enumController$getEn32.PayIcon2,
+          PayStyle = _enumController$getEn32.PayStyle,
+          Differentiate = _enumController$getEn32.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
           dataSource = _state2.dataSource,
           discountTotalAmount = _state2.discountTotalAmount,
           discountRetailTotalAount = _state2.discountRetailTotalAount,
-          discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount;
+          discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
+          storageValue = _state2.storageValue;
 
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3301,11 +3430,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref25 = quantityDetail || {},
-          _ref25$buyQuantity = _ref25.buyQuantity,
-          buyQuantity = _ref25$buyQuantity === undefined ? 0 : _ref25$buyQuantity,
-          _ref25$returnQuantity = _ref25.returnQuantity,
-          returnQuantity = _ref25$returnQuantity === undefined ? 0 : _ref25$returnQuantity;
+      var _ref28 = quantityDetail || {},
+          _ref28$buyQuantity = _ref28.buyQuantity,
+          buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
+          _ref28$returnQuantity = _ref28.returnQuantity,
+          returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3322,6 +3451,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         sumQuantity = this.changeDecimalBuZero(sumQuantity, quantityPrecision);
       }
+
+      var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
@@ -3562,6 +3693,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             return _this8.handleChange(index, e);
                           }
                         })
+                      ),
+                      !isNeedPasswordForStoragePay && _react2.default.createElement(
+                        'div',
+                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
+                          onClick: function onClick() {
+                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                          } },
+                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3888,16 +4027,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
                           disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
                           onClick: function onClick() {
-                            var czkinput = document.getElementById('inputS' + index);
-                            if (mode.paymentType === PayStyle.hyczk) {
-                              var isProhibitMeStorageCard = _this8.props.isProhibitMeStorageCard;
-
-                              if (isProhibitMeStorageCard) {
-                                _message2.default.warn('储值卡不可键盘录入，请刷卡!');
-                                return;
-                              }
-                            }
-                            mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? _this8.editCzkModal() : _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            // let czkinput = document.getElementById('inputS' + index);
+                            // if (mode.paymentType === PayStyle.hyczk) {
+                            //   const { isProhibitMeStorageCard } = this.props;
+                            //   if (isProhibitMeStorageCard) {
+                            //     Message.warn('储值卡不可键盘录入，请刷卡!');
+                            //     return;
+                            //   }
+                            // }
+                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
+                            _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;
@@ -4151,6 +4290,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             return _this8.onFocusHack(index, mode, paymode, e);
                           }
                         })
+                      ),
+                      !isNeedPasswordForStoragePay && _react2.default.createElement(
+                        'div',
+                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
+                          onClick: function onClick() {
+                            _this8.appendCzkmode('', 'noPlaySetPwd');
+                          } },
+                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4598,12 +4745,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   type: 'text',
                   placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
                   // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
-                  , disabled: true,
-                  className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
+                  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
-                  value: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
+                  defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
+                  value: this.state.czkValue,
                   ref: function ref(input) {
                     return _this8.czkInput = input;
                   },
@@ -4648,7 +4795,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             ),
             _react2.default.createElement(
               'div',
-              { className: 'received' },
+              { className: 'received receivedNumber' },
               _react2.default.createElement(
                 'span',
                 null,
@@ -4661,12 +4808,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   id: 'paymentAmount',
                   type: 'text',
                   className: _index.hotKey.hotKeyNotFilter('input'),
+                  value: storageValue,
                   onChange: function onChange(event) {
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref26) {
-                    return _this8["inputCzkAmount"] = _ref26;
+                  ref: function ref(_ref29) {
+                    return _this8["inputCzkAmount"] = _ref29;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -4676,11 +4824,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
-                    var sMember = _this8.store.member;
-                    if (!sMember.StorageCardEnable) {
-                      _message2.default.warn("该储值卡已停用");
-                      return;
-                    }
                     _keyboard2.default.close();
                     _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
                   }
@@ -4820,6 +4963,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             visible: this.state.djqVisible,
             maskClosable: false,
             onOk: this.handleDjqOk,
+            destroyOnClose: true,
             onCancel: this.handleDjqCancel,
             centered: !this.isHorizontalPad ? true : false,
             title: Differentiate.COUPON + '支付',
@@ -4859,7 +5003,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _react2.default.createElement(_input2.default, {
                     type: 'text',
                     placeholder: '\u626B\u63CF/\u8F93\u5165' + Differentiate.COUPON + '\u53F7\u5E76\u56DE\u8F66',
-                    className: 'input'
+                    className: 'input',
+                    id: 'djqInput'
                     // onChange={this.onDjqChange}
                     // value={currentMode && currentMode.member.cardNo}
                     , ref: function ref(input) {
@@ -4878,7 +5023,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       }, _this8.djqKeyboardOnOk, _this8.djqKeyboardOnClose)();
                     },
                     onBlur: function onBlur(e) {
-                      _keyboard2.default.close();
+                      _keyboard2.default.close();_this8.inputdjq.input.value = '';
                     }
                   })
                 ),
@@ -4888,6 +5033,25 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   currentMode && currentMode.errinfo
                 )
               ),
+              _react2.default.createElement(
+                'div',
+                { className: 'col4' },
+                _react2.default.createElement(
+                  _button2.default,
+                  { className: '' + (this.state.couponLight ? "primary-color b-theme" : 'couponBorder'), onClick: this.couponClick },
+                  '\u53EF\u7528\u4F18\u60E0\u5238'
+                ),
+                _react2.default.createElement(
+                  _button2.default,
+                  { className: '' + (!this.state.couponLight ? "primary-color b-theme" : 'couponBorder'), onClick: this.couponClick },
+                  '\u4E0D\u53EF\u7528\u4F18\u60E0\u5238'
+                ),
+                _react2.default.createElement(
+                  'span',
+                  { className: 'couponTip' },
+                  '\u9009\u62E9\u5238\u540E\u3001\u4E0D\u53EF\u53E0\u52A0\u3001\u91D1\u989D\u4E0D\u6EE1\u8DB3\u7684\u5238\u4F1A\u7F6E\u7070'
+                )
+              ),
               this.isHorizontalPad && _react2.default.createElement(
                 'div',
                 { className: 'col3' },
@@ -4904,12 +5068,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 'div',
                 { className: 'djq2' },
                 (0, _map3.default)(currentMode && currentMode.djqs || [], function (q, index) {
+                  if (!_this8.state.couponLight && !q.count) {
+                    return;
+                  }
+                  if (_this8.state.couponLight && q.count && q.count === 1) {
+                    return;
+                  }
                   return _react2.default.createElement(
                     'div',
                     { key: index + '', className: 'djqItem' },
                     !q.promoMethodEnum || q.promoMethodEnum == 'CASH_COUPON' ? _react2.default.createElement(
                       'div',
-                      { className: 'djqLeft djqLeftCash' },
+                      { className: 'djqLeft ' + (q.IsEnable ? 'djqLeftCash' : 'djqLeftCashGrey') },
                       _react2.default.createElement(
                         'div',
                         { className: 'amount' },
@@ -4931,7 +5101,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       )
                     ) : _react2.default.createElement(
                       'div',
-                      { className: 'djqLeft djqLeftDiscount' },
+                      { className: 'djqLeft ' + (q.IsEnable ? 'djqLeftCash' : 'djqLeftCashGrey') },
                       _react2.default.createElement(
                         'div',
                         { className: 'amount' },
@@ -4955,9 +5125,14 @@ 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 _this8.djqChecked(q);
+                          return q.IsEnable ? _this8.djqChecked(q, _this8.props.dto) : null;
                         } },
-                      _react2.default.createElement(
+                      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(
+                        'div',
+                        { className: 'name overflow-hidden-point primary-color' },
+                        q.name
+                      ) : _react2.default.createElement(
                         'div',
                         { className: 'name overflow-hidden-point' },
                         q.name
@@ -5256,8 +5431,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref27) {
-                    return _this8["inputJfdxAmount"] = _ref27;
+                  ref: function ref(_ref30) {
+                    return _this8["inputJfdxAmount"] = _ref30;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";