tplus-components-touch 3.40.1 → 3.40.4

package/dist/components/settlement/settlement.js

@@ -16,6 +16,14 @@ var _drawer = require('antd/es/drawer');
 
 var _drawer2 = _interopRequireDefault(_drawer);
 
+var _table = require('antd/es/table');
+
+var _table2 = _interopRequireDefault(_table);
+
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -88,6 +96,8 @@ require('antd/es/input/style');
 
 require('antd/es/drawer/style');
 
+require('antd/es/table/style');
+
 require('antd/es/carousel/style');
 
 require('antd/es/button/style');
@@ -269,6 +279,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.hotkeydebouncedPayMode = "";
     _this2.currentInput = null;
 
+    _this2.getIsReturn = function () {
+      var dataModal = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data;
+      return dataModal.IdbusiType === 35 || dataModal.IdbusiType === 40; //40预售退货类型。
+    };
+
+    _this2.getBoriginReturn = function () {
+      var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+      return boriginReturn || false;
+    };
+
+    _this2.getNotBoriginReturn = function () {
+      var isReturn = _this2.getIsReturn();
+      var boriginReturn = _this2.getBoriginReturn();
+      return isReturn && !boriginReturn;
+    };
+
     _this2.resizeSettlementToolBtns = function () {
       var newStyle = _this2.store.newStyle;
       var isMemberStorePage = _this2.props.isMemberStorePage;
@@ -362,7 +388,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           isReturn = _this2$props.isReturn,
           type = _this2$props.type;
 
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true })).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true, fn: function fn(data) {
+          return _this2.isNoProductTip(data);
+        } })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -401,14 +429,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.handleGuestShow(amount < 0 ? 2 : 3, amount);
       setTimeout(function () {
         _this2.handleDefault();
-        //  // 单据模式 临时性获取第一个结算方式焦点
-        // // document.querySelector('.modeItem:nth-child(1) .content input').focus()
         var _this2$store = _this2.store,
             paymode = _this2$store.paymode,
             brefund = _this2$store.brefund,
             newStyle = _this2$store.newStyle;
 
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -427,6 +453,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return (0, _assign2.default)({}, o);
       });
       var discountRetailTotalAount = null;
+      var discountPrototypeTotalAmount = 0;
       var count = 0;
       dataSource && dataSource.forEach(function (item) {
         var count1 = 0;
@@ -450,16 +477,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         } else {
           item.badge = { text: '', position: '', className: '' };
         }
-        if (!item.IsPresent) {
-          discountRetailTotalAount += item.RetailPrice * item.Quantity;
-        }
         if (item.PromotionDetails && item.PromotionDetails.length > 0) {
           count++;
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
+        if (!item.IsPresent) {
+          discountPrototypeTotalAmount += item.DetailDiscountAmount;
+          item.TotalDiscount = item.DetailDiscountAmount;
+        } else {
+          item.TotalDiscount = 0;
+        }
         //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);
@@ -468,11 +497,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
       _this2.setState({
         dataSource: dataSource,
-        discountTotalAmount: (0, _utils.getFixedNumber)(TotalTaxAmount),
-        discountRetailTotalAount: (0, _utils.getFixedNumber)(discountRetailTotalAount),
-        discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountRetailTotalAount - TotalTaxAmount)
+        discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
+        discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
+        discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + parseFloat(discountPrototypeTotalAmount))
       });
-      console.log(RetailDetails, 'RetailDetails-----');
       return count;
     };
 
