tplus-components-touch 3.54.7 → 3.54.8

package/dist/components/settlement/settlement.js

@@ -938,27 +938,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             case 4:
               result = _context5.sent;
 
-              if (!(result == "")) {
-                _context5.next = 10;
-                break;
+              if (result == "") {
+                //成功
+                //返回
+                _this2.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
+                _promise2.default.resolve();
+              } else {
+                _this2.setState({
+                  confirmStatus: true
+                });
+                _message2.default.info(result);
               }
 
-              //成功
-              //返回
-              _this2.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
-              _promise2.default.resolve();
-              _context5.next = 13;
-              break;
-
-            case 10:
-              _this2.setState({
-                confirmStatus: true
-              });
-              //Message.info("密码不正确");
-              _context5.next = 13;
-              return _promise2.default.reject(result);
-
-            case 13:
+            case 6:
             case 'end':
               return _context5.stop();
           }
@@ -1907,7 +1899,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   var _this$props = _this.props,
                       MemberPoints = _this$props.MemberPoints,
                       isMemberPointsReturn = _this$props.isMemberPointsReturn,
-                      isReturn = _this$props.isReturn;
+                      isReturn = _this$props.isReturn,
+                      settlementType = _this$props.type;
 
                   var message = "支付成功";
                   if ((isReturn || isMemberPointsReturn) && Number(amount) == Number(0)) {
@@ -1917,9 +1910,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   } else if (IdbusiType == 39 && received == 0) {
                     message = "取货成功";
                   }
