tplus-components-touch 3.26.1 → 3.26.2

package/dist/components/settlement/settlement.js

@@ -253,7 +253,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       currentKey: null,
       couponLight: true,
       storageValue: '0.00',
-      czkValue: null };
+      czkValue: null,
+      isInputMember: false };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -300,12 +301,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.inputkey = "inputJfdxAmount";
         _this2["inputJfdxAmount"].input.value = currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable));
         _this2.setCurrentModeValue(_this2.inputJfdxAmount.input.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
-      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.member.balance !== undefined) {
+      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.balance !== undefined) {
         _this2.inputkey = "inputCzkAmount";
-        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)));
-        var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
+        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)));
+        var maxamount = Math.min(currentMode.maxamount, currentMode.balance);
         _this2.inputCzkAmount && _this2.inputCzkAmount.input && _this2.setCurrentModeValue(_this2.inputCzkAmount.input.value, maxamount);
-        if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+        if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
           _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
             duration: 4
           });
@@ -553,145 +554,148 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.showCzkModal = function (id, append, params) {
-      var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn2.PayStyle;
+    _this2.showCzkModal = function () {
+      var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append, params) {
+        var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11, isInputMember, walletEnabled, cardTypeEnum;
 
-      var _ref = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref.isNewRetailBCPos;
+        return _regenerator2.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
 
-      _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-      _this2._val = _this2.store.paymode.currentMode.value;
-      var currentMode = _this2.store.paymode.currentMode;
+                _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
+                _this2._val = _this2.store.paymode.currentMode.value;
+                currentMode = _this2.store.paymode.currentMode;
+                maxamount = Math.min(currentMode.maxamount, currentMode.balance);
 
-      var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
-      if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
-        _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
-          duration: 4
-        });
-      } else {
-        // 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
-        });
-        // currentMode && getFixedNumber(brefund?currentMode.value:Math.min(currentMode.value,currentMode.maxamount,currentMode.member.balance))
-        var brefund = _this2.store.brefund;
+                if (!(_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount))) {
+                  _context.next = 9;
+                  break;
+                }
 
-        var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
-        _this2.setState({
-          storageValue: value11
-        });
-        if (currentMode.member.id) {
-          _this2.setState({
-            czkValue: currentMode.member.StorageCardNo
-          });
-        } else {
-          _this2.setState({
-            czkValue: null
-          });
-        }
-      }
-      setTimeout(function () {
-        if (!currentMode.member || !currentMode.member.id) {
-          _this2.czkInput && _this2.czkInput.input.focus();
-        } else {
-          if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-            _this2.inputCzkAmount.input.focus();
-            _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+                _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
+                  duration: 4
+                });
+                _context.next = 20;
+                break;
+
+              case 9:
+                _this2.setState({
+                  czkVisible: true
+                });
+                brefund = _this2.store.brefund;
+                value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
+
+                _this2.setState({
+                  storageValue: value11
+                });
+                if (currentMode.storageCardNo) {
+                  _this2.setState({
+                    czkValue: currentMode.storageCardNo
+                  });
+                } else {
+                  _this2.setState({
+                    czkValue: null
+                  });
+                }
+                isInputMember = _this2.state.isInputMember;
+
+                if (!isInputMember) {
+                  _context.next = 20;
+                  break;
+                }
+
+                _context.next = 18;
+                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+
+              case 18:
+                walletEnabled = currentMode.walletEnabled, cardTypeEnum = currentMode.cardTypeEnum;
+
+                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
+                  _this2.setState({
+                    showSetPwdModal: true,
+                    btnDissabled: true
+                  });
+                }
+
+              case 20:
+                setTimeout(function () {
+                  if (!currentMode.storageCardNo) {
+                    _this2.czkInput && _this2.czkInput.input.focus();
+                  } else {
+                    if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+                      _this2.inputCzkAmount.input.focus();
+                      _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+                    }
+                  }
+                }, 500);
+                _this2.connectRfCard();
+
+              case 22:
+              case 'end':
+                return _context.stop();
+            }
           }