@@ -483,7 +511,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var isAutoShowCouponWhenCash = (0, _tplusPoslogin.PosInitData)('IsAutoShowCouponWhenCash');
       // 支持异步验证过程
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ fn: function fn(data) {
+          return _this2.isNoProductTip(data);
+        } })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -507,6 +537,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.settleZero = function () {
       var that = _this2;
+      //预售取货无需支付时省略弹框确认这一步
+      var IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
+      if (IdbusiType == 39) {
+        that.handleSettle("zero");
+        return;
+      }
       _modalWraper2.default.confirm({
         className: 'tplus-confirm-modal',
         title: '结算',
@@ -610,36 +646,37 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.showCzkModal = function () {
       var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append) {
-        var _enumController$getEn2, PayStyle, _ref2, isInputMember, memberdata1;
+        var _ref2, isInputMember, _enumController$getEn2, PayStyle, ctMode, memberId, returnType, memberdata1;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this2.connectRfCard();
+                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
+                ctMode = _this2.store && _this2.store.paymode && _this2.store.paymode.currentMode;
+                memberId = ctMode && ctMode.memberId;
+                returnType = _this2.getNotBoriginReturn();
 
+                _this2.connectRfCard();
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
-                _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
+                _context.t0 = isInputMember && memberId;
 
                 if (!_context.t0) {
-                  _context.next = 9;
+                  _context.next = 12;
                   break;
                 }
 
-                _context.next = 8;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+                _context.next = 11;
+                return _this2.store.updateCurrentMode(memberId, returnType);
 
-              case 8:
+              case 11:
                 _context.t0 = _context.sent;
 
-              case 9:
+              case 12:
                 memberdata1 = _context.t0;
 
-                _this2.setState({
-                  czkVisible: true
-                });
+                _this2.setState({ czkVisible: true });
                 if (memberdata1 && memberdata1.length === 1) {
                   _this2.handleCzkMoreData(true);
                   _this2.store.handleCzkData(memberdata1[0]);
@@ -655,7 +692,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }, 300);
                 }
 
-              case 12:
+              case 15:
               case 'end':
                 return _context.stop();
             }
@@ -699,7 +736,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleCzkData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      var _enumController$getEn3, PayStyle;
+      var _enumController$getEn3, PayStyle, returnType;
 
       return _regenerator2.default.wrap(function _callee2$(_context2) {
         while (1) {
@@ -711,43 +748,44 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 5;
+                _context2.next = 6;
                 break;
               }
 
-              _context2.next = 5;
-              return _this2.store.loadCzk(_this2.czkInput.input.value);
+              returnType = _this2.getNotBoriginReturn();
+              _context2.next = 6;
+              return _this2.store.loadCzk(_this2.czkInput.input.value, returnType);
 
-            case 5:
+            case 6:
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
 
               _message2.default.error("请录入储值卡！");
               return _context2.abrupt('return');
 
-            case 8:
+            case 9:
               if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
               })) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
 
               _message2.default.error("该储值卡已使用。");
               return _context2.abrupt('return');
 
-            case 11:
+            case 12:
               if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                _context2.next = 14;
+                _context2.next = 15;
                 break;
               }
 
               _message2.default.error("实收金额应等于应收金额。");
               return _context2.abrupt('return');
 
-            case 14:
+            case 15:
 
               _this2.setState({
                 czkVisible: false,
@@ -758,7 +796,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _this2.store.paymode.calcMemberBalance();
               _this2.handleCzk();
 
-            case 18:
+            case 19:
             case 'end':
               return _context2.stop();
           }
@@ -1050,7 +1088,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       setTimeout(function () {
         _this2.inputJfdxAmount.input.focus();
         _this2.inputJfdxAmount.input.setSelectionRange(0, _this2.inputJfdxAmount.input.value.length);
-      }, 200);
+      }, 300);
     };
 
     _this2.handleJfdxOk = function (e) {
@@ -1092,7 +1130,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.onTabsClick2 = function (paymode, brefund, themode, key) {
+    _this2.onTabsClick2 = function (paymode, brefund, themode, key, bookType) {
       var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn7.PayStyle,
           Differentiate = _enumController$getEn7.Differentiate;
@@ -1125,7 +1163,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           })) {
             _message2.default.error('已使用了其他的付款码支付，不可以再使用微信了。');
           } else {
-            _this2.setCurrentFocusAndAddPay(key);
+            _this2.setCurrentFocusAndAddPay(key, bookType);
           }
           break;
         case PayStyle.zfb:
@@ -1134,7 +1172,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           })) {
             _message2.default.error('已使用了其他的付款码支付，不可以再使用支付宝了。');
           } else {
-            _this2.setCurrentFocusAndAddPay(key);
+            _this2.setCurrentFocusAndAddPay(key, bookType);
           }
           break;
         case PayStyle.smzf:
@@ -1143,11 +1181,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           })) {
             _message2.default.error('已使用了其他的付款码支付，不可以再使用扫码支付了。');
           } else {
-            _this2.setCurrentFocusAndAddPay(key);
+            _this2.setCurrentFocusAndAddPay(key, bookType);
           }
           break;
         default:
-          _this2.setCurrentFocusAndAddPay(key);
+          _this2.setCurrentFocusAndAddPay(key, bookType);
           break;
       }
     };
@@ -1190,7 +1228,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return bdisabled;
     };
 