-                  _mutantsMicrofx.stores.drawerStore.hide();
+                  // 收款的时候，drawerStore才消失
+                  if (settlementType === 2) {
+                    _mutantsMicrofx.stores.drawerStore.hide();
+                  }
                   if (params === 'onCreditReturn') {
-                    _message2.default.warn('退货成功，此单无须退款！');
+                    _message2.default.success('退货成功，此单无须退款！');
                   } else {
                     window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
                       _this.handleGuestShow(5);
@@ -2323,109 +2319,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16() {
-      var handleUserInputs = function () {
-        var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
-          var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
-
-          return _regenerator2.default.wrap(function _callee15$(_context15) {
-            while (1) {
-              switch (_context15.prev = _context15.next) {
-                case 0:
-                  results = [];
-                  _context15.prev = 1;
-                  _iteratorNormalCompletion2 = true;
-                  _didIteratorError2 = false;
-                  _iteratorError2 = undefined;
-                  _context15.prev = 5;
-                  _iterator2 = (0, _getIterator3.default)(promises);
-
-                case 7:
-                  if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context15.next = 16;
-                    break;
-                  }
-
-                  p = _step2.value;
-                  _context15.next = 11;
-                  return p;
-
-                case 11:
-                  _result2 = _context15.sent;
-
-                  results.push(_result2);
-
-                case 13:
-                  _iteratorNormalCompletion2 = true;
-                  _context15.next = 7;
-                  break;
-
-                case 16:
-                  _context15.next = 22;
-                  break;
-
-                case 18:
-                  _context15.prev = 18;
-                  _context15.t0 = _context15['catch'](5);
-                  _didIteratorError2 = true;
-                  _iteratorError2 = _context15.t0;
-
-                case 22:
-                  _context15.prev = 22;
-                  _context15.prev = 23;
-
-                  if (!_iteratorNormalCompletion2 && _iterator2.return) {
-                    _iterator2.return();
-                  }
-
-                case 25:
-                  _context15.prev = 25;
-
-                  if (!_didIteratorError2) {
-                    _context15.next = 28;
-                    break;
-                  }
-
-                  throw _iteratorError2;
-
-                case 28:
-                  return _context15.finish(25);
-
-                case 29:
-                  return _context15.finish(22);
-
-                case 30:
-                  _context15.next = 32;
-                  return commit(results);
-
-                case 32:
-                  _context15.next = 37;
-                  break;
-
-                case 34:
-                  _context15.prev = 34;
-                  _context15.t1 = _context15['catch'](1);
-
-                  if (_context15.t1 != "cancelpwd") {
-                    _message2.default.error(_context15.t1);
-                    setTimeout(function () {
-                      that.handleCzk();
-                    }, 500);
-                  }
-
-                case 37:
-                case 'end':
-                  return _context15.stop();
-              }
-            }
-          }, _callee15, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
-        }));
-
-        return function handleUserInputs(_x9) {
-          return _ref18.apply(this, arguments);
-        };
-      }();
-
-      var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _enumController$getEn22, _PayStyle, handleUserInputs, _commit;
 
       return _regenerator2.default.wrap(function _callee16$(_context16) {
         while (1) {
@@ -2436,9 +2330,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               promises = [];
 
               if (curmode.value > 0) {
-                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), _PayStyle = _enumController$getEn22.PayStyle;
 
-                if (curmode.paymentType === PayStyle.hyczk) {
+                if (curmode.paymentType === _PayStyle.hyczk) {
                   if (curmode.cardTypeEnum === 'BALANCE_CARD') {
                     !curmode.freePaymentPasswordStore && _this2.setState({
                       confirmStatus: true
@@ -2451,64 +2345,168 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
               }
 
-              commit = function () {
-                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(values) {
-                  var result;
-                  return _regenerator2.default.wrap(function _callee14$(_context14) {
-                    while (1) {
-                      switch (_context14.prev = _context14.next) {
-                        case 0:
-                          if (!(values.length > 0)) {
-                            _context14.next = 6;
+              if (curmode.paymentType !== PayStyle.hyczk || curmode.freePaymentPasswordStore || !curmode.isNeedPassword) {
+                handleUserInputs = function () {
+                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
+                    var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
+
+                    return _regenerator2.default.wrap(function _callee15$(_context15) {
+                      while (1) {
+                        switch (_context15.prev = _context15.next) {
+                          case 0:
+                            results = [];
+                            _context15.prev = 1;
+                            _iteratorNormalCompletion2 = true;
+                            _didIteratorError2 = false;
+                            _iteratorError2 = undefined;
+                            _context15.prev = 5;
+                            _iterator2 = (0, _getIterator3.default)(promises);
+
+                          case 7:
+                            if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
+                              _context15.next = 16;
+                              break;
+                            }
+
+                            p = _step2.value;
+                            _context15.next = 11;
+                            return p;
+
+                          case 11:
+                            _result2 = _context15.sent;
+
+                            results.push(_result2);
+
+                          case 13:
+                            _iteratorNormalCompletion2 = true;
+                            _context15.next = 7;
                             break;
-                          }
 
-                          _context14.next = 3;
-                          return that.store.validePwd(values[0]);
+                          case 16:
+                            _context15.next = 22;
+                            break;
+
+                          case 18:
+                            _context15.prev = 18;
+                            _context15.t0 = _context15['catch'](5);
+                            _didIteratorError2 = true;
+                            _iteratorError2 = _context15.t0;
+
+                          case 22:
+                            _context15.prev = 22;
+                            _context15.prev = 23;
+
+                            if (!_iteratorNormalCompletion2 && _iterator2.return) {
+                              _iterator2.return();
+                            }
+
+                          case 25:
+                            _context15.prev = 25;
 
-                        case 3:
-                          _context14.t0 = _context14.sent;
-                          _context14.next = 7;
-                          break;
+                            if (!_didIteratorError2) {
+                              _context15.next = 28;
+                              break;
+                            }
 
-                        case 6:
-                          _context14.t0 = "";
+                            throw _iteratorError2;
 
-                        case 7:
-                          result = _context14.t0;
+                          case 28:
+                            return _context15.finish(25);
 
-                          if (!(result == "")) {
-                            _context14.next = 13;
+                          case 29:
+                            return _context15.finish(22);
+
+                          case 30:
+                            _context15.next = 32;
+                            return _commit(results);
+
+                          case 32:
+                            _context15.next = 37;
                             break;
-                          }
 
-                          //成功
-                          //返回
-                          that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
-                          _promise2.default.resolve();
-                          _context14.next = 15;
-                          break;
+                          case 34:
+                            _context15.prev = 34;
+                            _context15.t1 = _context15['catch'](1);
 
-                        case 13:
-                          _context14.next = 15;
-                          return _promise2.default.reject(result);
+                            if (_context15.t1 != "cancelpwd") {
+                              _message2.default.error(_context15.t1);
+                              setTimeout(function () {
+                                that.handleCzk();
+                              }, 500);
+                            }
 
-                        case 15:
-                        case 'end':
-                          return _context14.stop();
+                          case 37:
+                          case 'end':
+                            return _context15.stop();
+                        }
                       }
-                    }
-                  }, _callee14, _this3);
-                }));
+                    }, _callee15, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+                  }));
 
-                return function commit(_x8) {
-                  return _ref17.apply(this, arguments);
-                };
-              }();
+                  return function handleUserInputs(_x9) {
+                    return _ref18.apply(this, arguments);
+                  };
+                }();
 
-              handleUserInputs(promises);
+                _commit = function () {
+                  var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(values) {
+                    var result;
+                    return _regenerator2.default.wrap(function _callee14$(_context14) {
+                      while (1) {
+                        switch (_context14.prev = _context14.next) {
+                          case 0:
+                            if (!(values.length > 0)) {
+                              _context14.next = 6;
+                              break;
+                            }
 
-            case 6:
+                            _context14.next = 3;
+                            return that.store.validePwd(values[0]);
+
+                          case 3:
+                            _context14.t0 = _context14.sent;
+                            _context14.next = 7;
+                            break;
+
+                          case 6:
+                            _context14.t0 = "";
+
+                          case 7:
+                            result = _context14.t0;
+
+                            if (!(result == "")) {
+                              _context14.next = 13;
+                              break;
+                            }
+
+                            //成功
+                            //返回
+                            that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
+                            _promise2.default.resolve();
+                            _context14.next = 15;
+                            break;
+
+                          case 13:
+                            _context14.next = 15;
+                            return _promise2.default.reject(result);
+
+                          case 15:
+                          case 'end':
+                            return _context14.stop();
+                        }
+                      }
+                    }, _callee14, _this3);
+                  }));
+
+                  return function _commit(_x8) {
+                    return _ref17.apply(this, arguments);
+                  };
+                }();
+
+                handleUserInputs(promises);
+              }
+
+            case 5:
             case 'end':
               return _context16.stop();
           }