-        }
-      }, 500);
-      _this2.connectRfCard();
-    };
+        }, _callee, _this3);
+      }));
+
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }();
 
     _this2.handleCzkOk = function () {
-      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
+      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(e) {
         var _enumController$getEn3, PayStyle;
 
-        return _regenerator2.default.wrap(function _callee$(_context) {
+        return _regenerator2.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
-                // const maxamount=Math.min(this.store.paymode.currentMode.maxamount,this.store.paymode.currentMode.member.balance);
-                // if(this.store.bquick && this.store.paymode.amount>maxamount){
-                //   Message.error("本单最大可用储值卡结算金额为："+getFixedNumber(maxamount)+"，请使用复合结算！");
-                //   this.setState({
-                //     czkVisible: false,
-                //   });
-                //   return;
-                // }
+                _this2.setState({
+                  isInputMember: false
+                });
                 _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
-                if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 4;
+                if (_this2.store.paymode.currentMode.storageCardNo) {
+                  _context2.next = 5;
                   break;
                 }
 
-                _context.next = 4;
+                _context2.next = 5;
                 return _this2.store.loadCzk(_this2.czkInput.input.value);
 
-              case 4:
-                if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 7;
+              case 5:
+                if (_this2.store.paymode.currentMode.storageCardNo) {
+                  _context2.next = 8;
                   break;
                 }
 
                 _message2.default.error("请录入储值卡！");
-                return _context.abrupt('return');
+                return _context2.abrupt('return');
 
-              case 7:
+              case 8:
                 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;
+                  return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
                 })) {
-                  _context.next = 10;
+                  _context2.next = 11;
                   break;
                 }
 
                 _message2.default.error("该储值卡已使用。");
-                return _context.abrupt('return');
+                return _context2.abrupt('return');
 
-              case 10:
+              case 11:
                 if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                  _context.next = 13;
+                  _context2.next = 14;
                   break;
                 }
 
                 _message2.default.error("实收金额应等于应收金额。");
-                return _context.abrupt('return');
+                return _context2.abrupt('return');
 
-              case 13:
+              case 14:
 
                 _this2.setState({
                   czkVisible: false,
@@ -702,15 +706,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.store.paymode.calcMemberBalance();
                 _this2.handleCzk();
 
-              case 17:
+              case 18:
               case 'end':
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, _this3);
+        }, _callee2, _this3);
       }));
 
-      return function (_x) {
+      return function (_x4) {
         return _ref2.apply(this, arguments);
       };
     }();
@@ -736,23 +740,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      var _this2$state, newPass, newPassConfirm, updataMemberInfo, result, currentMode, resp;
+    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+      var _this2$state, newPass, newPassConfirm, isInputMember, updataMemberInfo, result, cardTypeEnum, resp;
 
-      return _regenerator2.default.wrap(function _callee2$(_context2) {
+      return _regenerator2.default.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _this2$state = _this2.state, newPass = _this2$state.newPass, newPassConfirm = _this2$state.newPassConfirm;
+              _this2$state = _this2.state, newPass = _this2$state.newPass, newPassConfirm = _this2$state.newPassConfirm, isInputMember = _this2$state.isInputMember;
               updataMemberInfo = _this2.props.updataMemberInfo;
-              _context2.next = 4;
+              _context3.next = 4;
               return _this2.store.queryPwd(newPass, newPassConfirm);
 
             case 4:
-              result = _context2.sent;
+              result = _context3.sent;
+              cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
 
               if (!result) {
-                _context2.next = 15;
+                _context3.next = 20;
                 break;
               }
 
@@ -763,33 +768,45 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 newPassConfirm: ''
               });
               _message2.default.warn('设置成功');
