tplus-components-touch 3.40.1 → 3.41.1

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');
@@ -362,7 +372,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
@@ -427,6 +439,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;
@@ -458,6 +471,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
+        discountPrototypeTotalAmount += item.DetailDiscountAmount;
         //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
         item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
@@ -468,11 +482,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 + discountPrototypeTotalAmount)
       });
-      console.log(RetailDetails, 'RetailDetails-----');
       return count;
     };
 
@@ -483,7 +496,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
@@ -986,7 +1001,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 200);
 
       // TODO: 测试优惠券支付
-      if (!_this2.store.paymode.currentMode.boriginReturn) {
+
+      var _ref10 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref10.isNewRetailBCPos;
+
+      if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
       }
     };
@@ -1050,7 +1069,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) {
@@ -1068,8 +1087,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref10 = paymode || {},
-          paymodes = _ref10.paymodes;
+      var _ref11 = paymode || {},
+          paymodes = _ref11.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1092,7 +1111,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 +1144,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 +1153,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 +1162,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 +1209,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return bdisabled;
     };
 
-    _this2.onTabsClick = function (key) {
+    _this2.onTabsClick = function (key, bookType) {
       var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn9.PayStyle,
           Differentiate = _enumController$getEn9.Differentiate;
@@ -1219,6 +1238,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 +1272,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 +1305,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 +1314,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,17 +1323,21 @@ 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);
         }
       }
     };
@@ -1350,14 +1377,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) {
@@ -1409,7 +1435,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
         return;
       }
-      _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+
+      var _ref12 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref12.isNewRetailBCPos;
+
+      if (isNewRetailBCPos) {
+        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+      } else {
+        _this2.store.paymode.calcDjqValue(q);
+      }
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
     };
@@ -1481,7 +1515,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 2000);
     };
 
-    _this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
+    _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
+      // 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 +1558,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) {
@@ -1762,7 +1802,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 +1862,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;
 
@@ -1871,7 +1911,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 } else if (MemberPoints && Number(amount) == Number(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 });
@@ -1890,13 +1930,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref14 = dt || {},
-          guestshow_enable = _ref14.guestshow_enable,
-          guestshow_clear = _ref14.guestshow_clear,
-          guestshow_welcome = _ref14.guestshow_welcome,
-          guestshow_collect = _ref14.guestshow_collect,
-          guestshow_refund = _ref14.guestshow_refund,
-          guestshow_change = _ref14.guestshow_change;
+      var _ref16 = dt || {},
+          guestshow_enable = _ref16.guestshow_enable,
+          guestshow_clear = _ref16.guestshow_clear,
+          guestshow_welcome = _ref16.guestshow_welcome,
+          guestshow_collect = _ref16.guestshow_collect,
+          guestshow_refund = _ref16.guestshow_refund,
+          guestshow_change = _ref16.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1931,9 +1971,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -2024,11 +2064,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x6) {
-            return _ref17.apply(this, arguments);
+            return _ref19.apply(this, arguments);
           };
         }();
 
-        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 +2079,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;
@@ -2117,7 +2157,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
@@ -2191,7 +2231,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x5) {
-                    return _ref16.apply(this, arguments);
+                    return _ref18.apply(this, arguments);
                   };
                 }();
 
