tplus-components-touch 3.21.2 → 3.22.1

package/dist/components/settlement/settlement.js

@@ -250,8 +250,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       discountRetailTotalAount: null,
       discountPrototypeTotalAmount: null,
       bquick: false,
-      currentKey: null,
-      couponLight: true };
+      currentKey: null };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -432,6 +431,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         //有赠品的情况，不在考虑是否促销
         if (item.IsPresent) {
           item.badge = { text: '赠', position: 'leftTop', className: '' };
+        } else if (item.IsGWPBuyGift) {
+          item.badge = { text: '换', position: 'leftTop', className: '' };
         } else if (item.PromotionDetails && item.PromotionDetails.length > 0) {
           item.badge = { text: '促', position: 'leftTop', className: '' };
         } else {
@@ -850,10 +851,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       _this2.store.setCurrentMode(id, PayStyle.djq);
       _this2.setState({
-        djqVisible: true,
-        couponLight: true
+        djqVisible: true
       });
-      _this2.store.paymode.calcCheckList();
       setTimeout(function () {
         _this2.inputdjq && _this2.inputdjq.input && _this2.inputdjq.input.focus();
       }, 200);
@@ -1222,7 +1221,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.showCzkModal(-1, bappend, params);
     };
 
-    _this2.djqChecked = function (q, dto) {
+    _this2.djqChecked = function (q) {
       var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
           Differentiate = _enumController$getEn14.Differentiate;
 
@@ -1230,17 +1229,7 @@ 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;
       }
-
-      var _ref8 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref8.isNewRetailBCPos;
-
-      if (isNewRetailBCPos) {
-        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
-      } else {
-        _this2.store.paymode.calcDjqValue(q);
-      }
-      // 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.store.paymode.calcDjqValue(q);
     };
 
     _this2.addDjq = function () {
@@ -1672,13 +1661,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref11 = dt || {},
-          guestshow_enable = _ref11.guestshow_enable,
-          guestshow_clear = _ref11.guestshow_clear,
-          guestshow_welcome = _ref11.guestshow_welcome,
-          guestshow_collect = _ref11.guestshow_collect,
-          guestshow_refund = _ref11.guestshow_refund,
-          guestshow_change = _ref11.guestshow_change;
+      var _ref10 = dt || {},
+          guestshow_enable = _ref10.guestshow_enable,
+          guestshow_clear = _ref10.guestshow_clear,
+          guestshow_welcome = _ref10.guestshow_welcome,
+          guestshow_collect = _ref10.guestshow_collect,
+          guestshow_refund = _ref10.guestshow_refund,
+          guestshow_change = _ref10.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1713,9 +1702,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(args) {
+      var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(args) {
         var handleUserInputs = function () {
-          var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(promises) {
+          var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee7$(_context7) {
@@ -1806,7 +1795,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x4) {
-            return _ref14.apply(this, arguments);
+            return _ref13.apply(this, arguments);
           };
         }();
 
@@ -1909,7 +1898,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(values) {
+                  var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee6$(_context6) {
                       while (1) {
@@ -1983,7 +1972,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x3) {
-                    return _ref13.apply(this, arguments);
+                    return _ref12.apply(this, arguments);
                   };
                 }();
 
@@ -1998,13 +1987,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x2) {
-        return _ref12.apply(this, arguments);
+        return _ref11.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
       var handleUserInputs = function () {
-        var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -2101,11 +2090,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x6) {
-          return _ref18.apply(this, arguments);
+          return _ref17.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref16, isNewRetailBCPos, _enumController$getEn20, PayStyle, commit;
+      var that, curmode, promises, _ref15, isNewRetailBCPos, _enumController$getEn20, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee11$(_context11) {
         while (1) {
@@ -2114,7 +2103,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
+              _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
@@ -2131,7 +2120,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
@@ -2181,7 +2170,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x5) {
-                  return _ref17.apply(this, arguments);
+                  return _ref16.apply(this, arguments);
                 };
               }();
 
@@ -2232,7 +2221,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(paymode) {
+      var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee12$(_context12) {
           while (1) {
@@ -2248,8 +2237,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref20 = that.state || {},
-                          confirmPwd = _ref20.confirmPwd;
+                      var _ref19 = that.state || {},
+                          confirmPwd = _ref19.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2339,8 +2328,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref21 = that.state || {},
-                                    confirmPwd = _ref21.confirmPwd;
+                                var _ref20 = that.state || {},
+                                    confirmPwd = _ref20.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2381,7 +2370,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x7) {
-        return _ref19.apply(this, arguments);
+        return _ref18.apply(this, arguments);
       };
     }();
 
@@ -2431,8 +2420,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref22 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref22.isNewRetailBCPos;
+      var _ref21 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2999,28 +2988,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.couponClick = function () {
-      _this2.setState({
-        couponLight: !_this2.state.couponLight
-      });
-    };
-
     _this2.hasElectron = hasElectron;
 
-    var _ref23 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref23$loginInfo = _ref23.loginInfo;
+    var _ref22 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref22$loginInfo = _ref22.loginInfo;
 
-    _ref23$loginInfo = _ref23$loginInfo === undefined ? {} : _ref23$loginInfo;
-    var ICCardServer = _ref23$loginInfo.ICCardServer,
-        ICCardPassword = _ref23$loginInfo.ICCardPassword;
+    _ref22$loginInfo = _ref22$loginInfo === undefined ? {} : _ref22$loginInfo;
+    var ICCardServer = _ref22$loginInfo.ICCardServer,
+        ICCardPassword = _ref22$loginInfo.ICCardPassword;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref24 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref24.isHorizontalPad,
-        isHorizontalSunMi = _ref24.isHorizontalSunMi;
+    var _ref23 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref23.isHorizontalPad,
+        isHorizontalSunMi = _ref23.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3254,8 +3237,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount;
 
-      var _ref25 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref25.isNewRetailBCPos;
+      var _ref24 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3318,11 +3301,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref26 = quantityDetail || {},
-          _ref26$buyQuantity = _ref26.buyQuantity,
-          buyQuantity = _ref26$buyQuantity === undefined ? 0 : _ref26$buyQuantity,
-          _ref26$returnQuantity = _ref26.returnQuantity,
-          returnQuantity = _ref26$returnQuantity === undefined ? 0 : _ref26$returnQuantity;
+      var _ref25 = quantityDetail || {},
+          _ref25$buyQuantity = _ref25.buyQuantity,
+          buyQuantity = _ref25$buyQuantity === undefined ? 0 : _ref25$buyQuantity,
+          _ref25$returnQuantity = _ref25.returnQuantity,
+          returnQuantity = _ref25$returnQuantity === undefined ? 0 : _ref25$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4682,8 +4665,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref27) {
-                    return _this8["inputCzkAmount"] = _ref27;
+                  ref: function ref(_ref26) {
+                    return _this8["inputCzkAmount"] = _ref26;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -4693,6 +4676,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
+                    var sMember = _this8.store.member;
+                    if (!sMember.StorageCardEnable) {
+                      _message2.default.warn("该储值卡已停用");
+                      return;
+                    }
                     _keyboard2.default.close();
                     _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
                   }
@@ -4900,25 +4888,6 @@ 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' },
@@ -4935,18 +4904,12 @@ 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 ' + (q.IsEnable ? 'djqLeftCash' : 'djqLeftCashGrey') },
+                      { className: 'djqLeft djqLeftCash' },
                       _react2.default.createElement(
                         'div',
                         { className: 'amount' },
@@ -4968,7 +4931,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       )
                     ) : _react2.default.createElement(
                       'div',
-                      { className: 'djqLeft ' + (q.IsEnable ? 'djqLeftCash' : 'djqLeftCashGrey') },
+                      { className: 'djqLeft djqLeftDiscount' },
                       _react2.default.createElement(
                         'div',
                         { className: 'amount' },
@@ -4992,14 +4955,9 @@ 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 q.IsEnable ? _this8.djqChecked(q, _this8.props.dto) : null;
+                          return _this8.djqChecked(q);
                         } },
-                      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(
+                      _react2.default.createElement(
                         'div',
                         { className: 'name overflow-hidden-point' },
                         q.name
@@ -5298,8 +5256,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _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)),
-                  ref: function ref(_ref28) {
-                    return _this8["inputJfdxAmount"] = _ref28;
+                  ref: function ref(_ref27) {
+                    return _this8["inputJfdxAmount"] = _ref27;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";