-              currentMode = _this2.store.paymode.currentMode;
-
               setTimeout(function () {
-                if (!currentMode.member || !currentMode.member.id) {
-                  _this2.czkInput && _this2.czkInput.input.focus();
-                } else {
-                  if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-                    _this2.inputCzkAmount.input.focus();
-                    _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
-                  }
+                if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+                  _this2.inputCzkAmount.input.focus();
+                  _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
                 }
               }, 350);
               _this2.connectRfCard();
-              _context2.next = 13;
+
+              if (!isInputMember) {
+                _context3.next = 18;
+                break;
+              }
+
+              _context3.next = 14;
               return _this2.store.updateMemberInfo(_this2.store);
 
-            case 13:
-              resp = _context2.sent;
+            case 14:
+              resp = _context3.sent;
 
               updataMemberInfo(resp);
+              _context3.next = 19;
+              break;
+
+            case 18:
+              if (cardTypeEnum === 'BALANCE_CARD') {
+                _this2.store.updateCardInfo();
+              }
 
-            case 15:
+            case 19:
+              _this2.setState({
+                isInputMember: false
+              });
+
+            case 20:
             case 'end':
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, _this3);
+      }, _callee3, _this3);
     }));
 
     _this2.setPwdValue = function (field, value) {
@@ -992,6 +1009,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       switch (key) {
         case PayStyle.hyczk:
           _this2.showCzkModal(-1);
+          _this2.store.dto.Idmember && _this2.setState({
+            isInputMember: true
+          });
           break;
         case PayStyle.jfdx:
           _this2.showJfdxModal(-1);
@@ -1100,7 +1120,6 @@ 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)) {
@@ -1170,12 +1189,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.setCurrentFocusAndAddPay = function (key) {
+    _this2.setCurrentFocusAndAddPay = function (key, payId) {
       _this2.store.changeFocusAndAddPay(key);
       if (_this2.store.bquick) {
         _this2.handleSettle("quickPay");
       } else {
-        _this2.setFocusAndSelection(key);
+        _this2.setFocusAndSelection(key, payId);
       }
     };
 
@@ -1344,27 +1363,37 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.czkdebounced) {
         return;
       }
-      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-        return _regenerator2.default.wrap(function _callee3$(_context3) {
+      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+        var _this2$store$paymode$, cardTypeEnum, walletEnabled;
+
+        return _regenerator2.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.next = 2;
+                _context4.next = 2;
                 return _this2.store.loadCzk(v);
 
               case 2:
-                if (_this2.store.paymode.currentMode.StorageCardNo) {
+                _this2$store$paymode$ = _this2.store.paymode.currentMode, cardTypeEnum = _this2$store$paymode$.cardTypeEnum, walletEnabled = _this2$store$paymode$.walletEnabled;
+
+                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
                   _this2.setState({
-                    czkValue: _this2.store.paymode.currentMode.StorageCardNo
+                    showSetPwdModal: true,
+                    btnDissabled: true
+                  });
+                }
+                if (_this2.store.paymode.currentMode.storageCardNo) {
+                  _this2.setState({
+                    czkValue: _this2.store.paymode.currentMode.storageCardNo
                   });
                 }
 
-              case 3:
+              case 5:
               case 'end':
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, _this3);
+        }, _callee4, _this3);
       })), 1000, {
         'leading': true,
         'trailing': false
@@ -1532,13 +1561,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return null;
     };
 
-    _this2.setFocusAndSelection = function (key) {
+    _this2.setFocusAndSelection = function (key, payId) {
       var that = _this2;
       var paymode = _this2.store.paymode;
 
+      var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn19.PayStyle;
+
       var themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
         return mode.paymentType === key;
       });
