tplus-components-touch 3.27.11 → 3.27.15

package/dist/components/settlement/settlement.js

@@ -24,6 +24,10 @@ var _carousel = require('antd/es/carousel');
 
 var _carousel2 = _interopRequireDefault(_carousel);
 
+var _table = require('antd/es/table');
+
+var _table2 = _interopRequireDefault(_table);
+
 var _keys = require('babel-runtime/core-js/object/keys');
 
 var _keys2 = _interopRequireDefault(_keys);
@@ -94,6 +98,8 @@ require('antd/es/drawer/style');
 
 require('antd/es/carousel/style');
 
+require('antd/es/table/style');
+
 require('antd/es/button/style');
 
 var _react = require('react');
@@ -2501,25 +2507,65 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _ref24 = _this2.context.viewModel.data || {},
           RetailDetails = _ref24.RetailDetails;
 
-      var names = [];
       var temphtml = [];
-      var count = 0;
       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) {
-          count++;
           var product = RetailDetails.find(function (o) {
             return o.Idinventory == key;
           });
-          names.push('【' + product.Inventory.Name + '】');
-          temphtml.push(count + '、' + nonProductMap[key]);
+          temphtml.push({ name: product.Inventory.Name, reason: nonProductMap[key] });
         };
 
         for (var key in nonProductMap) {
           _loop(key);
         }
-        _modalWraper2.default.warning({
+        var modal = (0, _asyncModal2.default)({
+          onPressEnter: function onPressEnter() {
+            modal.destroy();
+          },
+          maskClosable: false,
+          keyboard: false,
+          closable: true,
           title: '不可配送商品',
-          content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join('；')
+          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;
       }
@@ -2528,7 +2574,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _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 IdbusiType, CustomerPhone, DistributionMode, Address, title, _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) {
@@ -2537,24 +2583,26 @@ 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 = 30;
                   break;
                 }
 
                 if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 7;
+                  _context14.next = 9;
                   break;
                 }
 
-                _context14.next = 7;
-                return _this2.props.openBuyerModal();
+                title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
+                _context14.next = 9;
+                return _this2.props.openBuyerModal(title);
 
-              case 7:
+              case 9:
                 if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 28;
+                  _context14.next = 30;
                   break;
                 }
 
@@ -2564,45 +2612,45 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 if (!!window.localStorage.IPMSG) {
                   IPMSG = JSON.parse(window.localStorage.IPMSG);
                 }
-                _context14.next = 13;
+                _context14.next = 15;
                 return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-              case 13:
+              case 15:
                 _ref26 = _context14.sent;
                 nonProductMap = _ref26.nonProductMap;
                 _ref26$freightProduct = _ref26.freightProductDTOList;
                 freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
 
                 if (!_this2.isNoProductTip(nonProductMap)) {
-                  _context14.next = 19;
+                  _context14.next = 21;
                   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 });
+                return _this2.props.openWareHouseModal(freightProductDTOList);
 
               case 23:
+                _context14.next = 25;
+                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
+
+              case 25:
                 data = _context14.sent;
 
                 if (!_this2.isNoProductTip(data.nonProductMap)) {
-                  _context14.next = 26;
+                  _context14.next = 28;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 26:
-                _context14.next = 28;
+              case 28:
+                _context14.next = 30;
                 return _this2.props.updataFreight(data.freight);
 
-              case 28:
+              case 30:
 
                 _this2.setState({
                   bquick: bquick
@@ -2611,13 +2659,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _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;
+                  _context14.next = 35;
                   break;
                 }
 
                 return _context14.abrupt('return', false);
 
-              case 33:
+              case 35:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2630,13 +2678,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context14.next = 38;
+                  _context14.next = 40;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 38:
+              case 40:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2653,7 +2701,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 41:
+              case 43:
               case 'end':
                 return _context14.stop();
             }
@@ -2749,6 +2797,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));
     };