-    _this2.onTabsClick = function (key) {
+    _this2.onTabsClick = function (key, bookType) {
+      if (!_this2.isDjqValidated(key)) {
+        return;
+      };
+      var _this2$store3 = _this2.store,
+          paymode = _this2$store3.paymode,
+          brefund = _this2$store3.brefund,
+          boriginReturn = _this2$store3.boriginReturn;
+
       var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn9.PayStyle,
           Differentiate = _enumController$getEn9.Differentiate;
@@ -1207,10 +1253,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
           MultiPay = _enumController$getEn10.MultiPay;
 
-      var _this2$store3 = _this2.store,
-          paymode = _this2$store3.paymode,
-          brefund = _this2$store3.brefund,
-          boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
@@ -1219,6 +1261,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
       var themode = (0, _find3.default)(paymode.paymodes, { 'paymentType': key });
+      //预订非全款不可使用零售抵现类支付方式
+      // if(bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && themode.virtualPay){
+      //   return Message.error("付订金时不可使用零售抵现类结算方式!");
+      // }
       if (themode.exchangeRate != 1) {
         var forign = (0, _find3.default)(paymode.thePaymodes, function (mode) {
           return mode.exchangeRate != 1 && mode.paymentType != key;
@@ -1249,17 +1295,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 that.setState({
                   noAlreadyWarn: false
                 });
-                that.onTabsClick2(paymode, brefund, themode, key);
+                that.onTabsClick2(paymode, brefund, themode, key, bookType);
               },
               onCancel: function onCancel() {}
-            }) : that.onTabsClick2(paymode, brefund, themode, key);;
+            }) : that.onTabsClick2(paymode, brefund, themode, key, bookType);
             break;
           default:
-            _this2.onTabsClick2(paymode, brefund, themode, key);
+            _this2.onTabsClick2(paymode, brefund, themode, key, bookType);
             break;
         }
       } else {
-        _this2.onTabsClick2(paymode, brefund, themode, key);
+        _this2.onTabsClick2(paymode, brefund, themode, key, bookType);
       }
     };
 
@@ -1282,8 +1328,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.setCurrentFocusAndAddPay = function (key, payId) {
-      _this2.store.changeFocusAndAddPay(key);
+    _this2.setCurrentFocusAndAddPay = function (key, bookType, payId) {
+      _this2.store.changeFocusAndAddPay(key, bookType);
       if (_this2.store.bquick) {
         _this2.handleSettle("quickPay");
       } else {
@@ -1291,7 +1337,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.onDelPay = function (index, boriginReturn, type) {
+    _this2.onDelPay = function (index, boriginReturn, type, bookType) {
       var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn12.PayStyle;
 
@@ -1300,26 +1346,32 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
         _message2.default.info('原单退货时，该结算方式不可以删除。');
       } else {
-        _this2.store.delPay(index);
+        _this2.store.delPay(index, bookType);
       }
     };
 
-    _this2.handleChange = function (index, e) {
+    _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' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
+      //   return Message.error("付订金时不可使用零售抵现类结算方式!");
+      // }
       var currentInput = e.target;
       var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
       if (!isNaN(e.target.value) || e.target.value == '-') {
         if (e.target.value.length <= amountMaxLength) {
-          _this2.store.changeValue(index, e.target.value, false);
+          _this2.store.changeValue(index, e.target.value, false, type);
         }
       }
     };
 
     _this2.setCurrentModeValue = function (val, max) {
+      var returnType = _this2.getNotBoriginReturn();
+
       var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn13.PayStyle;
 
-      var reg = /^[\d.]+$/g;
+      var reg = returnType ? /^[\d.-]+$/g : /^[\d.]+$/g;
       if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk || _this2.store.paymode.currentMode.paymentType === PayStyle.jfdx) {
         if (!val) {
           _this2.setState({
@@ -1350,14 +1402,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }
         }
       }
-      // let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
       _this2.store.paymode.setCurrentModeValue(val, max);
     };
 
-    _this2.onBlur = function (index, e) {
+    _this2.onBlur = function (index, e, type) {
       _this2.currentInput = null;
       _this2.store.changeFocusOnly(-1);
-      _this2.store.changeValue(index, e.target.value == '-' ? 0 : e.target.value, true);
+      _this2.store.changeValue(index, e.target.value == '-' ? 0 : e.target.value, true, type);
     };
 
     _this2.onFocus = function (index, mode, paymode, e) {
@@ -1439,15 +1490,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
       _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-        var memberdata1;
+        var returnType, memberdata1;
         return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _context5.next = 2;
-                return _this2.store.loadCzk(v);
+                returnType = _this2.getNotBoriginReturn();
+                _context5.next = 3;
+                return _this2.store.loadCzk(v, returnType);
 
-              case 2:
+              case 3:
                 memberdata1 = _context5.sent;
 
                 if (memberdata1 && memberdata1.length === 1) {
@@ -1464,7 +1516,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   });
                 }
 
-              case 4:
+              case 5:
               case 'end':
                 return _context5.stop();
             }
@@ -1481,7 +1533,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 2000);
     };
 