+      if (key === PayStyle.hyczk) {
+        themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
+          return mode.paymethodId === payId;
+        });
+      }
       var index = themode && themode.paymethodId || -1;
       if (index !== -1) {
         setTimeout(function () {
@@ -1553,11 +1590,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
       var that;
-      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:
               that = _this2;
 
@@ -1580,18 +1617,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 _callee4() {
+                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                     var result;
-                    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:
                             window.__queryingModal = (0, _utils.openQueryingModal)();
-                            _context4.next = 3;
+                            _context5.next = 3;
                             return that.store.querySettleResult();
 
                           case 3:
-                            result = _context4.sent;
+                            result = _context5.sent;
 
                             setTimeout(function () {
                               if (window.__queryingModal) {
@@ -1599,34 +1636,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 window.__queryingModal = null;
                               }
                             }, 0);
-                            _context4.t0 = result.Flag;
-                            _context4.next = _context4.t0 === "0" ? 8 : _context4.t0 === "1" ? 11 : _context4.t0 === "2" ? 13 : 15;
+                            _context5.t0 = result.Flag;
+                            _context5.next = _context5.t0 === "0" ? 8 : _context5.t0 === "1" ? 11 : _context5.t0 === "2" ? 13 : 15;
                             break;
 
                           case 8:
                             //成功
                             that.store.setDtoID(result.ID);
                             that.settleSuccess();
-                            return _context4.abrupt('break', 15);
+                            return _context5.abrupt('break', 15);
 
                           case 11:
                             //处理中
                             that.settleUnReturn();
                             // Message.info("结算正在处理中，请稍后再次查询。");
-                            return _context4.abrupt('break', 15);
+                            return _context5.abrupt('break', 15);
 
                           case 13:
                             //失败
                             _message2.default.info('\u7ED3\u7B97\u5931\u8D25\uFF0C\u539F\u56E0:' + result.Message + '\u3002');
                             // that.settleCanceled();
-                            return _context4.abrupt('break', 15);
+                            return _context5.abrupt('break', 15);
 
                           case 15:
                           case 'end':
-                            return _context4.stop();
+                            return _context5.stop();
                         }
                       }
-                    }, _callee4, _this4);
+                    }, _callee5, _this4);
                   }))();
                 },
                 onCancel: function onCancel() {
@@ -1636,10 +1673,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 2:
             case 'end':
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5, _this3);
+      }, _callee6, _this3);
     }));
 
     _this2.settleCanceled = function () {
@@ -1648,15 +1685,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.cancelState();
     };
 
-    _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;
+    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
+      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
 
-      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:
               //提示成功
-              _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn19.PayStyle;
+              _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.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;
@@ -1714,22 +1751,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               resp1 = false;
 
               if (!(type !== 1)) {
-                _context6.next = 20;
+                _context7.next = 20;
                 break;
               }
 
-              _context6.prev = 11;
-              _context6.next = 14;
+              _context7.prev = 11;
+              _context7.next = 14;
               return getSettleGift();
 
             case 14:
-              resp1 = _context6.sent;
-              _context6.next = 20;
+              resp1 = _context7.sent;
+              _context7.next = 20;
               break;
 
             case 17:
-              _context6.prev = 17;
-              _context6.t0 = _context6['catch'](11);
+              _context7.prev = 17;
+              _context7.t0 = _context7['catch'](11);
 
               console.log("获取支付礼包getSettleGift失败");
 
