tplus-components-touch 3.39.5 → 3.39.6

package/dist/components/settlement/settlement.js

@@ -2648,7 +2648,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.btnDebounced = function () {
       var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
-        var IdbusiType, CustomerPhone, DistributionMode, Address, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
+        var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee16$(_context16) {
           while (1) {
@@ -2661,24 +2661,39 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context16.next = 10;
+                  _context16.next = 14;
                   break;
                 }
 
+                //预售下单时，启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送
+                isEnableSerialNumber = (0, _tplusPoslogin.PosInitData)("IsEnableSerialNumber");
+                resultObj = _this2.context.viewModel.data.RetailDetails.find(function (o) {
+                  return o.Inventory.IsSerialNumber && (o.Inventory.IsBatch || o.Inventory.IsQualityPeriod);
+                });
+
+                if (!(isEnableSerialNumber && resultObj && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE'))) {
+                  _context16.next = 9;
+                  break;
+                }
+
+                return _context16.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送'));
+
+              case 9:
+
                 if (DistributionMode.Id == 'ON_SITE_PICKUP' && !CustomerPhone && _this2.context.viewModel.data.Member.Mobilephone) {
                   _this2.props.syncMemberInfoProcessor();
                 }
 
                 if (!(!CustomerPhone && !_this2.context.viewModel.data.Member.Mobilephone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context16.next = 10;
+                  _context16.next = 14;
                   break;
                 }
 
                 title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
-                _context16.next = 10;
+                _context16.next = 14;
                 return _this2.props.openBuyerModal(title);
 
-              case 10:
+              case 14:
 
                 _this2.setState({
                   bquick: bquick,
@@ -2688,13 +2703,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))) {
-                  _context16.next = 15;
+                  _context16.next = 19;
                   break;
                 }
 
                 return _context16.abrupt('return', false);
 
-              case 15:
+              case 19:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2707,13 +2722,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context16.next = 20;
+                  _context16.next = 24;
                   break;
                 }
 
                 return _context16.abrupt('return');
 
-              case 20:
+              case 24:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2730,7 +2745,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 23:
+              case 27:
               case 'end':
                 return _context16.stop();
             }