-    _this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
+    _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
+      if (!_this2.isDjqValidated(mode.paymentType)) {
+        return;
+      };
+      // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
+      //   return Message.error("付订金时不可使用零售抵现类结算方式!");
+      // }
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
@@ -1521,11 +1579,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.onHotKeyClick2 = function (index, mode, paymode, e) {
+    _this2.onHotKeyClick2 = function (index, mode, paymode, e, bookType) {
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
+      // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
+      //   return Message.error("付订金时不可使用零售抵现类结算方式!");
+      // }
       _this2.store.changeClickFocusOnly(mode.paymentType);
       _this2.setCurrentFocusOnly(mode.paymentType);
       if (_this2.hotkeydebounced) {
@@ -1561,8 +1622,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.hotkeydebounced = null;
       }
       _this2.hotkeydebounced = (0, _debounce3.default)(function () {
-        // let { type, amount, totalVariety, totalQuantity, isReturn, quantityDetail,memberDisabled } = this.props
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -1571,7 +1631,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         if (!notsettle && !_this2.checkSettleDisabled(paymode, thePaymodes)) {
           _this2.handleSettle();
         } else if ((thePaymodes || []).length > 0) {
-
           // 根据currentIndex  = paymethodeId 获取当前支付方式位置
           var payIndex = -1;
           thePaymodes.forEach(function (paymodes, index) {
@@ -1676,6 +1735,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               _modalWraper2.default.confirm({
                 className: 'tplus-confirm-modal',
+                zIndex: 1007,
                 content: _react2.default.createElement(
                   'div',
                   { className: 'unReturn' },
@@ -1762,7 +1822,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
+      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, _this2$store6, getSettleGift, isFull, type, resp1;
 
       return _regenerator2.default.wrap(function _callee8$(_context8) {
         while (1) {
@@ -1822,7 +1882,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }
               };
 
-              getSettleGift = _this2.store.getSettleGift;
+              _this2$store6 = _this2.store, getSettleGift = _this2$store6.getSettleGift, isFull = _this2$store6.isFull;
               type = _this2.props.type;
               resp1 = false;
 
@@ -1870,8 +1930,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   message = "退货成功";
                 } else if (MemberPoints && Number(amount) == Number(0)) {
                   message = "兑换成功";
+                } else if (IdbusiType == 39 && received == 0) {
+                  message = "取货成功";
                 }
-                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, function () {
+                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
                   _this.handleGuestShow(5);
                 });
                 _this2.setState({ isXianjin: false });
@@ -2028,7 +2090,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn21, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
         return _regenerator2.default.wrap(function _callee11$(_context11) {
           while (1) {
@@ -2039,7 +2101,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
                 console.log("settlement.handleSettle开始执行，参数：", +args);
                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
-                _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
+                _this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
                 isQuickPay = args === 'quickPay';
                 that = _this2;
                 status = false;
@@ -2368,7 +2430,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                           //成功
                           //返回
-                          that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
+                          that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
                           _promise2.default.resolve();
                           _context12.next = 15;
                           break;
@@ -2591,58 +2653,122 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
-    _this2.btnDebounced = function (type, bquick) {
-      _this2.setState({
-        bquick: bquick,
-        isInputMember: true
-      });
+    _this2.btnDebounced = function () {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
+        var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
-      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn23.PayStyle;
+        return _regenerator2.default.wrap(function _callee16$(_context16) {
+          while (1) {
+            switch (_context16.prev = _context16.next) {
+              case 0:
+                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)) {
+                  _context16.next = 14;
+                  break;
+                }
 
-      var _this2$store7 = _this2.store,
-          paymode = _this2$store7.paymode,
-          brefund = _this2$store7.brefund,
-          boriginReturn = _this2$store7.boriginReturn,
-          newStyle = _this2$store7.newStyle;
+                //预售下单时，启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送
+                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;
+                }
 
-      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+                return _context16.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品，不支持快递和同城配送'));
 
-      var status = false;
-      paymode.thePaymodes.forEach(function (v) {
-        if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
-          status = true;
-        }
-      });
-      _this2.setState({
-        isXianjin: status ? true : false
-      });
+              case 9:
 
-      if (_this2.btndebounced) {
-        return;
-      }
-      _this2.btndebounced = (0, _debounce3.default)(function () {
-        if (bquick) {
-          _this2.quickSettle(type);
-        } else {
-          _this2.showModal();
-        }
-      }, 1000, {
-        'leading': true,
-        'trailing': false
-      });
-      _this2.btndebounced();
-      setTimeout(function () {
-        _this2.btndebounced.cancel();
-        _this2.btndebounced = null;
-      }, 2000);
-    };
+                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 = 14;
+                  break;
+                }
+
+                title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
+                _context16.next = 14;
+                return _this2.props.openBuyerModal(title);
+
+              case 14:
+
+                _this2.setState({
+                  bquick: bquick,
+                  isInputMember: true
+                });
+                _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
+                _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 = 19;
+                  break;
+                }
+
+                return _context16.abrupt('return', false);
+
+              case 19:
+                status = false;
+
+                paymode.thePaymodes.forEach(function (v) {
+                  if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
+                    status = true;
+                  }
+                });
+                _this2.setState({
+                  isXianjin: status ? true : false
+                });
+
+                if (!_this2.btndebounced) {
+                  _context16.next = 24;
+                  break;
+                }
+
+                return _context16.abrupt('return');
+
+              case 24:
+                _this2.btndebounced = (0, _debounce3.default)(function () {
+                  if (bquick) {
+                    _this2.quickSettle(type);
+                  } else {
+                    _this2.showModal();
+                  }
+                }, 1000, {
+                  'leading': true,
+                  'trailing': false
+                });
+                _this2.btndebounced();
+                setTimeout(function () {
+                  _this2.btndebounced.cancel();
+                  _this2.btndebounced = null;
+                }, 2000);
+
+              case 27:
+              case 'end':
+                return _context16.stop();
+            }
+          }
+        }, _callee16, _this3);
+      }));
+
+      return function (_x10, _x11) {
+        return _ref24.apply(this, arguments);
+      };
+    }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref25 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2680,7 +2806,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.debounced) {
         _this2.debounced.cancel();
         _this2.debounced = null;
-        // console.log("debounce canceled");
       }
       if (!isKeyBorad) {
         _this2.debounced = (0, _debounce3.default)(function () {
@@ -2722,7 +2847,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         value = parseFloat(receivable) + parseFloat(inputTarget2.innerHTML);
       }
       inputTarget.value = value;
-      inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
+      //预订现金快捷支付，这里修改找零计算，大于应收小于全额金额，不找零，大于全额金额找零
+      if (_this2.store.paymode.isNotFullBook) {
+        if (parseFloat(value || 0) > _this2.store.paymode.bookMaxValue) {
+          inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(_this2.store.paymode.bookMaxValue));
+        }
+        if (parseFloat(value || 0) < parseFloat(receivable)) {
+          inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
+        }
+        if (parseFloat(receivable) <= parseFloat(value || 0) && parseFloat(value || 0) <= _this2.store.paymode.bookMaxValue) {
+          inputTarget2.innerHTML = (0, _utils.getFixedNumber)(0);
+        }
+      } else {
+        inputTarget2.innerHTML = (0, _utils.getFixedNumber)(parseFloat(value || 0) - parseFloat(receivable));
+      }
     };
 
     _this2.changeScanProduct = function () {
@@ -2779,6 +2917,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
+      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$getEn27 = _mutantsUtil.enumController.getEnumOj(),
@@ -2868,7 +3008,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'yfje' },
-                paymode.value
+                paymode.value,
+                DistributionMode && (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(
@@ -2992,7 +3139,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         settleDisabled: false
                       });
                       that.store.bquick && that.props.onCancelSettle && that.props.onCancelSettle();
-                      that.store.bquick && that.store.delPay(paymode.paymethodId);
+                      that.store.bquick && that.store.delPay(paymode.paymethodId, !isQuickPay ? 'bookPay' : '');
                       reject('\u652F\u4ED8\u65B9\u5F0F: ' + paymode.name + '\u5931\u8D25');
                     } },
                   '\u53D6\u6D88'
