tplus-components-touch 3.54.9 → 3.54.12

package/dist/components/settlement/settlement.js

@@ -2319,7 +2319,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16() {
-      var that, curmode, promises, _enumController$getEn22, _PayStyle, handleUserInputs, _commit;
+      var that, curmode, promises, _enumController$getEn22, PayStyle, pwdStatus, handleUserInputs, _commit;
 
       return _regenerator2.default.wrap(function _callee16$(_context16) {
         while (1) {
@@ -2328,11 +2328,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
+              _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
               if (curmode.value > 0) {
-                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), _PayStyle = _enumController$getEn22.PayStyle;
-
-                if (curmode.paymentType === _PayStyle.hyczk) {
+                if (curmode.paymentType === PayStyle.hyczk) {
                   if (curmode.cardTypeEnum === 'BALANCE_CARD') {
                     !curmode.freePaymentPasswordStore && _this2.setState({
                       confirmStatus: true
@@ -2345,7 +2344,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
               }
 
-              if (curmode.paymentType !== PayStyle.hyczk || curmode.freePaymentPasswordStore || !curmode.isNeedPassword) {
+              pwdStatus = true;
+
+              if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                if (!curmode.freePaymentPasswordStore) {
+                  pwdStatus = false;
+                }
+              } else {
+                if (curmode.isNeedPassword) {
+                  pwdStatus = false;
+                }
+              }
+
+              if (curmode.paymentType !== PayStyle.hyczk || pwdStatus) {
                 handleUserInputs = function () {
                   var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
                     var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
@@ -2506,7 +2517,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 handleUserInputs(promises);
               }
 
-            case 5:
+            case 8:
             case 'end':
               return _context16.stop();
           }
@@ -2715,27 +2726,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 _modalWraper2.default.confirm({
                   className: 'not-selectable-voucher',
-                  title: '提示',
-                  icon: false,
+                  title: '以下零售单尚未生成零售结算单，不能进行收款',
                   content: _react2.default.createElement(
-                    'div',
+                    'ul',
                     null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 'content-title' },
-                      '\u4EE5\u4E0B\u96F6\u552E\u5355\u5C1A\u672A\u751F\u6210\u96F6\u552E\u7ED3\u7B97\u5355\uFF0C\u4E0D\u80FD\u8FDB\u884C\u6536\u6B3E'
-                    ),
-                    _react2.default.createElement(
-                      'ul',
-                      null,
-                      notSelectableVoucherList.map(function (o) {
-                        return _react2.default.createElement(
-                          'li',
-                          null,
-                          o.Code
-                        );
-                      })
-                    )
+                    notSelectableVoucherList.map(function (o) {
+                      return _react2.default.createElement(
+                        'li',
+                        null,
+                        o.Code
+                      );
+                    })
                   )
                 });
                 return _context18.abrupt('return');