@@ -2784,7 +2782,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               case 18:
                 returnAmount1 = 0;
                 _context18.next = 21;
-                return _this2.store.commit(_this2.props.bTest, _this2.context.viewModel.data);
+                return _this2.store.commit(_this2.props.bTest, _this2.context.viewModel.data, _this2.context);
 
               case 21:
                 _result3 = _context18.sent;
@@ -4980,7 +4978,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           (0, _defineProperty3.default)({
-            wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' modify-password',
+            wrapClassName: 'djq ' + _index.hotKey.hotKeyBindClass('5', 'modify-password') + ' ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '400px',
             visible: this.state.showSetPwdModal,
             backdropClosable: false,
@@ -5012,7 +5010,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           (0, _defineProperty3.default)({
-            wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' confirmPwdWraper',
+            wrapClassName: 'djq ' + _index.hotKey.hotKeyBindClass('5', 'confirmPwdWraper') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
             width: '400px',
             visible: this.state.confirmStatus,
             backdropClosable: false,
@@ -5042,6 +5040,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             placeholder: '',
             maxLength: 6,
             labelName: '\u50A8\u503C\u4F59\u989D\u5BC6\u7801',
+            ok: this.handleConfirmPwdModal,
             getConfirmPwd: this.getConfirmPwd,
             params: 'pay',
             amount: this.store.paymode.currentMode && (0, _utils.getFixedNumber)(this.store.paymode.currentMode.value)