tplus-components-touch 3.27.3 → 3.27.7

package/dist/components/settlement/settlement.js

@@ -2498,14 +2498,24 @@ 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) {
-        for (var key in nonProductMap) {
+        var _loop = function _loop(key) {
           count++;
-          names.push('【' + key + '】');
+          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: '不可配送商品',
@@ -2517,32 +2527,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _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;
+      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;
 
         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;
+                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;
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context14.next = 28;
+                  _context14.next = 30;
                   break;
                 }
 
                 if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 5;
+                  _context14.next = 7;
                   break;
                 }
 
-                _context14.next = 5;
+                _context14.next = 7;
                 return _this2.props.openBuyerModal();
 
-              case 5:
+              case 7:
                 if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 28;
+                  _context14.next = 30;
                   break;
                 }
 
@@ -2552,10 +2564,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 if (!!window.localStorage.IPMSG) {
                   IPMSG = JSON.parse(window.localStorage.IPMSG);
                 }
-                _context14.next = 11;
+                _context14.next = 13;
                 return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-              case 11:
+              case 13:
                 _ref26 = _context14.sent;
                 nonProductMap = _ref26.nonProductMap;
                 _ref26$freightProduct = _ref26.freightProductDTOList;
@@ -2565,35 +2577,35 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 console.log('zlffreightProductDTOList', freightProductDTOList);
 
                 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
@@ -2602,13 +2614,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) {
@@ -2621,13 +2633,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);
@@ -2644,7 +2656,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 41:
+              case 43:
               case 'end':
                 return _context14.stop();
             }
@@ -2653,7 +2665,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x8, _x9) {
-        return _ref24.apply(this, arguments);
+        return _ref25.apply(this, arguments);
       };
     }();
 
@@ -2797,11 +2809,9 @@ 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;
+      var BuyerPayFreight = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.BuyerPayFreight;
+      var DistributionMode = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.DistributionMode;
       // 付款弹窗
-
       return new _promise2.default(function (resolve, reject) {
         var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
             PayStyle = _enumController$getEn26.PayStyle,
@@ -3252,14 +3262,11 @@ 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 _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        ICCardServer = _ref28.ICCardServer,
+        ICCardPassword = _ref28.ICCardPassword,
+        Book = _ref28.Book,
+        PercentageWhenBook = _ref28.PercentageWhenBook;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
@@ -3526,12 +3533,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       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;
-
+      var IdbusiType = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.IdbusiType;
+      var BuyerPayFreight = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.BuyerPayFreight;
+      var DistributionMode = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.DistributionMode;
       if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
         totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
       }
@@ -3583,11 +3587,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 _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 quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4980,8 +4984,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(_ref32) {
+                    return _this8["inputCzkAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5598,8 +5602,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(_ref33) {
+                    return _this8["inputJfdxAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";