@@ -2206,13 +2246,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x4) {
-        return _ref15.apply(this, arguments);
+        return _ref17.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -2309,11 +2349,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x8) {
-          return _ref20.apply(this, arguments);
+          return _ref23.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2322,21 +2362,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
+              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
-              if (curmode.value > 0) {
-                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+              if (isNewRetailBCPos) {
+                if (curmode.value > 0) {
+                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
-                if (curmode.paymentType === PayStyle.hyczk) {
-                  if (curmode.cardTypeEnum === 'BALANCE_CARD') {
-                    !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
-                  } else {
-                    curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
+                  if (curmode.paymentType === PayStyle.hyczk) {
+                    if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                      !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                    } else {
+                      curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
+                    }
                   }
                 }
+              } else {
+                if (curmode.member.needPwd && curmode.value > 0) {
+                  promises.push(that.inputPwd(curmode));
+                }
               }
 
               commit = function () {
-                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
@@ -2368,7 +2415,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;
@@ -2386,13 +2433,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x7) {
-                  return _ref19.apply(this, arguments);
+                  return _ref22.apply(this, arguments);
                 };
               }();
 
               handleUserInputs(promises);
 
-            case 6:
+            case 7:
             case 'end':
               return _context14.stop();
           }
@@ -2437,7 +2484,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
@@ -2453,8 +2500,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref22 = that.state || {},
-                          confirmPwd = _ref22.confirmPwd;
+                      var _ref25 = that.state || {},
+                          confirmPwd = _ref25.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2545,8 +2592,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref23 = that.state || {},
-                                    confirmPwd = _ref23.confirmPwd;
+                                var _ref26 = that.state || {},
+                                    confirmPwd = _ref26.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2587,62 +2634,111 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x9) {
-        return _ref21.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
-    _this2.btnDebounced = function (type, bquick) {
-      _this2.setState({
-        bquick: bquick,
-        isInputMember: true
-      });
+    _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 _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 = 10;
+                  break;
+                }
 
-      var _this2$store7 = _this2.store,
-          paymode = _this2$store7.paymode,
-          brefund = _this2$store7.brefund,
-          boriginReturn = _this2$store7.boriginReturn,
-          newStyle = _this2$store7.newStyle;
+                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;
+                  break;
+                }
 
-      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+                title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
+                _context16.next = 10;
+                return _this2.props.openBuyerModal(title);
 
-      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 10:
 
-      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);
-    };
+                _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 = 15;
+                  break;
+                }
+
+                return _context16.abrupt('return', false);
+
+              case 15:
+                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 = 20;
+                  break;
+                }
+
+                return _context16.abrupt('return');
+
+              case 20:
+                _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 23:
+              case 'end':
+                return _context16.stop();
+            }
+          }
+        }, _callee16, _this3);
+      }));
+
+      return function (_x10, _x11) {
+        return _ref27.apply(this, arguments);
+      };
+    }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref28 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref28.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2722,7 +2818,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 +2888,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 +2979,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 +3110,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 +3140,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 +3169,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 +3279,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 +3296,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 +3347,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 _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref29.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref29.ICCardServer,
+        ICCardPassword = _ref29.ICCardPassword,
+        PreSellOrBook = _ref29.PreSellOrBook,
+        PercentageWhenBook = _ref29.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 _ref30 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref30.isHorizontalPad,
+        isHorizontalSunMi = _ref30.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3368,6 +3492,76 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     //that[`inputS${paymode.paymethodId}`]
 
+  }, {
+    key: 'isNoProductTip',
+    value: function isNoProductTip(nonProductMap) {
+      var _ref31 = this.context.viewModel.data || {},
+          RetailDetails = _ref31.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) {
@@ -3395,7 +3589,7 @@ 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(),
@@ -3433,7 +3627,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',
@@ -3489,6 +3683,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           newPassConfirm = _state2.newPassConfirm,
           newPass = _state2.newPass,
           isNotAutoFocus = _state2.isNotAutoFocus;
+
+      var _ref32 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref32.isNewRetailBCPos;
+
       var _store2 = this.store,
           paymode = _store2.paymode,
           brefund = _store2.brefund,
@@ -3506,15 +3704,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
       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 +3747,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 +3771,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 _ref33 = quantityDetail || {},
+          _ref33$buyQuantity = _ref33.buyQuantity,
+          buyQuantity = _ref33$buyQuantity === undefined ? 0 : _ref33$buyQuantity,
+          _ref33$returnQuantity = _ref33.returnQuantity,
+          returnQuantity = _ref33$returnQuantity === undefined ? 0 : _ref33$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3759,7 +3980,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 +4025,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 +4172,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 +4322,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 +4430,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 +4442,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 +4660,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 _ref34 = (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 +4684,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 +4699,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                   czkvalue: null
                                 });
                               }
-                              _context16.next = 15;
+                              _context17.next = 15;
                               break;
 
                             case 14:
@@ -4460,14 +4709,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 _ref34.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4524,8 +4773,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(_ref35) {
+                    return _this8["inputCzkAmount"] = _ref35;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5118,12 +5367,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 +5393,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 +5444,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(_ref36) {
+                    return _this8["inputJfdxAmount"] = _ref36;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";