tplus-components-touch 3.18.12 → 3.21.1

package/dist/components/settlement/settlement.js

@@ -250,7 +250,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       discountRetailTotalAount: null,
       discountPrototypeTotalAmount: null,
       bquick: false,
-      currentKey: null };
+      currentKey: null,
+      couponLight: true };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -568,10 +569,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           var isReturn = _this2.props.isReturn;
 
           var sMember = _this2.store.member;
-          if (!sMember.StorageCardEnable) {
-            _message2.default.warn("该储值卡已停用");
-            return;
-          }
           if (sMember && sMember.ID) {
             // noPlaySetPwd 点击结算方式设置密码，点加号不设置
             if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
@@ -581,6 +578,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 showSetPwdModal: true
               });
             } else {
+              if (!sMember.StorageCardEnable) {
+                _message2.default.warn("该储值卡已停用");
+                return;
+              }
               _this2.setState({
                 showSetPwdModal: false,
                 czkVisible: true
@@ -616,7 +617,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.handleCzkOk = function () {
       var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
-        var _enumController$getEn3, PayStyle;
+        var sMember, _enumController$getEn3, PayStyle;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
@@ -630,46 +631,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //   });
                 //   return;
                 // }
+                sMember = _this2.store.member;
+
+                if (sMember.StorageCardEnable) {
+                  _context.next = 4;
+                  break;
+                }
+
+                _message2.default.warn("该储值卡已停用");
+                return _context.abrupt('return');
+
+              case 4:
                 _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
                 if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 4;
+                  _context.next = 8;
                   break;
                 }
 
-                _context.next = 4;
+                _context.next = 8;
                 return _this2.store.loadCzk(_this2.czkInput.input.value);
 
-              case 4:
+              case 8:
                 if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 7;
+                  _context.next = 11;
                   break;
                 }
 
                 _message2.default.error("请录入储值卡！");
                 return _context.abrupt('return');
 
-              case 7:
+              case 11:
                 if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
                   return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.member.id == _this2.store.paymode.currentMode.member.id;
                 })) {
-                  _context.next = 10;
+                  _context.next = 14;
                   break;
                 }
 
                 _message2.default.error("该储值卡已使用。");
                 return _context.abrupt('return');
 
-              case 10:
+              case 14:
                 if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                  _context.next = 13;
+                  _context.next = 17;
                   break;
                 }
 
                 _message2.default.error("实收金额应等于应收金额。");
                 return _context.abrupt('return');
 
-              case 13:
+              case 17:
 
                 _this2.setState({
                   czkVisible: false
@@ -678,7 +690,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.store.paymode.calcMemberBalance();
                 _this2.handleCzk();
 
-              case 17:
+              case 21:
               case 'end':
                 return _context.stop();
             }
@@ -1208,7 +1220,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.showCzkModal(-1, bappend, params);
     };
 
-    _this2.djqChecked = function (q) {
+    _this2.djqChecked = function (q, dto) {
       var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
           Differentiate = _enumController$getEn14.Differentiate;
 
@@ -1216,7 +1228,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
         return;
       }
-      _this2.store.paymode.calcDjqValue(q);
+      _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+      // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
+      // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
     };
 
     _this2.addDjq = function () {
@@ -2975,6 +2989,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
+    _this2.couponClick = function () {
+      _this2.setState({
+        couponLight: !_this2.state.couponLight
+      });
+    };
+
     _this2.hasElectron = hasElectron;
 
     var _ref22 = _mutantsMicrofx.localStore.get('user') || {},
@@ -4870,6 +4890,25 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   currentMode && currentMode.errinfo
                 )
               ),
+              _react2.default.createElement(
+                'div',
+                { className: 'col4' },
+                _react2.default.createElement(
+                  _button2.default,
+                  { className: '' + (this.state.couponLight ? "primary-color b-theme" : 'couponBorder'), onClick: this.couponClick },
+                  '\u53EF\u7528\u4F18\u60E0\u5238'
+                ),
+                _react2.default.createElement(
+                  _button2.default,
+                  { className: '' + (!this.state.couponLight ? "primary-color b-theme" : 'couponBorder'), onClick: this.couponClick },
+                  '\u4E0D\u53EF\u7528\u4F18\u60E0\u5238'
+                ),
+                _react2.default.createElement(
+                  'span',
+                  { className: 'couponTip' },
+                  '\u9009\u62E9\u5238\u540E\u3001\u4E0D\u53EF\u53E0\u52A0\u3001\u91D1\u989D\u4E0D\u6EE1\u8DB3\u7684\u5238\u4F1A\u7F6E\u7070'
+                )
+              ),
               this.isHorizontalPad && _react2.default.createElement(
                 'div',
                 { className: 'col3' },
@@ -4886,12 +4925,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 'div',
                 { className: 'djq2' },
                 (0, _map3.default)(currentMode && currentMode.djqs || [], function (q, index) {
+                  if (!_this8.state.couponLight && !q.count) {
+                    return;
+                  }
+                  if (_this8.state.couponLight && q.count && q.count === 1) {
+                    return;
+                  }
                   return _react2.default.createElement(
                     'div',
                     { key: index + '', className: 'djqItem' },
                     !q.promoMethodEnum || q.promoMethodEnum == 'CASH_COUPON' ? _react2.default.createElement(
                       'div',
-                      { className: 'djqLeft djqLeftCash' },
+                      { className: 'djqLeft ' + (q.IsEnable ? 'djqLeftCash' : 'djqLeftCashGrey') },
                       _react2.default.createElement(
                         'div',
                         { className: 'amount' },
@@ -4937,9 +4982,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)('djqRight', { 'djqRightSelected': q.checked }), onClick: function onClick(e) {
-                          return _this8.djqChecked(q);
+                          return q.IsEnable ? _this8.djqChecked(q, _this8.props.dto) : null;
                         } },
-                      _react2.default.createElement(
+                      q.checked ? _react2.default.createElement(_ticon2.default, { className: 'checkIcon primary-color', type: 'xuanzhong1' }) : _react2.default.createElement('span', { className: '' + (q.IsEnable ? 'noxuanzhong' : 'noxuanzhong1') }),
+                      q.checked ? _react2.default.createElement(
+                        'div',
+                        { className: 'name overflow-hidden-point primary-color' },
+                        q.name
+                      ) : _react2.default.createElement(
                         'div',
                         { className: 'name overflow-hidden-point' },
                         q.name