tplus-components-touch 3.27.12 → 3.27.16

package/dist/components/settlement/settlement.js

@@ -16,6 +16,14 @@ var _drawer = require('antd/es/drawer');
 
 var _drawer2 = _interopRequireDefault(_drawer);
 
+var _table = require('antd/es/table');
+
+var _table2 = _interopRequireDefault(_table);
+
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -24,10 +32,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);
@@ -92,6 +96,8 @@ require('antd/es/modal/style');
 
 require('antd/es/drawer/style');
 
+require('antd/es/table/style');
+
 require('antd/es/carousel/style');
 
 require('antd/es/button/style');
@@ -359,7 +365,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           isReturn = _this2$props.isReturn,
           type = _this2$props.type;
 
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate(function (data) {
+        return _this2.isNoProductTip(data);
+      })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -478,7 +486,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var isAutoShowCouponWhenCash = (0, _tplusPoslogin.PosInitData)('IsAutoShowCouponWhenCash');
       // 支持异步验证过程
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate(function (data) {
+        return _this2.isNoProductTip(data);
+      })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -2497,38 +2507,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
-    _this2.isNoProductTip = function (nonProductMap) {
-      var _ref24 = _this2.context.viewModel.data || {},
-          RetailDetails = _ref24.RetailDetails;
-
-      var names = [];
-      var temphtml = [];
-      var count = 0;
-      if ((0, _keys2.default)(nonProductMap).length > 0) {
-        var _loop = function _loop(key) {
-          count++;
-          var product = RetailDetails.find(function (o) {
-            return o.Idinventory == key;
-          });
-          names.push('【' + product.Inventory.Name + '】');
-          temphtml.push(count + '、' + nonProductMap[key]);
-        };
-
-        for (var key in nonProductMap) {
-          _loop(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 _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
-        var 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;
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
+        var IdbusiType, CustomerPhone, DistributionMode, Address, title, _enumController$getEn22, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee14$(_context14) {
           while (1) {
@@ -2537,87 +2518,39 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
                 CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
                 DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
+                Address = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.Address;
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context14.next = 28;
+                  _context14.next = 9;
                   break;
                 }
 
                 if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 7;
+                  _context14.next = 9;
                   break;
                 }
 
-                _context14.next = 7;
-                return _this2.props.openBuyerModal();
-
-              case 7:
-                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 = 13;
-                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
-
-              case 13:
-                _ref26 = _context14.sent;
-                nonProductMap = _ref26.nonProductMap;
-                _ref26$freightProduct = _ref26.freightProductDTOList;
-                freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
-
-                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 });
+                title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
+                _context14.next = 9;
+                return _this2.props.openBuyerModal(title);
 
-              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);
-
-              case 28:
+              case 9:
 
                 _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;
+                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
 
                 if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
-                  _context14.next = 33;
+                  _context14.next = 14;
                   break;
                 }
 
                 return _context14.abrupt('return', false);
 
-              case 33:
+              case 14:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2630,13 +2563,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context14.next = 38;
+                  _context14.next = 19;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 38:
+              case 19:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2653,7 +2586,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 41:
+              case 22:
               case 'end':
                 return _context14.stop();
             }
@@ -2662,14 +2595,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x8, _x9) {
-        return _ref25.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref27 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref27.isNewRetailBCPos;
+      var _ref25 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2749,6 +2682,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         value = parseFloat(receivable) + parseFloat(inputTarget2.innerHTML);
       }
       inputTarget.value = value;
+      //TODO 这里修改找零计算，应减去取货时最大支付金额，或者预订时，找零计算应该是小于应收，按现有计算找零，大于应收小于最大比例金额，不找零，大于最大比例金额找零
       inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
     };
 