@@ -3022,7 +3169,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         modal.destroy();
                         setTimeout(function () {
                           if (paymode.paymentType == PayStyle.xianjin) {
-                            that.store.changeValue(paymode.paymethodId, v, false);
+                            that.store.changeValue(paymode.paymethodId, v, false, 'bookPay');
                           } else {
                             paymode.authCode = v;
                           }
@@ -3051,9 +3198,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCurrentModeHaveMutex = function (type) {
-      var _this2$store8 = _this2.store,
-          paymode = _this2$store8.paymode,
-          newStyle = _this2$store8.newStyle;
+      var _this2$store9 = _this2.store,
+          paymode = _this2$store9.paymode,
+          newStyle = _this2$store9.newStyle;
 
       var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn28.PayStyle;
@@ -3161,6 +3308,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var CarouselTp = CarouseOut || _carousel2.default;
       var newParams = CarouseOut ? {} : params;
       var mapList = [];
+      var type = _this2.props.type;
+
       paymodes.forEach(function (item, index) {
         // 整除则新增轮播页面
         if (index % carouselStart === 0) {
@@ -3176,7 +3325,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             'div',
             null,
             (0, _map3.default)(modeList, function (mode, modeIndex) {
-              return _this2.renderToolbtn(mode, index * carouselStart + modeIndex);
+              return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, type !== 1 ? 'bookPay' : '');
             })
           );
         })
@@ -3227,19 +3376,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref25 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        MemberMeStorageCardInputByKeyBoard = _ref25.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref25.ICCardServer,
-        ICCardPassword = _ref25.ICCardPassword;
+    var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref26.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref26.ICCardServer,
+        ICCardPassword = _ref26.ICCardPassword,
+        PreSellOrBook = _ref26.PreSellOrBook,
+        PercentageWhenBook = _ref26.PercentageWhenBook;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
+    _this2.isBook = PreSellOrBook == 'BOOK';
+    _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref26 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref26.isHorizontalPad,
-        isHorizontalSunMi = _ref26.isHorizontalSunMi;
+    var _ref27 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref27.isHorizontalPad,
+        isHorizontalSunMi = _ref27.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3276,6 +3429,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     }
 
+    //是否退货
+
+
+    //原单退货状态
+
+
+    //非原单退货状态
+
+
     //对结算按钮超出的处理
 
   }, {
@@ -3356,6 +3518,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     //jfdx
 
+  }, {
+    key: 'isDjqValidated',
+    value: function isDjqValidated(key) {
+      var paymode = this.store.paymode;
+
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
+      if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
+        _message2.default.warn('实收金额已大于应收金额，不允许使用优惠券');
+        return false;
+      }
+      return true;
+    }
 
     /**
      *
@@ -3366,8 +3542,79 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     // 处理客显显示功能
 
+
     //that[`inputS${paymode.paymethodId}`]
 
+  }, {
+    key: 'isNoProductTip',
+    value: function isNoProductTip(nonProductMap) {
+      var _ref28 = this.context.viewModel.data || {},
+          RetailDetails = _ref28.RetailDetails;
+
+      var temphtml = [];
+      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) {
+          var product = RetailDetails.find(function (o) {
+            return o.Idinventory == key;
+          });
+          temphtml.push({ name: product.Inventory.Name, reason: nonProductMap[key] });
+        };
+
+        for (var key in nonProductMap) {
+          _loop(key);
+        }
+        var modal = (0, _asyncModal2.default)({
+          onPressEnter: function onPressEnter() {
+            modal.destroy();
+          },
+          maskClosable: false,
+          keyboard: false,
+          closable: true,
+          title: '不可配送商品',
+          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;
+      }
+      return false;
+    }
   }, {
     key: 'checkThepaymode',
     value: function checkThepaymode(key) {
@@ -3376,8 +3623,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'onKeyboardChange',
     value: function onKeyboardChange(key) {
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn32.PayStyle;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn33.PayStyle;
 
       if (this.currentInput) {
         if (this.store.paymode.currentMode) {
@@ -3395,12 +3642,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     }
   }, {
     key: 'renderToolbtn',
-    value: function renderToolbtn(mode, index) {
+    value: function renderToolbtn(mode, index, bookType) {
       var _this7 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayStyle = _enumController$getEn33.PayStyle;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayStyle = _enumController$getEn34.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3433,7 +3680,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return _react2.default.createElement(
         'div',
         { key: index + "", className: paymodeDisabled + ' ' + paymodeSelected + ' paymode  hotkey_' + this.compoundHotkeysList[hotkeyIndex], onClick: function onClick() {
-            _this7.onTabsClick(mode.paymentType);
+            _this7.onTabsClick(mode.paymentType, bookType);
           } },
         _react2.default.createElement(
           'div',
@@ -3472,11 +3719,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn34.PayIcon,
-          PayIcon2 = _enumController$getEn34.PayIcon2,
-          PayStyle = _enumController$getEn34.PayStyle,
-          Differentiate = _enumController$getEn34.Differentiate;
+      var _enumController$getEn35 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn35.PayIcon,
+          PayIcon2 = _enumController$getEn35.PayIcon2,
+          PayStyle = _enumController$getEn35.PayStyle,
+          Differentiate = _enumController$getEn35.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3504,17 +3751,36 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           noIsMinAmount = _props.noIsMinAmount;
       // 原单退货
 
-      var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
+      var boriginReturn = this.getBoriginReturn();
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
+
+      //收订金
+      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;
+      }
+
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
+        if (IdbusiType == 39) {
+          return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0) && m.paymentType != PayStyle.hyczk;
+        }
         return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
       }) : paymode.thePaymodes;
       var paymodes = paymode.paymodes,
           settle = paymode.settle,
           currentMode = paymode.currentMode;
-      // 积分兑换 总积分
 
+
+      if (IdbusiType == 39) {
+        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
+        paymodes = (0, _filter3.default)(paymodes, function (mode) {
+          return mode.paymentType != PayStyle.hyczk;
+        }); //取货过滤掉储值
+      }
+      // 积分兑换 总积分
       var ExchangeIntegral = this.context && this.context.viewModel && this.context.viewModel.data.ExchangeIntegral;
 
       var _hasSMZF = (0, _find3.default)(paymodes, function (item) {
@@ -3530,7 +3796,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
 
       var quickPay = boriginReturn ? [] : (0, _filter3.default)(paymodes, function (paymode) {
-        return paymode.isQuick;
+        if (IdbusiType == 39) {
+          return paymode.isQuick && paymode.paymentType != PayStyle.hyczk; //取货过滤掉储值
+        } else {
+          return paymode.isQuick;
+        }
       });
       var productsIsEmpty = type != 1 && this.context.viewModel.data.RetailDetails.length == 0 || type == 1 && parseFloat(amount || 0) <= 0 || memberDisabled || noIsMinAmount;
       var moreToolbtns = [];
@@ -3550,11 +3820,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref27 = quantityDetail || {},
-          _ref27$buyQuantity = _ref27.buyQuantity,
-          buyQuantity = _ref27$buyQuantity === undefined ? 0 : _ref27$buyQuantity,
-          _ref27$returnQuantity = _ref27.returnQuantity,
-          returnQuantity = _ref27$returnQuantity === undefined ? 0 : _ref27$returnQuantity;
+      var _ref29 = quantityDetail || {},
+          _ref29$buyQuantity = _ref29.buyQuantity,
+          buyQuantity = _ref29$buyQuantity === undefined ? 0 : _ref29$buyQuantity,
+          _ref29$returnQuantity = _ref29.returnQuantity,
+          returnQuantity = _ref29$returnQuantity === undefined ? 0 : _ref29$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3732,7 +4002,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             { key: 'settle', className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }), onClick: function onClick() {
                 _this8.btnDebounced();
               }, disabled: productsIsEmpty },
-            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : settle.name
+            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : IdbusiType == 39 && _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount == 0 ? '取货' : settle.name
           )
         ),
         !newStyle && _react2.default.createElement(
@@ -3759,7 +4029,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 'div',
                 null,
                 (0, _map3.default)(paymodes, function (mode, index) {
-                  return _this8.renderToolbtn(mode, index);
+                  return _this8.renderToolbtn(mode, index, 'bookPay');
                 })
               ),
               paymodes.length > carouselStart && this.paymodesCarouselList(params, paymodes, carouselStart)
@@ -3804,20 +4074,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             return _this8.onHotKeyClick2(index, mode, paymode, e);
                           },
                           onBlur: function onBlur(e) {
-                            return _this8.onBlur(index, e);
+                            return _this8.onBlur(index, e, 'bookPay');
                           },
                           onFocus: function onFocus(e) {
                             return _this8.onFocusHack(index, mode, paymode, e);
                           },
                           onChange: function onChange(e) {
-                            return _this8.handleChange(index, e);
+                            return _this8.handleChange(index, e, 'bookPay');
                           }
                         })
                       ),
                       _react2.default.createElement(
                         'span',
                         { className: 'minus', onClick: function onClick() {
-                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
+                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType, 'bookPay');
                           } },
                         _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
@@ -3951,6 +4221,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 && (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))
+                    )
                   )
                 ),
                 type != 1 && !isReturn && _react2.default.createElement(
@@ -4087,6 +4371,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 && (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))
+                    )
                   )
                 ),
                 type != 1 && !isReturn && _react2.default.createElement(
@@ -4181,7 +4479,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 _this8.onHotKeyClick1(mode, index, boriginReturn);
                               }
                             } else {
-                              _this8.onHotKeyClick1(mode, index, boriginReturn);
+                              _this8.onHotKeyClick1(mode, index, boriginReturn, 'bookPay');
                             }
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
@@ -4193,16 +4491,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn) || _this8.checkScanDisabled(mode.paymentType),
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
                           onClick: function onClick(e) {
-                            return _this8.onHotKeyClick2(index, mode, paymode, e);
+                            return _this8.onHotKeyClick2(index, mode, paymode, e, 'bookPay');
                           },
                           onBlur: function onBlur(e) {
-                            return _this8.onBlur(index, e);
+                            return _this8.onBlur(index, e, 'bookPay');
                           },
                           onFocus: function onFocus(e) {
                             return _this8.onFocusHack(index, mode, paymode, e);
                           },
                           onChange: function onChange(e) {
-                            return _this8.handleChange(index, e);
+                            return _this8.handleChange(index, e, 'bookPay');
                           }
                         })
                       )
@@ -4411,22 +4709,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
+                    var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
                       var time, _paymode;
 
-                      return _regenerator2.default.wrap(function _callee16$(_context16) {
+                      return _regenerator2.default.wrap(function _callee17$(_context17) {
                         while (1) {
-                          switch (_context16.prev = _context16.next) {
+                          switch (_context17.prev = _context17.next) {
                             case 0:
                               if (!(e.keyCode == 13)) {
-                                _context16.next = 14;
+                                _context17.next = 14;
                                 break;
                               }
 
                               time = Date.parse(new Date());
 
                               if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
-                                _context16.next = 7;
+                                _context17.next = 7;
                                 break;
                               }
 
@@ -4435,11 +4733,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               _this8.setState({
                                 czkValue: null
                               });
-                              return _context16.abrupt('return');
+                              return _context17.abrupt('return');
 
                             case 7:
                               _this8.keypressStime = null;
-                              _context16.next = 10;
+                              _context17.next = 10;
                               return _this8.loadCzk(e.target.value);
 
                             case 10:
@@ -4450,7 +4748,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                   czkvalue: null
                                 });
                               }
-                              _context16.next = 15;
+                              _context17.next = 15;
                               break;
 
                             case 14:
@@ -4460,14 +4758,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                             case 15:
                             case 'end':
-                              return _context16.stop();
+                              return _context17.stop();
                           }
                         }
-                      }, _callee16, _this8);
+                      }, _callee17, _this8);
                     }));
 
-                    return function (_x11) {
-                      return _ref28.apply(this, arguments);
+                    return function (_x13) {
+                      return _ref30.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4524,8 +4822,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
-                  ref: function ref(_ref29) {
-                    return _this8["inputCzkAmount"] = _ref29;
+                  ref: function ref(_ref31) {
+                    return _this8["inputCzkAmount"] = _ref31;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5118,12 +5416,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.steadCashIntegral)
                 ),
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u53EF\u62B5\u73B0\u91D1\u989D'
+                  '\u672C\u5355\u4F7F\u7528\u79EF\u5206'
                 )
               ),
               _react2.default.createElement(
@@ -5144,7 +5442,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u672C\u5355\u53EF\u7528'
+                  '\u672C\u5355\u53EF\u62B5\u73B0\u91D1\u989D'
                 )
               )
             ),
@@ -5195,8 +5493,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref30) {
-                    return _this8["inputJfdxAmount"] = _ref30;
+                  ref: function ref(_ref32) {
+                    return _this8["inputJfdxAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";