tplus-components-touch 3.28.3 → 3.28.7

package/dist/components/presale/pickup.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["tplus-components-touch/components/presale/pickup.js"],"names":["Pickup","props","getPickupList","status","setState","loading","buyerInfo","billSearchApi","searchWaitPickUpListPaging","customerName","customerPhone","pageIndex","state","data","totalPage","designs","dtos","DetailData","RetailDTO","tableDataList","listColumn","map","v","index","obj","title","OriginalTitle","dataIndex","FieldName","key","width","Width","className","Precision","IsFormat","ellipsis","render","text","val","renderText","formatNumber","record","align","lotNo","tools","dateFormat","creationDate","expirationDate","DtoName","TotalPage","previous","next","selectChange","selectedRowKeys","selectedRows","len","length","selectRetailCode","Retail","code","Message","warn","confirmPickup","hide","handleRefundEvent","retailDTO","find","Code","arr","RetailDetails","forEach","detailObj","selectObj","ID","id","push","console","log","spinning","x","y","hideSelectAll","fixed","onChange","React","Component"],"mappings":"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","file":"pickup.js","sourcesContent":["import React from \"react\";\nimport './style.less';\nimport { Button, Table } from \"antd\";\nimport {Page, Ticon} from \"../../index\";\nimport billSearchApi from \"../billSearch/api\";\nimport _clonedeep from \"lodash/cloneDeep\";\nimport Message from \"../message\";\nimport tools from '../../util/tools';\n\nexport default class Pickup extends React.Component {\n\n    constructor(props) {\n        super(props);\n        this.state = {\n            pageIndex: 0,\n            loading: false,\n            listColumn: [],\n            tableDataList: [],\n            selectRetailCode: '',\n            selectedRowKeys: [],//控制选择行\n            selectedRows: [],\n        }\n    }\n    componentDidMount() {\n        this.getPickupList(null);\n    }\n\n    getPickupList = async (status) => {\n\n        this.setState({ loading: true });\n        const { buyerInfo=[]} = this.props;\n        const { data: { totalPage, designs, dtos: { DetailData, RetailDTO }  } } = await billSearchApi.searchWaitPickUpListPaging({\n            customerName: buyerInfo[0].customerName,\n            customerPhone: buyerInfo[0].customerPhone,\n            pageIndex: this.state.pageIndex,\n        });\n        this.RetailDTO = RetailDTO;\n        let tableDataList = _clonedeep(DetailData);\n\n        let listColumn = designs.map((v, index) => {\n            let obj = {\n                title: v.OriginalTitle,\n                dataIndex: v.FieldName,\n                key: v.FieldName,\n                width: v.Width || 100,\n                className: \"rowClassName\",\n                Precision: v.Precision,\n                IsFormat: v.IsFormat,\n                ellipsis: true,\n            }\n            if (v.Precision) {\n                obj.render = (text) => {\n                    let val = (text || text === 0) ? text : '';\n                    let renderText = billSearchApi.formatNumber(val, v.Precision);\n                    return <span>{renderText}</span>\n                }\n            }\n            if (v.FieldName == 'Code') {\n                obj.width = 250;\n                obj.render = (text, record) => {\n                    return <span>{record['Retail']['code']}</span>\n                }\n            }\n            if (v.FieldName == 'waitPickUpQty') {\n                this.index = index;\n                obj.align = 'center';\n            }\n            if (v.FieldName == 'inventoryCode' || v.FieldName == 'inventoryName'){\n                obj.render = (text, record) => {\n                    return <span>{record['inventoryDTO'][v.FieldName]}</span>\n                }\n            }\n            if (v.FieldName == 'batch'){\n                obj.render = (text, record) => {\n                    return <span>{record.lotNo}</span>\n                }\n            }\n            if (v.FieldName == 'productionDate'){\n                obj.render = (text, record) => {\n                    let renderText = tools.dateFormat(record.creationDate);\n                    return <span>{renderText}</span>\n                }\n            }\n            if (v.FieldName == 'expiryDate'){\n                obj.render = (text, record) => {\n                    let renderText = tools.dateFormat(record.expirationDate);\n                    return <span>{renderText}</span>\n                }\n            }\n            if (v.DtoName == 'UnitDTO'){\n                obj.render = (text, record) => {\n                    return <span>{record['unit']['name']}</span>\n                }\n            }\n            if (v.DtoName == 'StoreDTO'){\n                obj.render = (text, record) =>{\n                    return <span>{record['Retail']['storeId'][v.FieldName]}</span>\n                }\n            }\n            return obj;\n        });\n        this.setState({\n            tableDataList: tableDataList,\n            listColumn: listColumn,\n            TotalPage: totalPage,\n            loading: false,\n            pageIndex: status ? this.state.pageIndex : 0\n        })\n    }\n\n    previous = () => {\n        this.setState({\n            pageIndex: this.state.pageIndex - 1\n        }, () => {\n            this.getPickupList('pageChange');\n        })\n    }\n\n    next = () => {\n        this.setState({\n            pageIndex: this.state.pageIndex + 1\n        }, () => {\n            this.getPickupList('pageChange');\n        })\n    }\n\n    selectChange = (selectedRowKeys, selectedRows) => {\n        let len = selectedRows.length\n        if (len < 2){\n            this.setState({\n                selectedRowKeys,\n                selectedRows,\n                selectRetailCode: selectedRows[0] && selectedRows[0].Retail.code,\n            })\n        } else {\n            if (selectedRows[len-2].Retail.code === selectedRows[len-1].Retail.code){\n                this.setState({\n                    selectedRowKeys,\n                    selectedRows\n                })\n            } else {\n                Message.warn('每次只能取同一个零售订单下的货')\n            }\n        }\n    }\n\n    confirmPickup = async () => {\n\n        const { selectRetailCode, selectedRows, } = this.state;\n\n        if (this.state.selectedRowKeys.length < 1) return Message.warn('请选择取货商品行');\n        const { hide, handleRefundEvent } = this.props;\n\n        let retailDTO = this.RetailDTO.find((obj)=>{return obj.Code === selectRetailCode});\n        let arr = [];\n        retailDTO.RetailDetails.forEach((detailObj)=>{\n            selectedRows.forEach((selectObj)=>{\n                if (detailObj.ID === selectObj.id){\n                    arr.push(detailObj);\n                }\n            })\n        })\n\n        retailDTO.RetailDetails = arr;\n        console.log('取货带回数据zlf', retailDTO);\n        handleRefundEvent && handleRefundEvent(retailDTO);\n        hide && hide();\n    }\n\n    render() {\n        const { pageIndex, TotalPage, listColumn, tableDataList, selectedRowKeys } = this.state;\n        const { hide, buyerInfo=[], } = this.props;\n        return (\n            <div className=\"presale-pickup\">\n                <div className=\"pickup-top\">\n                    <div className=\"pickup-info\">\n                        <label>收货人</label><span>{buyerInfo[0].customerName}</span>\n                        <label>手机号</label><span>{buyerInfo[0].customerPhone}</span>\n                    </div>\n                </div>\n                <div className=\"pickup-table\">\n                    <Table\n                        rowKey = {record => record.id}\n                        columns={listColumn}\n                        dataSource={tableDataList}\n                        parentNodeId='parent'\n                        loading={{\n                            spinning: this.state.loading,\n                        }}\n                        sticky\n                        pagination={false}\n                        scroll={{ x: 900, y: \"calc(~'100% - 75px')\" }}\n                        className='bill-table'\n                        rowSelection={{\n                            selectedRowKeys,\n                            hideSelectAll: true,\n                            fixed: true,\n                            onChange: this.selectChange,\n                        }}\n                    />\n                </div>\n                <div className='pickup-footer'>\n                    <div>\n                        <Page\n                            total={TotalPage}\n                            currentIndex={pageIndex + 1}\n                            previous={this.previous}\n                            next={this.next}\n                        />\n                    </div>\n                    <div>\n                        <Button onClick={hide}>取消</Button>\n                        <Button type=\"primary\" onClick={this.confirmPickup}>取货</Button>\n                    </div>\n                </div>\n            </div>\n        )\n    }\n}"]}

