tplus-components-touch 3.27.3 → 3.28.3

package/dist/components/settlement/settlement.js

@@ -24,10 +24,6 @@ var _carousel = require('antd/es/carousel');
 
 var _carousel2 = _interopRequireDefault(_carousel);
 
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
 var _button = require('antd/es/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -329,7 +325,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn.PayStyle;
 
-      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto);
+      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto, currentKey);
       var amount = _this2.store.paymode.amount;
       if (amount == 0) {
         _this2.settleZero();
@@ -595,10 +591,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         //         czkVisible: true
         //       })
         //     }
-        //   }
+        //   } 
         //   // else {
         //   //   Message.warn('请先录入会员');
-        //   // }
+        //   // } 
         //   // this.setState({
         // //   czkVisible: true,
         // // });
@@ -1424,7 +1420,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
-      _this2.store.changeClickFocusOnly(mode.paymentType);
+      // this.store.changeClickFocusOnly(mode.paymentType);
       _this2.setCurrentFocusOnly(mode.paymentType);
       if (_this2.hotkeydebounced) {
         _this2.hotkeydebounced.cancel();
@@ -2497,170 +2493,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
-    _this2.isNoProductTip = function (nonProductMap) {
-      var names = [];
-      var temphtml = [];
-      var count = 0;
-      if ((0, _keys2.default)(nonProductMap).length > 0) {
-        for (var key in nonProductMap) {
-          count++;
-          names.push('【' + key + '】');
-          temphtml.push(count + '、' + nonProductMap[key]);
-        }
-        _modalWraper2.default.warning({
-          title: '不可配送商品',
-          content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join('；')
-        });
-        return true;
-      }
-      return false;
-    };
-
-    _this2.btnDebounced = function () {
-      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
-        var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref26, nonProductMap, _ref26$freightProduct, freightProductDTOList, data, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
-
-        return _regenerator2.default.wrap(function _callee14$(_context14) {
-          while (1) {
-            switch (_context14.prev = _context14.next) {
-              case 0:
-                _ref25 = _this2.context.viewModel.data || {}, IdbusiType = _ref25.IdbusiType, CustomerPhone = _ref25.CustomerPhone, DistributionMode = _ref25.DistributionMode;
-                //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
-
-                if (!(IdbusiType == 38)) {
-                  _context14.next = 28;
-                  break;
-                }
-
-                if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 5;
-                  break;
-                }
-
-                _context14.next = 5;
-                return _this2.props.openBuyerModal();
-
-              case 5:
-                if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 28;
-                  break;
-                }
-
-                _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
-                IPMSG = {};
-
-                if (!!window.localStorage.IPMSG) {
-                  IPMSG = JSON.parse(window.localStorage.IPMSG);
-                }
-                _context14.next = 11;
-                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
-
-              case 11:
-                _ref26 = _context14.sent;
-                nonProductMap = _ref26.nonProductMap;
-                _ref26$freightProduct = _ref26.freightProductDTOList;
-                freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
-
-                console.log('zlfnonProductMap', nonProductMap);
-                console.log('zlffreightProductDTOList', freightProductDTOList);
-
-                if (!_this2.isNoProductTip(nonProductMap)) {
-                  _context14.next = 19;
-                  break;
-                }
-
-                return _context14.abrupt('return');
-
-              case 19:
-                _context14.next = 21;
-                return _this2.props.openWareHouseModal(freightProductDTOList);
-
-              case 21:
-                _context14.next = 23;
-                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
-
-              case 23:
-                data = _context14.sent;
-
-                if (!_this2.isNoProductTip(data.nonProductMap)) {
-                  _context14.next = 26;
-                  break;
-                }
-
-                return _context14.abrupt('return');
-
-              case 26:
-                _context14.next = 28;
-                return _this2.props.updataFreight(data.freight);
+    _this2.btnDebounced = function (type, bquick) {
+      _this2.setState({
+        bquick: bquick
+      });
 
-              case 28:
+      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn22.PayStyle;
 
-                _this2.setState({
-                  bquick: bquick
-                });
-                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
-                _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
-
-                if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
-                  _context14.next = 33;
-                  break;
-                }
+      var _this2$store7 = _this2.store,
+          paymode = _this2$store7.paymode,
+          brefund = _this2$store7.brefund,
+          boriginReturn = _this2$store7.boriginReturn,
+          newStyle = _this2$store7.newStyle;
 
-                return _context14.abrupt('return', false);
 
-              case 33:
-                status = false;
+      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
 
-                paymode.thePaymodes.forEach(function (v) {
-                  if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
-                    status = true;
-                  }
-                });
-                _this2.setState({
-                  isXianjin: status ? true : false
-                });
-
-                if (!_this2.btndebounced) {
-                  _context14.next = 38;
-                  break;
-                }
-
-                return _context14.abrupt('return');
-
-              case 38:
-                _this2.btndebounced = (0, _debounce3.default)(function () {
-                  if (bquick) {
-                    _this2.quickSettle(type);
-                  } else {
-                    _this2.showModal();
-                  }
-                }, 1000, {
-                  'leading': true,
-                  'trailing': false
-                });
-                _this2.btndebounced();
-                setTimeout(function () {
-                  _this2.btndebounced.cancel();
-                  _this2.btndebounced = null;
-                }, 2000);
-
-              case 41:
-              case 'end':
-                return _context14.stop();
-            }
-          }
-        }, _callee14, _this3);
-      }));
+      var status = false;
+      paymode.thePaymodes.forEach(function (v) {
+        if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
+          status = true;
+        }
+      });
+      _this2.setState({
+        isXianjin: status ? true : false
+      });
 
