tplus-components-touch 3.20.1 → 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();
     });
@@ -564,42 +565,42 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           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
-        });
+        if (isNewRetailBCPos) {
+          var isReturn = _this2.props.isReturn;
+
+          var sMember = _this2.store.member;
+          if (sMember && sMember.ID) {
+            // noPlaySetPwd 点击结算方式设置密码，点加号不设置
+            if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
+              _this2.setState({
+                newPass: '',
+                newPassConfirm: '',
+                showSetPwdModal: true
+              });
+            } else {
+              if (!sMember.StorageCardEnable) {
+                _message2.default.warn("该储值卡已停用");
+                return;
+              }
+              _this2.setState({
+                showSetPwdModal: false,
+                czkVisible: true
+              });
+            }
+          } else {
+            _message2.default.warn('请先录入会员');
+          }
+          // this.setState({
+          //   czkVisible: true,
+          // });
+        } else {
+          _this2.setState({
+            czkVisible: true
+          });
+        }
+        // this.setState({
+        //   czkVisible: true,
+        // });
       }
       setTimeout(function () {
         if (!currentMode.member || !currentMode.member.id) {
@@ -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 () {
@@ -2081,7 +2095,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         };
       }();
 
-      var that, curmode, promises, _ref15, isNewRetailBCPos, _enumController$getEn20, PayStyle, isNeedPasswordForStoragePay, commit;
+      var that, curmode, promises, _ref15, isNewRetailBCPos, _enumController$getEn20, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee11$(_context11) {
         while (1) {
@@ -2097,11 +2111,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
-
-                    if (isNeedPasswordForStoragePay) {
-                      promises.push(that.inputPwd(curmode));
-                    }
+                    promises.push(that.inputPwd(curmode));
                   }
                 }
               } else {
@@ -2979,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') || {},
@@ -3313,8 +3329,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         sumQuantity = this.changeDecimalBuZero(sumQuantity, quantityPrecision);
       }
-
-      var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
@@ -3555,14 +3569,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             return _this8.handleChange(index, e);
                           }
                         })
-                      ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
-                        'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3889,16 +3895,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
                           disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
                           onClick: function onClick() {
-                            // let czkinput = document.getElementById('inputS' + index);
-                            // if (mode.paymentType === PayStyle.hyczk) {
-                            //   const { isProhibitMeStorageCard } = this.props;
-                            //   if (isProhibitMeStorageCard) {
-                            //     Message.warn('储值卡不可键盘录入，请刷卡!');
-                            //     return;
-                            //   }
-                            // }
-                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
-                            _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            var czkinput = document.getElementById('inputS' + index);
+                            if (mode.paymentType === PayStyle.hyczk) {
+                              var isProhibitMeStorageCard = _this8.props.isProhibitMeStorageCard;
+
+                              if (isProhibitMeStorageCard) {
+                                _message2.default.warn('储值卡不可键盘录入，请刷卡!');
+                                return;
+                              }
+                            }
+                            mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? _this8.editCzkModal() : _this8.onHotKeyClick1(mode, index, boriginReturn);
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
                             return tm.paymentType == PayStyle.hyczk;
@@ -4152,14 +4158,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             return _this8.onFocusHack(index, mode, paymode, e);
                           }
                         })
-                      ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
-                        'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode('', 'noPlaySetPwd');
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4607,7 +4605,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   type: 'text',
                   placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
                   // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
-                  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
+                  , disabled: true,
+                  className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
@@ -4891,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' },
@@ -4907,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' },
@@ -4958,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