@@ -1767,10 +1804,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 21:
             case 'end':
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6, _this3, [[11, 17]]);
+      }, _callee7, _this3, [[11, 17]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
@@ -1818,108 +1855,108 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(args) {
+      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(args) {
         var handleUserInputs = function () {
-          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(promises) {
+          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            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:
                     results = [];
-                    _context8.prev = 1;
+                    _context9.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context8.prev = 5;
+                    _context9.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context8.next = 16;
+                      _context9.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context8.next = 11;
+                    _context9.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context8.sent;
+                    _result = _context9.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context8.next = 7;
+                    _context9.next = 7;
                     break;
 
                   case 16:
-                    _context8.next = 22;
+                    _context9.next = 22;
                     break;
 
                   case 18:
-                    _context8.prev = 18;
-                    _context8.t0 = _context8['catch'](5);
+                    _context9.prev = 18;
+                    _context9.t0 = _context9['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context8.t0;
+                    _iteratorError = _context9.t0;
 
                   case 22:
-                    _context8.prev = 22;
-                    _context8.prev = 23;
+                    _context9.prev = 22;
+                    _context9.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context8.prev = 25;
+                    _context9.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context8.next = 28;
+                      _context9.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context8.finish(25);
+                    return _context9.finish(25);
 
                   case 29:
-                    return _context8.finish(22);
+                    return _context9.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context8.next = 33;
+                    _context9.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context8.next = 37;
+                    _context9.next = 37;
                     break;
 
                   case 35:
-                    _context8.prev = 35;
-                    _context8.t1 = _context8['catch'](1);
+                    _context9.prev = 35;
+                    _context9.t1 = _context9['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context8.stop();
+                    return _context9.stop();
                 }
               }
-            }, _callee8, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee9, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
-          return function handleUserInputs(_x4) {
+          return function handleUserInputs(_x7) {
             return _ref16.apply(this, arguments);
           };
         }();
 
-        var _enumController$getEn20, PayStyle, _this2$store6, 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 _callee9$(_context9) {
+        return _regenerator2.default.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
@@ -1935,7 +1972,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 // }
                 //
                 // testAsync(p);
-                _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
+                _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.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;
@@ -1951,7 +1988,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context9.next = 13;
+                  _context10.next = 13;
                   break;
                 }
 
@@ -1959,11 +1996,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context9.abrupt('return');
+                return _context10.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context9.next = 19;
+                  _context10.next = 19;
                   break;
                 }
 
@@ -1972,7 +2009,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context9.next = 19;
+                  _context10.next = 19;
                   break;
                 }
 
@@ -1980,7 +2017,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context9.abrupt('return');
+                return _context10.abrupt('return');
 
               case 19:
                 promises = [];
@@ -1989,14 +2026,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context9.next = 27;
+                  _context10.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context9.next = 27;
+                  _context10.next = 27;
                   break;
                 }
 
@@ -2004,7 +2041,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context9.abrupt('return');
+                return _context10.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2014,27 +2051,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(values) {
+                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(values) {
                     var 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:
-                            _context7.next = 2;
+                            _context8.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context7.sent;
+                            result = _context8.sent;
 
                             if (!(result === true)) {
-                              _context7.next = 8;
+                              _context8.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context7.next = 23;
+                            _context8.next = 23;
                             break;
 
                           case 8:
@@ -2051,24 +2088,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context7.next = 20;
+                              _context8.next = 20;
                               break;
                             }
 
-                            _context7.t0 = result.Code || result.code;
-                            _context7.next = _context7.t0 === 'RE_Settle_UnReturn' ? 14 : _context7.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context8.t0 = result.Code || result.code;
+                            _context8.next = _context8.t0 === 'RE_Settle_UnReturn' ? 14 : _context8.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context7.abrupt('break', 20);
+                            return _context8.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context7.abrupt('break', 20);
+                            return _context8.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -2076,18 +2113,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context7.next = 23;
+                            _context8.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context7.stop();
+                            return _context8.stop();
                         }
                       }
-                    }, _callee7, _this3);
+                    }, _callee8, _this3);
                   }));
 
-                  return function commit(_x3) {
+                  return function commit(_x6) {
                     return _ref15.apply(this, arguments);
                   };
                 }();
@@ -2096,102 +2133,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9, _this3);
+        }, _callee10, _this3);
       }));
 