package/dist/components/presale/style.less

@@ -0,0 +1,48 @@
+.pickup{
+  padding: 30px 16px 75px;
+  .presale-pickup{
+    height: 100%;
+    .pickup-top{
+      margin-bottom: 22px;
+      .pickup-info {
+        margin-left: 22px;
+        margin-bottom: 20px;
+        color: #000000;
+        label{
+          margin-right: 5px;
+          color: #666666;
+        }
+        span{
+          margin-right: 100px;
+        }
+      }
+    }
+    .pickup-qty{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .iconKey{
+        height: 50px;
+        line-height: 50px;
+        font-size: 20px;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .pickup-footer{
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    padding: 5px 20px;
+    text-align: right;
+    border-top: 1px solid #EBEBEB;
+    button:last-child{
+      margin-left: 20px;
+    }
+  }
+}

package/dist/components/settlement/settlement.js

@@ -24,6 +24,10 @@ var _carousel = require('antd/es/carousel');
 
 var _carousel2 = _interopRequireDefault(_carousel);
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _button = require('antd/es/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -325,7 +329,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn.PayStyle;
 
-      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto, currentKey);
+      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto);
       var amount = _this2.store.paymode.amount;
       if (amount == 0) {
         _this2.settleZero();
@@ -591,10 +595,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         //         czkVisible: true
         //       })
         //     }
-        //   } 
+        //   }
         //   // else {
         //   //   Message.warn('请先录入会员');
-        //   // } 
+        //   // }
         //   // this.setState({
         // //   czkVisible: true,
         // // });
@@ -1420,7 +1424,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
-      // this.store.changeClickFocusOnly(mode.paymentType);
+      _this2.store.changeClickFocusOnly(mode.paymentType);
       _this2.setCurrentFocusOnly(mode.paymentType);
       if (_this2.hotkeydebounced) {
         _this2.hotkeydebounced.cancel();
@@ -2493,57 +2497,179 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
-    _this2.btnDebounced = function (type, bquick) {
-      _this2.setState({
-        bquick: bquick
-      });
+    _this2.isNoProductTip = function (nonProductMap) {
+      var _ref24 = _this2.context.viewModel.data || {},
+          RetailDetails = _ref24.RetailDetails;
 
-      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn22.PayStyle;
+      var names = [];
+      var temphtml = [];
+      var count = 0;
+      if ((0, _keys2.default)(nonProductMap).length > 0) {
+        var _loop = function _loop(key) {
+          count++;
+          var product = RetailDetails.find(function (o) {
+            return o.Idinventory == key;
+          });
+          names.push('【' + product.Inventory.Name + '】');
+          temphtml.push(count + '、' + nonProductMap[key]);
+        };
 
-      var _this2$store7 = _this2.store,
-          paymode = _this2$store7.paymode,
-          brefund = _this2$store7.brefund,
-          boriginReturn = _this2$store7.boriginReturn,
-          newStyle = _this2$store7.newStyle;
+        for (var key in nonProductMap) {
+          _loop(key);
+        }
+        _modalWraper2.default.warning({
+          title: '不可配送商品',
+          content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join('；')
+        });
+        return true;
+      }
+      return false;
+    };
 
+    _this2.btnDebounced = function () {
+      var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
+        var IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref26, nonProductMap, _ref26$freightProduct, freightProductDTOList, data, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
-      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+        return _regenerator2.default.wrap(function _callee14$(_context14) {
+          while (1) {
+            switch (_context14.prev = _context14.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;
+                //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
-      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
-      });
+                if (!(IdbusiType == 38)) {
+                  _context14.next = 28;
+                  break;
+                }
 
-      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 (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
+                  _context14.next = 7;
+                  break;
+                }
+
+                _context14.next = 7;
+                return _this2.props.openBuyerModal();
+
+              case 7:
+                if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
+                  _context14.next = 28;
+                  break;
+                }
+
+                _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
+                IPMSG = {};
+
+                if (!!window.localStorage.IPMSG) {
+                  IPMSG = JSON.parse(window.localStorage.IPMSG);
+                }
+                _context14.next = 13;
+                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
+
+              case 13:
+                _ref26 = _context14.sent;
+                nonProductMap = _ref26.nonProductMap;
+                _ref26$freightProduct = _ref26.freightProductDTOList;
+                freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
+
+                if (!_this2.isNoProductTip(nonProductMap)) {
+                  _context14.next = 19;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 19:
+                _context14.next = 21;
+                return _this2.props.openWareHouseModal(freightProductDTOList);
+
+              case 21:
+                _context14.next = 23;
+                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
+
+              case 23:
+                data = _context14.sent;
+
+                if (!_this2.isNoProductTip(data.nonProductMap)) {
+                  _context14.next = 26;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 26:
+                _context14.next = 28;
+                return _this2.props.updataFreight(data.freight);
+
+              case 28:
+
+                _this2.setState({
+                  bquick: bquick
+                });
+                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.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))) {
+                  _context14.next = 33;
+                  break;
+                }
+
+                return _context14.abrupt('return', false);
+
+              case 33:
+                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) {
+                  _context14.next = 38;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 38:
+                _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 41:
+              case 'end':
+                return _context14.stop();
+            }
+          }
+        }, _callee14, _this3);
+      }));
+
+      return function (_x8, _x9) {
+        return _ref25.apply(this, arguments);
+      };
+    }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2680,6 +2806,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$getEn26 = _mutantsUtil.enumController.getEnumOj(),
@@ -2769,7 +2897,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'yfje' },
-                paymode.value
+                paymode.value,
+                (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(
@@ -2949,9 +3084,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$getEn27 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn27.PayStyle;
@@ -3124,17 +3259,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref25 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        ICCardServer = _ref25.ICCardServer,
-        ICCardPassword = _ref25.ICCardPassword;
+    var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        ICCardServer = _ref28.ICCardServer,
+        ICCardPassword = _ref28.ICCardPassword,
+        PreSellOrBook = _ref28.PreSellOrBook,
+        PercentageWhenBook = _ref28.PercentageWhenBook;
 
     _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 _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3369,8 +3508,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
           storageValue = _state2.storageValue;
 
-      var _ref27 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref27.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3389,6 +3528,18 @@ 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;
+      }
+      if (IdbusiType == 39) {
+        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
+      }
+
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
         return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
@@ -3433,11 +3584,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref28 = quantityDetail || {},
-          _ref28$buyQuantity = _ref28.buyQuantity,
-          buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
-          _ref28$returnQuantity = _ref28.returnQuantity,
-          returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
+      var _ref31 = quantityDetail || {},
+          _ref31$buyQuantity = _ref31.buyQuantity,
+          buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
+          _ref31$returnQuantity = _ref31.returnQuantity,
+          returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3822,6 +3973,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.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))
+                    )
                   )
                 ),
                 !isReturn && _react2.default.createElement(
@@ -4038,7 +4203,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             //     return;
                             //   }
                             // }
-                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
+                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
                             _this8.onHotKeyClick1(mode, index, boriginReturn);
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
@@ -4816,8 +4981,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref29) {
-                    return _this8["inputCzkAmount"] = _ref29;
+                  ref: function ref(_ref32) {
+                    return _this8["inputCzkAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5434,8 +5599,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref30) {
-                    return _this8["inputJfdxAmount"] = _ref30;
+                  ref: function ref(_ref33) {
+                    return _this8["inputJfdxAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";