-      return function (_x8, _x9) {
-        return _ref24.apply(this, arguments);
-      };
-    }();
+      if (_this2.btndebounced) {
+        return;
+      }
+      _this2.btndebounced = (0, _debounce3.default)(function () {
+        if (bquick) {
+          _this2.quickSettle(type);
+        } else {
+          _this2.showModal();
+        }
+      }, 1000, {
+        'leading': true,
+        'trailing': false
+      });
+      _this2.btndebounced();
+      setTimeout(function () {
+        _this2.btndebounced.cancel();
+        _this2.btndebounced = null;
+      }, 2000);
+    };
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref27 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref27.isNewRetailBCPos;
+      var _ref24 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2797,11 +2680,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
-      var _this2$context$viewMo2 = _this2.context.viewModel.data,
-          BuyerPayFreight = _this2$context$viewMo2.BuyerPayFreight,
-          DistributionMode = _this2$context$viewMo2.DistributionMode;
       // 付款弹窗
-
       return new _promise2.default(function (resolve, reject) {
         var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
             PayStyle = _enumController$getEn26.PayStyle,
@@ -2890,14 +2769,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'yfje' },
-                paymode.value,
-                (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? _react2.default.createElement(
-                  'span',
-                  { className: 'freight' },
-                  '(\u5305\u542B',
-                  BuyerPayFreight,
-                  '\u5143\u8FD0\u8D39)'
-                ) : null
+                paymode.value
               )
             ),
             paymode.paymentType == PayStyle.xianjin && _react2.default.createElement(
@@ -3077,9 +2949,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCurrentModeHaveMutex = function (type) {
-      var _this2$store9 = _this2.store,
-          paymode = _this2$store9.paymode,
-          newStyle = _this2$store9.newStyle;
+      var _this2$store8 = _this2.store,
+          paymode = _this2$store8.paymode,
+          newStyle = _this2$store8.newStyle;
 
       var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn27.PayStyle;
@@ -3252,24 +3124,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref28 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref28$loginInfo = _ref28.loginInfo;
-
-    _ref28$loginInfo = _ref28$loginInfo === undefined ? {} : _ref28$loginInfo;
-    var ICCardServer = _ref28$loginInfo.ICCardServer,
-        ICCardPassword = _ref28$loginInfo.ICCardPassword,
-        Book = _ref28$loginInfo.Book,
-        PercentageWhenBook = _ref28$loginInfo.PercentageWhenBook;
+    var _ref25 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        ICCardServer = _ref25.ICCardServer,
+        ICCardPassword = _ref25.ICCardPassword;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
-    _this2.isBook = Book;
-    _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref29 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref29.isHorizontalPad,
-        isHorizontalSunMi = _ref29.isHorizontalSunMi;
+    var _ref26 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref26.isHorizontalPad,
+        isHorizontalSunMi = _ref26.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3384,11 +3249,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     //jfdx
 
 
-    /**
-     *
-     * @param {*} thePaymodes 支付方式列表
-     * @param {*} currenIndex  当前支付方式下标
-     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
+    /**
+     *
+     * @param {*} thePaymodes 支付方式列表
+     * @param {*} currenIndex  当前支付方式下标
+     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
     // 处理客显显示功能
@@ -3504,8 +3369,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
           storageValue = _state2.storageValue;
 
-      var _ref30 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref30.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3524,21 +3389,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
-
-      //收订金
-
-      var _ref31 = this.context && this.context.viewModel && this.context.viewModel.data,
-          IdbusiType = _ref31.IdbusiType,
-          DistributionMode = _ref31.DistributionMode,
-          BuyerPayFreight = _ref31.BuyerPayFreight;
-
-      if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-        totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
-      }
-      if (IdbusiType == 39) {
-        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
-      }
-
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
         return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
@@ -3583,11 +3433,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref32 = quantityDetail || {},
-          _ref32$buyQuantity = _ref32.buyQuantity,
-          buyQuantity = _ref32$buyQuantity === undefined ? 0 : _ref32$buyQuantity,
-          _ref32$returnQuantity = _ref32.returnQuantity,
-          returnQuantity = _ref32$returnQuantity === undefined ? 0 : _ref32$returnQuantity;
+      var _ref28 = quantityDetail || {},
+          _ref28$buyQuantity = _ref28.buyQuantity,
+          buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
+          _ref28$returnQuantity = _ref28.returnQuantity,
+          returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3972,20 +3822,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       { className: 'received' },
                       (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
                     )
-                  ),
-                  _react2.default.createElement(
-                    'div',
-                    { className: 'receivable', style: { display: (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
-                    _react2.default.createElement(
-                      'span',
-                      null,
-                      '\u8FD0\u8D39'
-                    ),
-                    _react2.default.createElement(
-                      'span',
-                      { className: 'received' },
-                      (0, _utils.getFixedNumber)(Math.abs(BuyerPayFreight))
-                    )
                   )
                 ),
                 !isReturn && _react2.default.createElement(
@@ -4202,7 +4038,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             //     return;
                             //   }
                             // }
-                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
+                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
                             _this8.onHotKeyClick1(mode, index, boriginReturn);
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
@@ -4980,8 +4816,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(_ref33) {
-                    return _this8["inputCzkAmount"] = _ref33;
+                  ref: function ref(_ref29) {
+                    return _this8["inputCzkAmount"] = _ref29;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5598,8 +5434,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(_ref34) {
-                    return _this8["inputJfdxAmount"] = _ref34;
+                  ref: function ref(_ref30) {
+                    return _this8["inputJfdxAmount"] = _ref30;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";