tplus-components-touch 3.27.1 → 3.27.2

package/dist/components/commonForm/addressPicker/index.js

@@ -86,17 +86,18 @@ var _default = (0, _mobxReact.observer)(_class = function (_Component) {
         var _this = (0, _possibleConstructorReturn3.default)(this, (_default.__proto__ || (0, _getPrototypeOf2.default)(_default)).call(this));
 
         _this.getProvinceData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-            var gql, result, GeoList, data, viewInfo, defaultValue, _defaultValue, geoCode;
+            var _this$props, type, dataDto, gql, result, GeoList, data, viewInfo, defaultValue, _defaultValue, geoCode;
 
             return _regenerator2.default.wrap(function _callee$(_context) {
                 while (1) {
                     switch (_context.prev = _context.next) {
                         case 0:
+                            _this$props = _this.props, type = _this$props.type, dataDto = _this$props.dataDto;
                             gql = '{\n                Geo {\n                geoCode\n                geoName\n                geoLevel\n                parentGeoCode\n            }\n        }';
-                            _context.next = 3;
+                            _context.next = 4;
                             return (0, _tplusApi.gqlQuery)(gql);
 
-                        case 3:
+                        case 4:
                             result = _context.sent;
 
                             console.log(result);
@@ -108,10 +109,18 @@ var _default = (0, _mobxReact.observer)(_class = function (_Component) {
                             defaultValue = viewInfo.defaultValue;
                             _defaultValue = defaultValue, geoCode = _defaultValue.geoCode;
 
-                            if (geoCode) {
-                                defaultValue = _this.dutyDefaultValue(result.Geo, geoCode);
+                            if (type == 'buyer') {
+                                defaultValue = {
+                                    province: dataDto.Province || '北京市',
+                                    city: dataDto.City || '北京市',
+                                    area: dataDto.District || '海淀区'
+                                };
                             } else {
-                                defaultValue = _this.state.defaultValue;
+                                if (geoCode) {
+                                    defaultValue = _this.dutyDefaultValue(result.Geo, geoCode);
+                                } else {
+                                    defaultValue = _this.state.defaultValue;
+                                }
                             }
                             _this.setState({
                                 defaultValue: defaultValue,
@@ -120,7 +129,7 @@ var _default = (0, _mobxReact.observer)(_class = function (_Component) {
                                 _this.onChange((0, _extends3.default)({}, _this.state.defaultValue));
                             });
 
-                        case 13:
+                        case 14:
                         case 'end':
                             return _context.stop();
                     }

package/dist/components/commonForm/addressPicker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/commonForm/addressPicker/index.js"],"names":["FormItem","Item","observer","getProvinceData","gql","result","console","log","GeoList","Geo","data","dutyProvinceData","viewInfo","props","defaultValue","geoCode","dutyDefaultValue","state","setState","provinceData","onChange","findGeo","find","geo","area","geoName","parentGeoCode","city","province","obj","forEach","index","geoLevel","push","findOneProvinceDataToDuty","singleGeo","GeoObj","name","newFilterData","filter","map","setFieldsValue","form","current","changed","FieldName","changeVal","AllowNone","Title","Component"],"mappings":"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","file":"index.js","sourcesContent":["/*\r\n * @Descripttion:\r\n * @version:\r\n * @Author: chenlongad\r\n * @Date: 2021-01-06 09:40:16\r\n * @LastEditors: chenlongad\r\n * @LastEditTime: 2021-10-26 23:41:28\r\n */\r\nimport React, { Component } from 'react';\r\nimport { observer } from 'mobx-react';\r\nimport { Form } from 'antd';\r\nimport ACCitySelect from '../../acCitySelect';\r\nimport { gqlQuery } from 'tplus-api';\r\nimport './style.less'\r\n\r\nconst FormItem = Form.Item;\r\n@observer\r\nexport default class extends Component {\r\n\r\n    constructor() {\r\n        super();\r\n        this.state = {\r\n            defaultValue: { province: '北京市', city: '北京市', area: '东城区', geoCode: '110101' },\r\n            provinceData:null\r\n        }\r\n\r\n    }\r\n    componentWillMount() {\r\n        this.getProvinceData();\r\n    }\r\n    componentDidMount() {\r\n    }\r\n\r\n    getProvinceData = async () => {\r\n        const gql = `{\r\n                Geo {\r\n                geoCode\r\n                geoName\r\n                geoLevel\r\n                parentGeoCode\r\n            }\r\n        }`\r\n        const result = await gqlQuery(gql);\r\n        console.log(result);\r\n        const GeoList = result.Geo;\r\n        let data = this.dutyProvinceData(GeoList);\r\n        console.log(data);\r\n        let viewInfo = this.props.viewInfo;\r\n        let { defaultValue } = viewInfo\r\n        const { geoCode } = defaultValue;\r\n        if(geoCode){\r\n            defaultValue = this.dutyDefaultValue(result.Geo,geoCode);\r\n        }else{\r\n            defaultValue = this.state.defaultValue;\r\n        }\r\n        this.setState({\r\n            defaultValue,\r\n            provinceData:data\r\n        }, () => {\r\n            this.onChange({\r\n                ...this.state.defaultValue\r\n            })\r\n        })\r\n    }\r\n    dutyDefaultValue = (GeoList,geoCode,defaultValue) => {\r\n      let findGeo = GeoList.find((geo)=>geo.geoCode == geoCode);\r\n      if(findGeo){\r\n          if(!defaultValue){\r\n              defaultValue = {area:findGeo.geoName}\r\n              return this.dutyDefaultValue(GeoList,findGeo.parentGeoCode,defaultValue);\r\n          }else{\r\n              if(!defaultValue.city){\r\n                defaultValue.city = findGeo.geoName\r\n                return this.dutyDefaultValue(GeoList,findGeo.parentGeoCode,defaultValue);\r\n              }else{\r\n                defaultValue.province = findGeo.geoName\r\n                return  defaultValue;\r\n              }\r\n          }\r\n      }\r\n    }\r\n\r\n    dutyProvinceData = (GeoList) => {\r\n        let obj = [];\r\n        GeoList.forEach((geo,index) => {\r\n            if (geo.geoLevel === 1) {\r\n                obj.push(this.findOneProvinceDataToDuty(GeoList,index))\r\n            }\r\n        })\r\n        return obj\r\n    }\r\n\r\n    findOneProvinceDataToDuty = (GeoList, index) => {\r\n        const singleGeo = GeoList[index];\r\n        let GeoObj = {\r\n            name: singleGeo.geoName,\r\n            city: []\r\n        };\r\n        let newFilterData = GeoList.filter(Geo => Geo.parentGeoCode == singleGeo.geoCode)\r\n        GeoObj.city = newFilterData.map(Geo =>{return { name:Geo.geoName,area:[...GeoList.filter(geo => geo.parentGeoCode == Geo.geoCode).map(geo=>geo.geoName)]}});\r\n        return GeoObj\r\n    }\r\n\r\n    onChange = (obj) => {\r\n        console.log(obj);\r\n        let viewInfo = this.props.viewInfo;\r\n        const { setFieldsValue } = this.props.form.current;\r\n        const changed = {}\r\n        const FieldName = viewInfo.FieldName;\r\n        changed[FieldName] = `${obj.province},${obj.city},${obj.area}`;\r\n        // setFieldsValue(changed);\r\n        this.props.changeVal && this.props.changeVal(changed);\r\n    }\r\n\r\n    render() {\r\n        let viewInfo = this.props.viewInfo;\r\n        return <FormItem className='time flex' label={<span>{!viewInfo.AllowNone ? <span className=\"error-color\">* </span> : null}{viewInfo.Title}</span>}>\r\n            {\r\n                this.state.provinceData !== null?<ACCitySelect provinceData = { this.state.provinceData} ref='city' onChange={this.onChange} defaultValue={this.state.defaultValue} />:null\r\n            }\r\n        </FormItem>\r\n    }\r\n}\r\n"]}
+{"version":3,"sources":["tplus-components-touch/components/commonForm/addressPicker/index.js"],"names":["FormItem","Item","observer","getProvinceData","props","type","dataDto","gql","result","console","log","GeoList","Geo","data","dutyProvinceData","viewInfo","defaultValue","geoCode","province","Province","city","City","area","District","dutyDefaultValue","state","setState","provinceData","onChange","findGeo","find","geo","geoName","parentGeoCode","obj","forEach","index","geoLevel","push","findOneProvinceDataToDuty","singleGeo","GeoObj","name","newFilterData","filter","map","setFieldsValue","form","current","changed","FieldName","changeVal","AllowNone","Title","Component"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAAA;;;;;;;;;;;;AAQA;;;;AACA;;AAEA;;;;AACA;;AACA;;;;AAEA,IAAMA,WAAW,eAAKC,IAAtB;;mBACCC,mB;;;AAGG,wBAAc;AAAA;;AAAA;;AAAA;;AAAA,cAcdC,eAdc,4EAcI;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,0CACY,MAAKC,KADjB,EACNC,IADM,eACNA,IADM,EACAC,OADA,eACAA,OADA;AAERC,+BAFQ;AAAA;AAAA,mCAUO,wBAASA,GAAT,CAVP;;AAAA;AAURC,kCAVQ;;AAWdC,oCAAQC,GAAR,CAAYF,MAAZ;AACMG,mCAZQ,GAYEH,OAAOI,GAZT;AAaVC,gCAbU,GAaH,MAAKC,gBAAL,CAAsBH,OAAtB,CAbG;;AAcdF,oCAAQC,GAAR,CAAYG,IAAZ;AACIE,oCAfU,GAeC,MAAKX,KAAL,CAAWW,QAfZ;AAgBRC,wCAhBQ,GAgBSD,QAhBT,CAgBRC,YAhBQ;AAAA,4CAiBMA,YAjBN,EAiBNC,OAjBM,iBAiBNA,OAjBM;;AAkBd,gCAAIZ,QAAQ,OAAZ,EAAoB;AAChBW,+CAAe;AACXE,8CAAUZ,QAAQa,QAAR,IAAoB,KADnB;AAEXC,0CAAMd,QAAQe,IAAR,IAAgB,KAFX;AAGXC,0CAAMhB,QAAQiB,QAAR,IAAoB;AAHf,iCAAf;AAKH,6BAND,MAMO;AACH,oCAAGN,OAAH,EAAW;AACPD,mDAAe,MAAKQ,gBAAL,CAAsBhB,OAAOI,GAA7B,EAAiCK,OAAjC,CAAf;AACH,iCAFD,MAEK;AACDD,mDAAe,MAAKS,KAAL,CAAWT,YAA1B;AACH;AACJ;AACD,kCAAKU,QAAL,CAAc;AACVV,0DADU;AAEVW,8CAAad;AAFH,6BAAd,EAGG,YAAM;AACL,sCAAKe,QAAL,4BACO,MAAKH,KAAL,CAAWT,YADlB;AAGH,6BAPD;;AA/Bc;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAdJ;;AAAA,cAsDdQ,gBAtDc,GAsDK,UAACb,OAAD,EAASM,OAAT,EAAiBD,YAAjB,EAAkC;AACnD,gBAAIa,UAAUlB,QAAQmB,IAAR,CAAa,UAACC,GAAD;AAAA,uBAAOA,IAAId,OAAJ,IAAeA,OAAtB;AAAA,aAAb,CAAd;AACA,gBAAGY,OAAH,EAAW;AACP,oBAAG,CAACb,YAAJ,EAAiB;AACbA,mCAAe,EAACM,MAAKO,QAAQG,OAAd,EAAf;AACA,2BAAO,MAAKR,gBAAL,CAAsBb,OAAtB,EAA8BkB,QAAQI,aAAtC,EAAoDjB,YAApD,CAAP;AACH,iBAHD,MAGK;AACD,wBAAG,CAACA,aAAaI,IAAjB,EAAsB;AACpBJ,qCAAaI,IAAb,GAAoBS,QAAQG,OAA5B;AACA,+BAAO,MAAKR,gBAAL,CAAsBb,OAAtB,EAA8BkB,QAAQI,aAAtC,EAAoDjB,YAApD,CAAP;AACD,qBAHD,MAGK;AACHA,qCAAaE,QAAb,GAAwBW,QAAQG,OAAhC;AACA,+BAAQhB,YAAR;AACD;AACJ;AACJ;AACF,SAtEa;;AAAA,cAwEdF,gBAxEc,GAwEK,UAACH,OAAD,EAAa;AAC5B,gBAAIuB,MAAM,EAAV;AACAvB,oBAAQwB,OAAR,CAAgB,UAACJ,GAAD,EAAKK,KAAL,EAAe;AAC3B,oBAAIL,IAAIM,QAAJ,KAAiB,CAArB,EAAwB;AACpBH,wBAAII,IAAJ,CAAS,MAAKC,yBAAL,CAA+B5B,OAA/B,EAAuCyB,KAAvC,CAAT;AACH;AACJ,aAJD;AAKA,mBAAOF,GAAP;AACH,SAhFa;;AAAA,cAkFdK,yBAlFc,GAkFc,UAAC5B,OAAD,EAAUyB,KAAV,EAAoB;AAC5C,gBAAMI,YAAY7B,QAAQyB,KAAR,CAAlB;AACA,gBAAIK,SAAS;AACTC,sBAAMF,UAAUR,OADP;AAETZ,sBAAM;AAFG,aAAb;AAIA,gBAAIuB,gBAAgBhC,QAAQiC,MAAR,CAAe;AAAA,uBAAOhC,IAAIqB,aAAJ,IAAqBO,UAAUvB,OAAtC;AAAA,aAAf,CAApB;AACAwB,mBAAOrB,IAAP,GAAcuB,cAAcE,GAAd,CAAkB,eAAM;AAAC,uBAAO,EAAEH,MAAK9B,IAAIoB,OAAX,EAAmBV,iDAASX,QAAQiC,MAAR,CAAe;AAAA,+BAAOb,IAAIE,aAAJ,IAAqBrB,IAAIK,OAAhC;AAAA,qBAAf,EAAwD4B,GAAxD,CAA4D;AAAA,+BAAKd,IAAIC,OAAT;AAAA,qBAA5D,CAAT,EAAnB,EAAP;AAAmH,aAA5I,CAAd;AACA,mBAAOS,MAAP;AACH,SA3Fa;;AAAA,cA6Fdb,QA7Fc,GA6FH,UAACM,GAAD,EAAS;AAChBzB,oBAAQC,GAAR,CAAYwB,GAAZ;AACA,gBAAInB,WAAW,MAAKX,KAAL,CAAWW,QAA1B;AAFgB,gBAGR+B,cAHQ,GAGW,MAAK1C,KAAL,CAAW2C,IAAX,CAAgBC,OAH3B,CAGRF,cAHQ;;AAIhB,gBAAMG,UAAU,EAAhB;AACA,gBAAMC,YAAYnC,SAASmC,SAA3B;AACAD,oBAAQC,SAAR,IAAwBhB,IAAIhB,QAA5B,SAAwCgB,IAAId,IAA5C,SAAoDc,IAAIZ,IAAxD;AACA;AACA,kBAAKlB,KAAL,CAAW+C,SAAX,IAAwB,MAAK/C,KAAL,CAAW+C,SAAX,CAAqBF,OAArB,CAAxB;AACH,SAtGa;;AAEV,cAAKxB,KAAL,GAAa;AACTT,0BAAc,EAAEE,UAAU,KAAZ,EAAmBE,MAAM,KAAzB,EAAgCE,MAAM,KAAtC,EAA6CL,SAAS,QAAtD,EADL;AAETU,0BAAa;AAFJ,SAAb;;AAFU;AAOb;;;;6CACoB;AACjB,iBAAKxB,eAAL;AACH;;;4CACmB,CACnB;;;iCA4FQ;AACL,gBAAIY,WAAW,KAAKX,KAAL,CAAWW,QAA1B;AACA,mBAAO;AAAC,wBAAD;AAAA,kBAAU,WAAU,WAApB,EAAgC,OAAO;AAAA;AAAA;AAAO,yBAACA,SAASqC,SAAV,GAAsB;AAAA;AAAA,8BAAM,WAAU,aAAhB;AAAA;AAAA,yBAAtB,GAAgE,IAAvE;AAA6ErC,iCAASsC;AAAtF,qBAAvC;AAEC,qBAAK5B,KAAL,CAAWE,YAAX,KAA4B,IAA5B,GAAiC,8BAAC,sBAAD,IAAc,cAAiB,KAAKF,KAAL,CAAWE,YAA1C,EAAwD,KAAI,MAA5D,EAAmE,UAAU,KAAKC,QAAlF,EAA4F,cAAc,KAAKH,KAAL,CAAWT,YAArH,GAAjC,GAAuK;AAFxK,aAAP;AAKH;;;EAjHwBsC,gB","file":"index.js","sourcesContent":["/*\r\n * @Descripttion:\r\n * @version:\r\n * @Author: chenlongad\r\n * @Date: 2021-01-06 09:40:16\r\n * @LastEditors: chenlongad\r\n * @LastEditTime: 2021-10-26 23:41:28\r\n */\r\nimport React, { Component } from 'react';\r\nimport { observer } from 'mobx-react';\r\nimport { Form } from 'antd';\r\nimport ACCitySelect from '../../acCitySelect';\r\nimport { gqlQuery } from 'tplus-api';\r\nimport './style.less'\r\n\r\nconst FormItem = Form.Item;\r\n@observer\r\nexport default class extends Component {\r\n\r\n    constructor() {\r\n        super();\r\n        this.state = {\r\n            defaultValue: { province: '北京市', city: '北京市', area: '东城区', geoCode: '110101' },\r\n            provinceData:null\r\n        }\r\n\r\n    }\r\n    componentWillMount() {\r\n        this.getProvinceData();\r\n    }\r\n    componentDidMount() {\r\n    }\r\n\r\n    getProvinceData = async () => {\r\n        const { type, dataDto } = this.props;\r\n        const gql = `{\r\n                Geo {\r\n                geoCode\r\n                geoName\r\n                geoLevel\r\n                parentGeoCode\r\n            }\r\n        }`\r\n        const result = await gqlQuery(gql);\r\n        console.log(result);\r\n        const GeoList = result.Geo;\r\n        let data = this.dutyProvinceData(GeoList);\r\n        console.log(data);\r\n        let viewInfo = this.props.viewInfo;\r\n        let { defaultValue } = viewInfo\r\n        const { geoCode } = defaultValue;\r\n        if (type == 'buyer'){\r\n            defaultValue = {\r\n                province: dataDto.Province || '北京市',\r\n                city: dataDto.City || '北京市',\r\n                area: dataDto.District || '海淀区',\r\n            }\r\n        } else {\r\n            if(geoCode){\r\n                defaultValue = this.dutyDefaultValue(result.Geo,geoCode);\r\n            }else{\r\n                defaultValue = this.state.defaultValue;\r\n            }\r\n        }\r\n        this.setState({\r\n            defaultValue,\r\n            provinceData:data\r\n        }, () => {\r\n            this.onChange({\r\n                ...this.state.defaultValue\r\n            })\r\n        })\r\n    }\r\n    dutyDefaultValue = (GeoList,geoCode,defaultValue) => {\r\n      let findGeo = GeoList.find((geo)=>geo.geoCode == geoCode);\r\n      if(findGeo){\r\n          if(!defaultValue){\r\n              defaultValue = {area:findGeo.geoName}\r\n              return this.dutyDefaultValue(GeoList,findGeo.parentGeoCode,defaultValue);\r\n          }else{\r\n              if(!defaultValue.city){\r\n                defaultValue.city = findGeo.geoName\r\n                return this.dutyDefaultValue(GeoList,findGeo.parentGeoCode,defaultValue);\r\n              }else{\r\n                defaultValue.province = findGeo.geoName\r\n                return  defaultValue;\r\n              }\r\n          }\r\n      }\r\n    }\r\n\r\n    dutyProvinceData = (GeoList) => {\r\n        let obj = [];\r\n        GeoList.forEach((geo,index) => {\r\n            if (geo.geoLevel === 1) {\r\n                obj.push(this.findOneProvinceDataToDuty(GeoList,index))\r\n            }\r\n        })\r\n        return obj\r\n    }\r\n\r\n    findOneProvinceDataToDuty = (GeoList, index) => {\r\n        const singleGeo = GeoList[index];\r\n        let GeoObj = {\r\n            name: singleGeo.geoName,\r\n            city: []\r\n        };\r\n        let newFilterData = GeoList.filter(Geo => Geo.parentGeoCode == singleGeo.geoCode)\r\n        GeoObj.city = newFilterData.map(Geo =>{return { name:Geo.geoName,area:[...GeoList.filter(geo => geo.parentGeoCode == Geo.geoCode).map(geo=>geo.geoName)]}});\r\n        return GeoObj\r\n    }\r\n\r\n    onChange = (obj) => {\r\n        console.log(obj);\r\n        let viewInfo = this.props.viewInfo;\r\n        const { setFieldsValue } = this.props.form.current;\r\n        const changed = {}\r\n        const FieldName = viewInfo.FieldName;\r\n        changed[FieldName] = `${obj.province},${obj.city},${obj.area}`;\r\n        // setFieldsValue(changed);\r\n        this.props.changeVal && this.props.changeVal(changed);\r\n    }\r\n\r\n    render() {\r\n        let viewInfo = this.props.viewInfo;\r\n        return <FormItem className='time flex' label={<span>{!viewInfo.AllowNone ? <span className=\"error-color\">* </span> : null}{viewInfo.Title}</span>}>\r\n            {\r\n                this.state.provinceData !== null?<ACCitySelect provinceData = { this.state.provinceData} ref='city' onChange={this.onChange} defaultValue={this.state.defaultValue} />:null\r\n            }\r\n        </FormItem>\r\n    }\r\n}\r\n"]}

package/dist/components/commonForm/index.js

@@ -142,14 +142,20 @@ var _default = (0, _mobxReact.observer)(_class = function (_React$Component) {
         };
 
         _this.valuesChange = function (changedValues, allValues) {
-            var viewInfo = _this.props.viewInfo;
+            var _this$props = _this.props,
+                viewInfo = _this$props.viewInfo,
+                type = _this$props.type,
+                changeVal = _this$props.changeVal;
 
             for (var key in changedValues) {
                 if (changedValues[key] instanceof _moment2.default) {
                     changedValues[key] = handdleDateOut(changedValues[key]);
                 }
+                if (type == 'buyer' && key === 'Address') {
+                    return;
+                }
             }
-            _this.props.changeVal && _this.props.changeVal(changedValues);
+            changeVal && changeVal(changedValues);
         };
 
         _this.state = {
@@ -210,7 +216,7 @@ var _default = (0, _mobxReact.observer)(_class = function (_React$Component) {
                         case 'NumTextBox':
                             return _react2.default.createElement(_inputNumber2.default, { key: index, viewInfo: el, form: props.form, changeVal: props.changeVal });
                         case 'SelectAddress':
-                            return _react2.default.createElement(_addressPicker2.default, { key: index, viewInfo: el, form: props.form, changeVal: props.changeVal });
+                            return _react2.default.createElement(_addressPicker2.default, { key: index, viewInfo: el, type: props.type, dataDto: props.data, form: props.form, changeVal: props.changeVal });
                         default:
                             return _react2.default.createElement(_formControl2.default, { key: index, viewInfo: el, form: props.form });
                     }

package/dist/components/commonForm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/commonForm/index.js"],"names":["handdleDate","value","tools","isNull","Moment","valueOf","Date","getTime","handdleDateOut","fieldValue","format","observer","props","handleInputFocus","isHorizontalPad","memberModal","document","getElementsByClassName","input","getElementsByTagName","setTimeout","console","log","focus","click","getPropsToFields","obj","data","viewInfo","forEach","el","FieldName","lastIndexOf","push","name","split","JSON","getCellValue","ControlType","valuesChange","changedValues","allValues","key","changeVal","state","selectedValue","selectedValue2","platform","values","onFinish","errorFields","outOfDate","onFinishFailed","styles","form","span","map","index","Visible","getMemberReferData","React","Component"],"mappings":"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","file":"index.js","sourcesContent":["/**\r\n *\r\n * @title 表单校验\r\n * @description 用户信息录入实例\r\n */\r\nimport React from 'react';\r\nimport { Form } from 'antd';\r\nimport FormControl from './formControl';\r\nimport Radio from './radio';\r\nimport DatePickerControl from './datePicker';\r\nimport AutoComplete from './autoComplete';\r\nimport InputNumber from './inputNumber';\r\nimport AddressPicker from './addressPicker';\r\nimport _get from 'lodash/get';\r\nimport Moment from 'moment';\r\nimport { tools } from 'mutants-util';\r\nimport { observer } from 'mobx-react';\r\nimport { platform } from 'mutants-util';\r\n\r\n//输入datepicker控制；\r\nconst handdleDate = (value) => {\r\n    if (tools.isNull(value)) {\r\n        value = null;\r\n        return value;\r\n    }\r\n\r\n    if (!(value instanceof Moment)) {\r\n        value = Moment(value)\r\n    }\r\n\r\n    if (value && value.valueOf() < (new Date(1900, 1, 1)).getTime()) {\r\n        value = null;\r\n    }\r\n\r\n    return value;\r\n}\r\nconst handdleDateOut = (fieldValue) => {\r\n    return new Date(fieldValue.format('YYYY/MM/DD'));\r\n}\r\n@observer\r\nexport default class extends React.Component {\r\n    constructor(props) {\r\n        super(props);\r\n        this.state = {\r\n            selectedValue: '',\r\n            selectedValue2: 'headquarters'\r\n        };\r\n        const { isHorizontalPad } = platform || {};\r\n        this.isHorizontalPad = !!isHorizontalPad;\r\n    }\r\n    // submit = (e) => {\r\n    //     this.props.form.current.validateFields((err, values) => {\r\n    //         if (err) {\r\n    //             this.props.onsubmit()\r\n    //             console.log('校验失败', values, err);\r\n    //         } else {\r\n    //             console.log('提交成功', values)\r\n    //         }\r\n    //     });\r\n    // }\r\n    handleInputFocus = () => {\r\n        if (this.isHorizontalPad) return;\r\n        const memberModal = document.getElementsByClassName('common-form')[0];\r\n        if (!memberModal) return;\r\n        const input = memberModal.getElementsByTagName('input')[0];\r\n        if (input) setTimeout(() => { console.log('commonForm==Focus==');input.focus();input.click(); }, 300);\r\n    }\r\n\r\n    componentDidMount() {\r\n        this.handleInputFocus()\r\n    }\r\n    getPropsToFields = () => {\r\n        let obj = [];\r\n        let data = this.props.data;\r\n\r\n        this.props.viewInfo.forEach((el) => {\r\n            let value = '';\r\n            if (el.FieldName.lastIndexOf(\".\") > 0) {\r\n                value = _get(data, el.FieldName);\r\n                obj.push({name: el.FieldName.split('.'), value: value});\r\n            }\r\n            else {\r\n                value = JSON.getCellValue(data, el.FieldName);\r\n                obj.push({name: el.FieldName, value: value});\r\n            }\r\n\r\n            if (el.ControlType == 'DateDropDown') {\r\n                value = handdleDate(value);\r\n                obj.push({name: el.FieldName, value: value});\r\n            }\r\n        })\r\n        return obj;\r\n    };\r\n    valuesChange = (changedValues, allValues) => {\r\n        const { viewInfo } = this.props;\r\n        for (let key in changedValues) {\r\n            if (changedValues[key] instanceof Moment) {\r\n                changedValues[key] = handdleDateOut(changedValues[key])\r\n            }\r\n        }\r\n        this.props.changeVal && this.props.changeVal(changedValues);\r\n    }\r\n    render() {\r\n        const props = this.props;\r\n        return (\r\n            <Form name=\"commonForm\" className='common-form' fields={this.getPropsToFields()} onValuesChange={this.valuesChange} onFinish={(values)=>props.onFinish(values)}\r\n                  onFinishFailed={({values, errorFields, outOfDate})=>{props.onFinishFailed(values, errorFields, outOfDate)}}\r\n                  style={props.styles || {}} ref={props.form} labelCol={{ span: 8 }} wrapperCol={{span: 9}} preserve={false}>\r\n                {props.viewInfo.map((el, index) => {\r\n                    if (!el.Visible) return\r\n                    switch (el.ControlType) {\r\n                        case 'TextBox': return <FormControl key={index} viewInfo={el} form={props.form} changeVal={props.changeVal}></FormControl>\r\n                        case 'ComboBox': return <Radio key={index} viewInfo={el} getMemberReferData={props.getMemberReferData} changeVal={props.changeVal} form={props.form}></Radio>\r\n                        case 'DateDropDown': return <DatePickerControl key={index} viewInfo={el} form={props.form}></DatePickerControl>\r\n                        case 'RefComplexBox': return <AutoComplete key={index} getMemberReferData={props.getMemberReferData} changeVal={props.changeVal} viewInfo={el} form={props.form}></AutoComplete>\r\n                        case 'NumTextBox': return <InputNumber key={index} viewInfo={el} form={props.form} changeVal={props.changeVal}></InputNumber>\r\n                        case 'SelectAddress': return <AddressPicker key={index} viewInfo={el} form={props.form} changeVal={props.changeVal}></AddressPicker>\r\n                        default: return <FormControl key={index} viewInfo={el} form={props.form}></FormControl>\r\n                    }\r\n                })}\r\n            </Form>\r\n        )\r\n    }\r\n}"]}
+{"version":3,"sources":["tplus-components-touch/components/commonForm/index.js"],"names":["handdleDate","value","tools","isNull","Moment","valueOf","Date","getTime","handdleDateOut","fieldValue","format","observer","props","handleInputFocus","isHorizontalPad","memberModal","document","getElementsByClassName","input","getElementsByTagName","setTimeout","console","log","focus","click","getPropsToFields","obj","data","viewInfo","forEach","el","FieldName","lastIndexOf","push","name","split","JSON","getCellValue","ControlType","valuesChange","changedValues","allValues","type","changeVal","key","state","selectedValue","selectedValue2","platform","values","onFinish","errorFields","outOfDate","onFinishFailed","styles","form","span","map","index","Visible","getMemberReferData","React","Component"],"mappings":"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","file":"index.js","sourcesContent":["/**\r\n *\r\n * @title 表单校验\r\n * @description 用户信息录入实例\r\n */\r\nimport React from 'react';\r\nimport { Form } from 'antd';\r\nimport FormControl from './formControl';\r\nimport Radio from './radio';\r\nimport DatePickerControl from './datePicker';\r\nimport AutoComplete from './autoComplete';\r\nimport InputNumber from './inputNumber';\r\nimport AddressPicker from './addressPicker';\r\nimport _get from 'lodash/get';\r\nimport Moment from 'moment';\r\nimport { tools } from 'mutants-util';\r\nimport { observer } from 'mobx-react';\r\nimport { platform } from 'mutants-util';\r\n\r\n//输入datepicker控制；\r\nconst handdleDate = (value) => {\r\n    if (tools.isNull(value)) {\r\n        value = null;\r\n        return value;\r\n    }\r\n\r\n    if (!(value instanceof Moment)) {\r\n        value = Moment(value)\r\n    }\r\n\r\n    if (value && value.valueOf() < (new Date(1900, 1, 1)).getTime()) {\r\n        value = null;\r\n    }\r\n\r\n    return value;\r\n}\r\nconst handdleDateOut = (fieldValue) => {\r\n    return new Date(fieldValue.format('YYYY/MM/DD'));\r\n}\r\n@observer\r\nexport default class extends React.Component {\r\n    constructor(props) {\r\n        super(props);\r\n        this.state = {\r\n            selectedValue: '',\r\n            selectedValue2: 'headquarters'\r\n        };\r\n        const { isHorizontalPad } = platform || {};\r\n        this.isHorizontalPad = !!isHorizontalPad;\r\n    }\r\n    // submit = (e) => {\r\n    //     this.props.form.current.validateFields((err, values) => {\r\n    //         if (err) {\r\n    //             this.props.onsubmit()\r\n    //             console.log('校验失败', values, err);\r\n    //         } else {\r\n    //             console.log('提交成功', values)\r\n    //         }\r\n    //     });\r\n    // }\r\n    handleInputFocus = () => {\r\n        if (this.isHorizontalPad) return;\r\n        const memberModal = document.getElementsByClassName('common-form')[0];\r\n        if (!memberModal) return;\r\n        const input = memberModal.getElementsByTagName('input')[0];\r\n        if (input) setTimeout(() => { console.log('commonForm==Focus==');input.focus();input.click(); }, 300);\r\n    }\r\n\r\n    componentDidMount() {\r\n        this.handleInputFocus()\r\n    }\r\n    getPropsToFields = () => {\r\n        let obj = [];\r\n        let data = this.props.data;\r\n\r\n        this.props.viewInfo.forEach((el) => {\r\n            let value = '';\r\n            if (el.FieldName.lastIndexOf(\".\") > 0) {\r\n                value = _get(data, el.FieldName);\r\n                obj.push({name: el.FieldName.split('.'), value: value});\r\n            }\r\n            else {\r\n                value = JSON.getCellValue(data, el.FieldName);\r\n                obj.push({name: el.FieldName, value: value});\r\n            }\r\n\r\n            if (el.ControlType == 'DateDropDown') {\r\n                value = handdleDate(value);\r\n                obj.push({name: el.FieldName, value: value});\r\n            }\r\n        })\r\n        return obj;\r\n    };\r\n    valuesChange = (changedValues, allValues) => {\r\n        const { viewInfo, type, changeVal } = this.props;\r\n        for (let key in changedValues) {\r\n            if (changedValues[key] instanceof Moment) {\r\n                changedValues[key] = handdleDateOut(changedValues[key]);\r\n            }\r\n            if ( type == 'buyer' && key  === 'Address'){\r\n                return;\r\n            }\r\n        }\r\n        changeVal && changeVal(changedValues);\r\n    }\r\n    render() {\r\n        const props = this.props;\r\n        return (\r\n            <Form name=\"commonForm\" className='common-form' fields={this.getPropsToFields()} onValuesChange={this.valuesChange} onFinish={(values)=>props.onFinish(values)}\r\n                  onFinishFailed={({values, errorFields, outOfDate})=>{props.onFinishFailed(values, errorFields, outOfDate)}}\r\n                  style={props.styles || {}} ref={props.form} labelCol={{ span: 8 }} wrapperCol={{span: 9}} preserve={false}>\r\n                {props.viewInfo.map((el, index) => {\r\n                    if (!el.Visible) return\r\n                    switch (el.ControlType) {\r\n                        case 'TextBox': return <FormControl key={index} viewInfo={el} form={props.form} changeVal={props.changeVal}></FormControl>\r\n                        case 'ComboBox': return <Radio key={index} viewInfo={el} getMemberReferData={props.getMemberReferData} changeVal={props.changeVal} form={props.form}></Radio>\r\n                        case 'DateDropDown': return <DatePickerControl key={index} viewInfo={el} form={props.form}></DatePickerControl>\r\n                        case 'RefComplexBox': return <AutoComplete key={index} getMemberReferData={props.getMemberReferData} changeVal={props.changeVal} viewInfo={el} form={props.form}></AutoComplete>\r\n                        case 'NumTextBox': return <InputNumber key={index} viewInfo={el} form={props.form} changeVal={props.changeVal}></InputNumber>\r\n                        case 'SelectAddress': return <AddressPicker key={index} viewInfo={el} type={props.type} dataDto={props.data} form={props.form} changeVal={props.changeVal}></AddressPicker>\r\n                        default: return <FormControl key={index} viewInfo={el} form={props.form}></FormControl>\r\n                    }\r\n                })}\r\n            </Form>\r\n        )\r\n    }\r\n}"]}

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);
@@ -2493,9 +2497,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       };
     }();
 
+    _this2.isNoProductTip = function (nonProductMap) {
+      var names = [];
+      var temphtml = [];
+      var count = 0;
+      if ((0, _keys2.default)(nonProductMap).length > 0) {
+        for (var key in nonProductMap) {
+          count++;
+          names.push('【' + key + '】');
+          temphtml.push(count + '、' + nonProductMap[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 _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
-        var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, dto, IPMSG, _ref26, _ref26$data, nonProductMap, freightProductDTOList, len, names, temphtml, _ref27, freight, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
+        var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref26, nonProductMap, _ref26$freightProduct, freightProductDTOList, data, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee14$(_context14) {
           while (1) {
@@ -2505,7 +2528,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
                 if (!(IdbusiType == 38)) {
-                  _context14.next = 46;
+                  _context14.next = 28;
                   break;
                 }
 
@@ -2519,85 +2542,58 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 5:
                 if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                  _context14.next = 46;
+                  _context14.next = 28;
                   break;
                 }
 
                 _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
-                dto = _this2.context.viewModel.data.cut();
-
-                dto.AddressLng = '116.244057';
-                dto.AddressLat = '40.068669';
-                dto.Address = '北清路68号用友产业园东区19C座';
-                dto.Province = '北京市';
-                dto.City = '北京市';
-                dto.District = '海淀区';
-                // cc结算调用
                 IPMSG = {};
 
                 if (!!window.localStorage.IPMSG) {
                   IPMSG = JSON.parse(window.localStorage.IPMSG);
                 }
-                _context14.next = 18;
-                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: dto });
+                _context14.next = 11;
+                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-              case 18:
+              case 11:
                 _ref26 = _context14.sent;
-                _ref26$data = _ref26.data;
-                nonProductMap = _ref26$data.nonProductMap;
-                freightProductDTOList = _ref26$data.freightProductDTOList;
-                len = nonProductMap.length;
+                nonProductMap = _ref26.nonProductMap;
+                _ref26$freightProduct = _ref26.freightProductDTOList;
+                freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
+
+                console.log('zlfnonProductMap', nonProductMap);
+                console.log('zlffreightProductDTOList', freightProductDTOList);
 
-                if (!(len > 0)) {
-                  _context14.next = 29;
+                if (!_this2.isNoProductTip(nonProductMap)) {
+                  _context14.next = 19;
                   break;
                 }
 
-                names = [];
-                temphtml = [];
-
-                nonProductMap.forEach(function (obj, index) {
-                  for (var key in obj) {
-                    names.push('【' + key + '】');
-                    temphtml.push(index + 1 + '、' + obj[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 _context14.abrupt('return');
 
-              case 29:
-                _context14.next = 31;
+              case 19:
+                _context14.next = 21;
                 return _this2.props.openWareHouseModal(freightProductDTOList);
 
-              case 31:
-
-                dto = _this2.context.viewModel.data.cut();
-                dto.AddressLng = '116.244057';
-                dto.AddressLat = '40.068669';
-                dto.Address = '北清路68号用友产业园东区19C座';
-                dto.Province = '北京市';
-                dto.City = '北京市';
-                dto.District = '海淀区';
+              case 21:
+                _context14.next = 23;
+                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
 
-                _context14.next = 40;
-                return getPosFreight({ cip: IPMSG.query || "", dto: dto });
+              case 23:
+                data = _context14.sent;
 
-              case 40:
-                _ref27 = _context14.sent;
-                freight = _ref27.data.freight;
+                if (!_this2.isNoProductTip(data.nonProductMap)) {
+                  _context14.next = 26;
+                  break;
+                }
 
-                updataFreight(freight);
-                _context14.next = 45;
-                return _this2.props.updataFreight(freight);
+                return _context14.abrupt('return');
 
-              case 45:
-                console.log('zlf获取运费', freight);
+              case 26:
+                _context14.next = 28;
+                return _this2.props.updataFreight(data.freight);
 
-              case 46:
+              case 28:
 
                 _this2.setState({
                   bquick: bquick
@@ -2606,13 +2602,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
 
                 if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
-                  _context14.next = 51;
+                  _context14.next = 33;
                   break;
                 }
 
                 return _context14.abrupt('return', false);
 
-              case 51:
+              case 33:
                 status = false;
 
                 paymode.thePaymodes.forEach(function (v) {
@@ -2625,13 +2621,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!_this2.btndebounced) {
-                  _context14.next = 56;
+                  _context14.next = 38;
                   break;
                 }
 
                 return _context14.abrupt('return');
 
-              case 56:
+              case 38:
                 _this2.btndebounced = (0, _debounce3.default)(function () {
                   if (bquick) {
                     _this2.quickSettle(type);
@@ -2648,7 +2644,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.btndebounced = null;
                 }, 2000);
 
-              case 59:
+              case 41:
               case 'end':
                 return _context14.stop();
             }
@@ -2663,8 +2659,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref28 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref28.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2801,7 +2797,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
+      var _this2$context$viewMo2 = _this2.context.viewModel.data,
+          BuyerPayFreight = _this2$context$viewMo2.BuyerPayFreight,
+          DistributionMode = _this2$context$viewMo2.DistributionMode;
       // 付款弹窗
+
       return new _promise2.default(function (resolve, reject) {
         var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
             PayStyle = _enumController$getEn26.PayStyle,
@@ -2890,7 +2890,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(
@@ -3245,14 +3252,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref29 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref29$loginInfo = _ref29.loginInfo;
+    var _ref28 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref28$loginInfo = _ref28.loginInfo;
 
-    _ref29$loginInfo = _ref29$loginInfo === undefined ? {} : _ref29$loginInfo;
-    var ICCardServer = _ref29$loginInfo.ICCardServer,
-        ICCardPassword = _ref29$loginInfo.ICCardPassword,
-        Book = _ref29$loginInfo.Book,
-        PercentageWhenBook = _ref29$loginInfo.PercentageWhenBook;
+    _ref28$loginInfo = _ref28$loginInfo === undefined ? {} : _ref28$loginInfo;
+    var ICCardServer = _ref28$loginInfo.ICCardServer,
+        ICCardPassword = _ref28$loginInfo.ICCardPassword,
+        Book = _ref28$loginInfo.Book,
+        PercentageWhenBook = _ref28$loginInfo.PercentageWhenBook;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
@@ -3260,9 +3267,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref30 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref30.isHorizontalPad,
-        isHorizontalSunMi = _ref30.isHorizontalSunMi;
+    var _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3497,8 +3504,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
           storageValue = _state2.storageValue;
 
-      var _ref31 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref31.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3520,9 +3527,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       //收订金
 
-      var _ref32 = this.context && this.context.viewModel && this.context.viewModel.data,
-          IdbusiType = _ref32.IdbusiType,
-          DistributionMode = _ref32.DistributionMode;
+      var _ref31 = this.context && this.context.viewModel && this.context.viewModel.data,
+          IdbusiType = _ref31.IdbusiType,
+          DistributionMode = _ref31.DistributionMode,
+          BuyerPayFreight = _ref31.BuyerPayFreight;
 
       if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
         totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
@@ -3575,11 +3583,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      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 _ref32 = quantityDetail || {},
+          _ref32$buyQuantity = _ref32.buyQuantity,
+          buyQuantity = _ref32$buyQuantity === undefined ? 0 : _ref32$buyQuantity,
+          _ref32$returnQuantity = _ref32.returnQuantity,
+          returnQuantity = _ref32$returnQuantity === undefined ? 0 : _ref32$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3964,6 +3972,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(
@@ -4958,8 +4980,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(_ref34) {
-                    return _this8["inputCzkAmount"] = _ref34;
+                  ref: function ref(_ref33) {
+                    return _this8["inputCzkAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5576,8 +5598,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(_ref35) {
-                    return _this8["inputJfdxAmount"] = _ref35;
+                  ref: function ref(_ref34) {
+                    return _this8["inputJfdxAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";