-      return function (_x2) {
+      return function (_x5) {
         return _ref14.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
       var handleUserInputs = function () {
-        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
+        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          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:
                   results = [];
-                  _context11.prev = 1;
+                  _context12.prev = 1;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context11.prev = 5;
+                  _context12.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context11.next = 16;
+                    _context12.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context11.next = 11;
+                  _context12.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context11.sent;
+                  _result2 = _context12.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = true;
-                  _context11.next = 7;
+                  _context12.next = 7;
                   break;
 
                 case 16:
-                  _context11.next = 22;
+                  _context12.next = 22;
                   break;
 
                 case 18:
-                  _context11.prev = 18;
-                  _context11.t0 = _context11['catch'](5);
+                  _context12.prev = 18;
+                  _context12.t0 = _context12['catch'](5);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context11.t0;
+                  _iteratorError2 = _context12.t0;
 
                 case 22:
-                  _context11.prev = 22;
-                  _context11.prev = 23;
+                  _context12.prev = 22;
+                  _context12.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context11.prev = 25;
+                  _context12.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context11.next = 28;
+                    _context12.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context11.finish(25);
+                  return _context12.finish(25);
 
                 case 29:
-                  return _context11.finish(22);
+                  return _context12.finish(22);
 
                 case 30:
-                  _context11.next = 32;
+                  _context12.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context11.next = 37;
+                  _context12.next = 37;
                   break;
 
                 case 34:
-                  _context11.prev = 34;
-                  _context11.t1 = _context11['catch'](1);
+                  _context12.prev = 34;
+                  _context12.t1 = _context12['catch'](1);
 
-                  if (_context11.t1 != "cancelpwd") {
-                    _message2.default.error(_context11.t1);
+                  if (_context12.t1 != "cancelpwd") {
+                    _message2.default.error(_context12.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2199,22 +2236,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context11.stop();
+                  return _context12.stop();
               }
             }
-          }, _callee11, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee12, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
-        return function handleUserInputs(_x6) {
+        return function handleUserInputs(_x9) {
           return _ref20.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn21, PayStyle, isNeedPasswordForStoragePay, commit;
+      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
-      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;
               curmode = _this2.store.paymode.currentMode;
@@ -2223,12 +2260,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
-                  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
+                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
-
-                    if (isNeedPasswordForStoragePay) {
+                    if (curmode.cardTypeEnum === 'BALANCE_CARD' || curmode.isNeedPassword) {
                       promises.push(that.inputPwd(curmode));
                     }
                   }
@@ -2240,56 +2275,59 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
+                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(values) {
                   var 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:
                           if (!(values.length > 0)) {
-                            _context10.next = 6;
+                            _context11.next = 6;
                             break;
                           }
 
-                          _context10.next = 3;
+                          _context11.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context10.t0 = _context10.sent;
-                          _context10.next = 7;
+                          _context11.t0 = _context11.sent;
+                          _context11.next = 7;
                           break;
 
                         case 6:
-                          _context10.t0 = "";
+                          _context11.t0 = "";
 
                         case 7:
-                          result = _context10.t0;
+                          result = _context11.t0;
 
                           if (!(result == "")) {
-                            _context10.next = 13;
+                            _context11.next = 14;
                             break;
                           }
 
                           //成功
                           //返回
-                          that.setCurrentFocusAndAddPay(curmode.paymentType);
+                          if (values.length > 0) {
+                            _message2.default.success('密码确认成功！');
+                          }
+                          that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
                           _promise2.default.resolve();
-                          _context10.next = 15;
+                          _context11.next = 16;
                           break;
 
-                        case 13:
-                          _context10.next = 15;
+                        case 14:
+                          _context11.next = 16;
                           return _promise2.default.reject(result);
 
-                        case 15:
+                        case 16:
                         case 'end':
-                          return _context10.stop();
+                          return _context11.stop();
                       }
                     }
-                  }, _callee10, _this3);
+                  }, _callee11, _this3);
                 }));
 
-                return function commit(_x5) {
+                return function commit(_x8) {
                   return _ref19.apply(this, arguments);
                 };
               }();
@@ -2298,10 +2336,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 7:
             case 'end':
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee12, _this3);
+      }, _callee13, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2341,15 +2379,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(paymode) {
+      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(paymode) {
         var that, confirmPwd;
-        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:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context13.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context14.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2483,13 +2521,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 3:
               case 'end':
-                return _context13.stop();
+                return _context14.stop();
             }
           }
-        }, _callee13, _this3);
+        }, _callee14, _this3);
       }));
 
-      return function (_x7) {
+      return function (_x10) {
         return _ref21.apply(this, arguments);
       };
     }();
