tplus-components-touch 3.27.1 → 3.27.5

package/dist/components/settlement/settlement.js

@@ -24,6 +24,10 @@ 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);
@@ -2493,19 +2497,48 @@ 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 _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
-        var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, dto, IPMSG, _ref26, _ref26$data, nonProductMap, freightProductDTOList, len, names, temphtml, _ref27, freight, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
+      var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
+        var _ref26, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref27, nonProductMap, _ref27$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;
+                _ref26 = _this2.context.viewModel.data || {}, IdbusiType = _ref26.IdbusiType, CustomerPhone = _ref26.CustomerPhone, DistributionMode = _ref26.DistributionMode;
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context14.next = 46;
+                  _context14.next = 28;
                   break;
                 }
 
@@ -2519,85 +2552,58 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 5:
                 if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 46;
+                  _context14.next = 28;
                   break;
                 }
 
                 _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
-                dto = _this2.context.viewModel.data.cut();
-
-                dto.AddressLng = '116.244057';
-                dto.AddressLat = '40.068669';
-                dto.Address = '北清路68号用友产业园东区19C座';
-                dto.Province = '北京市';
-                dto.City = '北京市';
-                dto.District = '海淀区';
-                // cc结算调用
                 IPMSG = {};
 
                 if (!!window.localStorage.IPMSG) {
                   IPMSG = JSON.parse(window.localStorage.IPMSG);
                 }
-                _context14.next = 18;
-                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: dto });
-
-              case 18:
-                _ref26 = _context14.sent;
-                _ref26$data = _ref26.data;
-                nonProductMap = _ref26$data.nonProductMap;
-                freightProductDTOList = _ref26$data.freightProductDTOList;
-                len = nonProductMap.length;
-
-                if (!(len > 0)) {
-                  _context14.next = 29;
-                  break;
-                }
+                _context14.next = 11;
+                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-                names = [];
-                temphtml = [];
+              case 11:
+                _ref27 = _context14.sent;
+                nonProductMap = _ref27.nonProductMap;
+                _ref27$freightProduct = _ref27.freightProductDTOList;
+                freightProductDTOList = _ref27$freightProduct === undefined ? [] : _ref27$freightProduct;
 
-                nonProductMap.forEach(function (obj, index) {
-                  for (var key in obj) {
-                    names.push('【' + key + '】');
-                    temphtml.push(index + 1 + '、' + obj[key]);
-                  }
-                });
+                console.log('zlfnonProductMap', nonProductMap);
+                console.log('zlffreightProductDTOList', freightProductDTOList);
+
+                if (!_this2.isNoProductTip(nonProductMap)) {
+                  _context14.next = 19;
+                  break;
+                }
 
-                _modalWraper2.default.warning({
-                  title: '不可配送商品',
-                  content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join('；')
-                });
                 return _context14.abrupt('return');
 
-              case 29:
-                _context14.next = 31;
+              case 19:
+                _context14.next = 21;
                 return _this2.props.openWareHouseModal(freightProductDTOList);
 
-              case 31:
+              case 21:
+                _context14.next = 23;
+                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-                dto = _this2.context.viewModel.data.cut();
-                dto.AddressLng = '116.244057';
-                dto.AddressLat = '40.068669';
-                dto.Address = '北清路68号用友产业园东区19C座';
-                dto.Province = '北京市';
-                dto.City = '北京市';
-                dto.District = '海淀区';
+              case 23:
+                data = _context14.sent;
 
-                _context14.next = 40;
-                return getPosFreight({ cip: IPMSG.query || "", dto: dto });
-
-              case 40:
-                _ref27 = _context14.sent;
-                freight = _ref27.data.freight;
+                if (!_this2.isNoProductTip(data.nonProductMap)) {
+                  _context14.next = 26;
+                  break;
+                }
 
-                updataFreight(freight);
-                _context14.next = 45;
-                return _this2.props.updataFreight(freight);
+                return _context14.abrupt('return');
 
-              case 45:
-                console.log('zlf获取运费', freight);
+              case 26:
+                _context14.next = 28;
+                return _this2.props.updataFreight(data.freight);
 
-              case 46:
+              case 28:
 
                 _this2.setState({
                   bquick: bquick
@@ -2606,13 +2612,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 = 51;
+                  _context14.next = 33;
                   break;
                 }
 
                 return _context14.abrupt('return', false);
 
-              case 51:
+              case 33:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2625,13 +2631,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context14.next = 56;
+                  _context14.next = 38;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 56:
+              case 38:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2648,7 +2654,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 59:
+              case 41:
               case 'end':
                 return _context14.stop();
             }
@@ -2657,7 +2663,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x8, _x9) {
-        return _ref24.apply(this, arguments);
+        return _ref25.apply(this, arguments);
       };
     }();
 
@@ -2801,7 +2807,11 @@ 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,7 +2900,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'yfje' },
-                paymode.value
+                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.paymentType == PayStyle.xianjin && _react2.default.createElement(
@@ -3245,14 +3262,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref29 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref29$loginInfo = _ref29.loginInfo;
-
-    _ref29$loginInfo = _ref29$loginInfo === undefined ? {} : _ref29$loginInfo;
-    var ICCardServer = _ref29$loginInfo.ICCardServer,
-        ICCardPassword = _ref29$loginInfo.ICCardPassword,
-        Book = _ref29$loginInfo.Book,
-        PercentageWhenBook = _ref29$loginInfo.PercentageWhenBook;
+    var _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        ICCardServer = _ref29.ICCardServer,
+        ICCardPassword = _ref29.ICCardPassword,
+        Book = _ref29.Book,
+        PercentageWhenBook = _ref29.PercentageWhenBook;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
@@ -3522,7 +3536,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var _ref32 = this.context && this.context.viewModel && this.context.viewModel.data,
           IdbusiType = _ref32.IdbusiType,
-          DistributionMode = _ref32.DistributionMode;
+          DistributionMode = _ref32.DistributionMode,
+          BuyerPayFreight = _ref32.BuyerPayFreight;
 
       if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
         totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
@@ -3964,6 +3979,20 @@ 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(