@@ -3084,9 +3018,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;
@@ -3259,11 +3193,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        ICCardServer = _ref28.ICCardServer,
-        ICCardPassword = _ref28.ICCardPassword,
-        PreSellOrBook = _ref28.PreSellOrBook,
-        PercentageWhenBook = _ref28.PercentageWhenBook;
+    var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        ICCardServer = _ref26.ICCardServer,
+        ICCardPassword = _ref26.ICCardPassword,
+        PreSellOrBook = _ref26.PreSellOrBook,
+        PercentageWhenBook = _ref26.PercentageWhenBook;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
@@ -3271,9 +3205,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref29 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref29.isHorizontalPad,
-        isHorizontalSunMi = _ref29.isHorizontalSunMi;
+    var _ref27 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref27.isHorizontalPad,
+        isHorizontalSunMi = _ref27.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3388,17 +3322,87 @@ 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截止
      */
 
     // 处理客显显示功能
 
     //that[`inputS${paymode.paymethodId}`]
 
+  }, {
+    key: 'isNoProductTip',
+    value: function isNoProductTip(nonProductMap) {
+      var _ref28 = this.context.viewModel.data || {},
+          RetailDetails = _ref28.RetailDetails;
+
+      var temphtml = [];
+      if ((0, _keys2.default)(nonProductMap).length > 0) {
+        var columns = [{
+          title: '商品名称',
+          dataIndex: 'name',
+          key: 'name',
+          ellipsis: true
+        }, {
+          title: '原因',
+          dataIndex: 'reason',
+          key: 'reason',
+          ellipsis: true
+        }];
+
+        var _loop = function _loop(key) {
+          var product = RetailDetails.find(function (o) {
+            return o.Idinventory == key;
+          });
+          temphtml.push({ name: product.Inventory.Name, reason: nonProductMap[key] });
+        };
+
+        for (var key in nonProductMap) {
+          _loop(key);
+        }
+        var modal = (0, _asyncModal2.default)({
+          onPressEnter: function onPressEnter() {
+            modal.destroy();
+          },
+          maskClosable: false,
+          keyboard: false,
+          closable: true,
+          title: '不可配送商品',
+          width: 600,
+          className: '',
+          content: _react2.default.createElement(
+            'div',
+            { className: 'not-distribution-tip' },
+            _react2.default.createElement(
+              'div',
+              { className: 'tip-content' },
+              _react2.default.createElement(_table2.default, {
+                columns: columns,
+                dataSource: temphtml,
+                scroll: { y: 240 },
+                pagination: false,
+                size: 'middle' })
+            ),
+            _react2.default.createElement(
+              'div',
+              { className: 'not-distribution-btn' },
+              _react2.default.createElement(
+                _button2.default,
+                { type: 'primary', onClick: function onClick() {
+                    modal.destroy();
+                  } },
+                '\u77E5\u9053\u4E86'
+              )
+            )
+          )
+        });
+        return true;
+      }
+      return false;
+    }
   }, {
     key: 'checkThepaymode',
     value: function checkThepaymode(key) {
@@ -3508,8 +3512,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
           storageValue = _state2.storageValue;
 
-      var _ref30 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref30.isNewRetailBCPos;
+      var _ref29 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref29.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3584,11 +3588,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref31 = quantityDetail || {},
-          _ref31$buyQuantity = _ref31.buyQuantity,
-          buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
-          _ref31$returnQuantity = _ref31.returnQuantity,
-          returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
+      var _ref30 = quantityDetail || {},
+          _ref30$buyQuantity = _ref30.buyQuantity,
+          buyQuantity = _ref30$buyQuantity === undefined ? 0 : _ref30$buyQuantity,
+          _ref30$returnQuantity = _ref30.returnQuantity,
+          returnQuantity = _ref30$returnQuantity === undefined ? 0 : _ref30$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4981,8 +4985,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(_ref32) {
-                    return _this8["inputCzkAmount"] = _ref32;
+                  ref: function ref(_ref31) {
+                    return _this8["inputCzkAmount"] = _ref31;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5599,8 +5603,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(_ref33) {
-                    return _this8["inputJfdxAmount"] = _ref33;
+                  ref: function ref(_ref32) {
+                    return _this8["inputJfdxAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";