@@ -2499,8 +2537,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         bquick: bquick
       });
 
-      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn22.PayStyle;
+      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn23.PayStyle;
 
       var _this2$store7 = _this2.store,
           paymode = _this2$store7.paymode,
@@ -2605,8 +2643,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCharge = function () {
-      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn23.PayStyle;
+      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn24.PayStyle;
 
       var paymode = _this2.store.paymode;
 
@@ -2653,8 +2691,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinPayment = function (payType, value) {
-      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn24.PayStyle;
+      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn25.PayStyle;
 
       var isManualIntoAmount = _this2.state.isManualIntoAmount;
 
@@ -2662,8 +2700,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinBalance = function (payType, value) {
-      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn25.PayStyle;
+      var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn26.PayStyle;
       //找零金额-存在权限控制
 
 
@@ -2683,9 +2721,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var isManualIntoAmount = void 0;
       // 付款弹窗
       return new _promise2.default(function (resolve, reject) {
-        var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
-            PayStyle = _enumController$getEn26.PayStyle,
-            PayIcon2 = _enumController$getEn26.PayIcon2;
+        var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn27.PayStyle,
+            PayIcon2 = _enumController$getEn27.PayIcon2;
 
         var modal = (0, _asyncModal2.default)({
           onPressEnter: function onPressEnter() {
@@ -2954,8 +2992,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           paymode = _this2$store8.paymode,
           newStyle = _this2$store8.newStyle;
 
-      var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn27.PayStyle;
+      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn28.PayStyle;
 
       var payTypeList = [PayStyle.SQBPAY, PayStyle.CSYH, PayStyle.smzf];
       var payTypeFilterList = payTypeList.filter(function (filterType) {
@@ -2976,15 +3014,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkModeDisabled = function (type, brefund, boriginReturn) {
-      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn28.PayStyle;
+      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn29.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$getEn29 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn29.PayStyle;
+      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn30.PayStyle;
 
       console.log("settlement.checkSettleDisabled开始执行，参数：", { paymode: paymode, thePaymodes: thePaymodes });
       if (paymode.amount == 0 && paymode.received == 0) {
@@ -3030,8 +3068,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.editCzkModal = function () {
-      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn30.PayStyle;
+      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn31.PayStyle;
 
       (0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
         if (mode.paymentType == PayStyle.hyczk) {
@@ -3256,11 +3294,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     //jfdx
 
 
-    /**
-     *
-     * @param {*} thePaymodes 支付方式列表
-     * @param {*} currenIndex  当前支付方式下标
-     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
+    /**
+     *
+     * @param {*} thePaymodes 支付方式列表
+     * @param {*} currenIndex  当前支付方式下标
+     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
     // 处理客显显示功能
@@ -3288,9 +3326,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this7 = this;
 
-      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn31.PayIcon,
-          PayStyle = _enumController$getEn31.PayStyle;
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn32.PayIcon,
+          PayStyle = _enumController$getEn32.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3362,11 +3400,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn32.PayIcon,
-          PayIcon2 = _enumController$getEn32.PayIcon2,
-          PayStyle = _enumController$getEn32.PayStyle,
-          Differentiate = _enumController$getEn32.Differentiate;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn33.PayIcon,
+          PayIcon2 = _enumController$getEn33.PayIcon2,
+          PayStyle = _enumController$getEn33.PayStyle,
+          Differentiate = _enumController$getEn33.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3463,7 +3501,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         sumQuantity = this.changeDecimalBuZero(sumQuantity, quantityPrecision);
       }
 
-      var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
       var themodeHyczk = thePaymodes.filter(function (mode) {
         return mode.paymentType === PayStyle.hyczk && mode.value !== '0.00';
       });
@@ -3733,7 +3770,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
+                        mode && mode.storageCardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -4114,7 +4151,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          isNewRetailBCPos ? m.member && m.member.StorageCardNo : m.member && m.member.cardNo
+                          m && m.storageCardNo
                         ),
                         _react2.default.createElement(
                           'span',
@@ -4354,7 +4391,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
+                        mode && mode.storageCardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -4708,7 +4745,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member.type || '普通'
+                  currentMode && currentMode.member && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4729,7 +4766,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.balance)
+                  currentMode && (0, _utils.getFixedNumber)(currentMode.balance)
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4750,7 +4787,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.balance)))
+                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.balance)))
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4772,34 +4809,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 null,
                 _react2.default.createElement(_input2.default, {
                   type: 'text',
-                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u50A8\u503C\u5361'
-                  // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
-                  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
+                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u50A8\u503C\u5361',
+                  className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
-                  defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
+                  defaultValue: currentMode && currentMode.storageCardNo,
                   value: czkValue,
                   ref: function ref(input) {
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(e) {
+                    var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(e) {
                       var time, _paymode;
 
-                      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:
                               if (!(e.keyCode == 13)) {
-                                _context14.next = 14;
+                                _context15.next = 14;
                                 break;
                               }
 
                               time = Date.parse(new Date());
 
                               if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
-                                _context14.next = 7;
+                                _context15.next = 7;
                                 break;
                               }
 
@@ -4808,22 +4844,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               _this8.setState({
                                 czkValue: null
                               });
-                              return _context14.abrupt('return');
+                              return _context15.abrupt('return');
 
                             case 7:
                               _this8.keypressStime = null;
-                              _context14.next = 10;
+                              _context15.next = 10;
                               return _this8.loadCzk(e.target.value);
 
                             case 10:
                               _paymode = _this8.store.paymode;
 
-                              if (!_paymode.currentMode.StorageCardNo) {
+                              if (!_paymode.currentMode.storageCardNo) {
                                 _this8.setState({
                                   czkvalue: null
                                 });
                               }
-                              _context14.next = 15;
+                              _context15.next = 15;
                               break;
 
                             case 14:
@@ -4833,13 +4869,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                             case 15:
                             case 'end':
-                              return _context14.stop();
+                              return _context15.stop();
                           }
                         }
-                      }, _callee14, _this8);
+                      }, _callee15, _this8);
                     }));
 
-                    return function (_x9) {
+                    return function (_x12) {
                       return _ref29.apply(this, arguments);
                     };
                   }(),
@@ -4894,9 +4930,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   className: _index.hotKey.hotKeyNotFilter('input'),
                   value: storageValue,
                   onChange: function onChange(event) {
-                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
+                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
-                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
+                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
                   ref: function ref(_ref30) {
                     return _this8["inputCzkAmount"] = _ref30;
                   },
@@ -4904,12 +4940,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.inputkey = "inputCzkAmount";
                     _keyboard2.default.open(function (v) {
                       var value = _keyboard2.default.getNewValue(_this8[_this8.inputkey].input, _this8[_this8.inputkey].input.value, v);
-                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.balance));
+                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.balance));
                     }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
-                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
+                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.balance));
                   }
                 })
               )
@@ -4970,7 +5006,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             ),
             _react2.default.createElement(
               _button2.default,
-              { type: 'primary', disabled: currentMode && currentMode.errinfo != '' || btnDissabled, onClick: this.handleSetModal },
+              { type: 'primary', disabled: btnDissabled, onClick: this.handleSetModal },
               '\u786E\u5B9A'
             )
           )),
@@ -5397,7 +5433,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member.type || '普通'
+                  currentMode && currentMode.member && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5418,7 +5454,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member.bonusPoints
+                  currentMode && currentMode.member && currentMode.member.bonusPoints
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5439,7 +5475,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5460,7 +5496,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5480,7 +5516,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'notext' },
-                currentMode && currentMode.member.cardNo
+                currentMode && currentMode.member && currentMode.member.cardNo
               )
             ),
             _react2.default.createElement(
@@ -5514,7 +5550,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   onChange: function onChange(e) {
                     _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)),
+                  defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
                   ref: function ref(_ref31) {
                     return _this8["inputJfdxAmount"] = _ref31;
                   },