tplus-components-touch 3.27.25 → 3.27.29

package/dist/components/settlement/settlement.js

@@ -462,7 +462,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
-        item.TotalDiscount = (0, _utils.getFixedNumber)(item.Discount * item.Quantity);
+        //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
+        item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
         item.UnitName = item.Unit.Name;
         item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -1121,7 +1122,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
       var themode = (0, _find3.default)(paymode.paymodes, { 'paymentType': key });
       //预订非全款不可使用零售抵现类支付方式
-      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && themode.virtualPay) {
+      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullOnlyBook && themode.virtualPay) {
         return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
       }
       if (themode.exchangeRate != 1) {
@@ -1210,7 +1211,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.handleChange = function (index, e, type) {
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(_this2.store.paymode.currentFocus)) return;
       var mode = (0, _find3.default)(_this2.store.paymode.thePaymodes, { 'paymethodId': index });
-      if (type == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
+      if (type == 'bookPay' && _this2.store.paymode.isNotFullOnlyBook && mode.virtualPay) {
         return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
       }
       var currentInput = e.target;
@@ -1398,7 +1399,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
-      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
+      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullOnlyBook && mode.virtualPay) {
         return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
       }
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
@@ -1445,7 +1446,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
-      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullBook && mode.virtualPay) {
+      if (bookType == 'bookPay' && _this2.store.paymode.isNotFullOnlyBook && mode.virtualPay) {
         return _message2.default.error("付订金时不可使用零售抵现类结算方式!");
       }
       _this2.store.changeClickFocusOnly(mode.paymentType);
@@ -2536,20 +2537,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context14.next = 9;
+                  _context14.next = 10;
                   break;
                 }
 
-                if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 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')) {
+                  _context14.next = 10;
                   break;
                 }
 
                 title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
-                _context14.next = 9;
+                _context14.next = 10;
                 return _this2.props.openBuyerModal(title);
 
-              case 9:
+              case 10:
 
                 _this2.setState({
                   bquick: bquick
@@ -2558,13 +2563,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _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 = 14;
+                  _context14.next = 15;
                   break;
                 }
 
                 return _context14.abrupt('return', false);
 
-              case 14:
+              case 15:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2577,13 +2582,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context14.next = 19;
+                  _context14.next = 20;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 19:
+              case 20:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2600,7 +2605,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 22:
+              case 23:
               case 'end':
                 return _context14.stop();
             }
@@ -3350,11 +3355,11 @@ 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截止
      */
 
     // 处理客显显示功能