@kmkf-fe-packages/services-components 2.10.9-beta.6 → 2.10.9-beta.60

package/dist/esm/components/CommonMultiStatus/index.js

@@ -134,6 +134,60 @@ var typeMap = {
     failValue: "失败",
     dataType: "array_object"
   },
+  WDT_WAREHOUSING_STATUS_V2: {
+    options: [{
+      value: "0",
+      label: "无需入库",
+      color: "#333333"
+    }, {
+      value: "1",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "2",
+      label: "部分入库",
+      color: "#e7780f"
+    }, {
+      value: "3",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      value: "4",
+      label: "已入库-多收",
+      color: "#e7780f"
+    }],
+    key: "wdtInStockStatusV2ItemList",
+    code: "wdtInStockStatusV2List",
+    name: "旺店通商品入库状态V2",
+    type: 2,
+    valueKey: "status",
+    idKey: "systemOrderId",
+    failValue: "失败",
+    dataType: "array_object"
+  },
+  DXD_WAREHOUSING_STATUS: {
+    options: [{
+      value: "1",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      value: "2",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "3",
+      label: "查无此单",
+      color: "#e7780f"
+    }],
+    key: "dxdInStockStatusItemList",
+    code: "dxdInStockStatusList",
+    name: "商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "systemOrderId",
+    failValue: "失败",
+    dataType: "array_object"
+  },
   WLN_WAREHOUSING_STATUS: {
     options: [{
       value: "1",
@@ -219,6 +273,33 @@ var typeMap = {
     failValue: "失败",
     dataType: "array_object"
   },
+  TTX_WAREHOUSING_STATUS: {
+    options: [{
+      value: "1",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "2",
+      label: "部分入库",
+      color: "#e7780f"
+    }, {
+      value: "3",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      label: "已入库-多收",
+      value: "4",
+      color: "#e7780f"
+    }],
+    key: "ttxInStockStatusItemList",
+    code: "ttxInStockStatusList",
+    name: "通天晓商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "sourceTradeNo",
+    failValue: "失败",
+    dataType: "array_object"
+  },
   KM_WAREHOUSING_STATUS: {
     options: [{
       value: "0",
@@ -241,6 +322,37 @@ var typeMap = {
     idKey: "systemOrderId",
     failValue: "失败",
     dataType: "array_object"
+  },
+  JY_WAREHOUSING_STATUS: {
+    options: [{
+      value: "0",
+      label: "无需入库",
+      color: "#333333"
+    }, {
+      value: "1",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "2",
+      label: "部分入库",
+      color: "#e7780f"
+    }, {
+      value: "3",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      value: "4",
+      label: "已入库-多收",
+      color: "#e7780f"
+    }],
+    key: "jyInStockStatusItemList",
+    code: "jyInStockStatusList",
+    name: "巨益商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "sourceTradeNo",
+    failValue: "失败",
+    dataType: "array_object"
   }
 };
 var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
@@ -250,7 +362,9 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     _typeMap$options$type3,
     _typeMap$options$type4,
     _this$componentConfig5,
-    _this$componentConfig6;
+    _this$componentConfig6,
+    _this$ext4;
+  var ext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   _classCallCheck(this, CommonMultiStatus);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -265,6 +379,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "isSingleValue", void 0);
+  _defineProperty(this, "ext", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _typeMap$_this$type4;
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
@@ -343,13 +458,13 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _typeMap$_this$type21, _item$templateConfig;
+    var _this$ext, _typeMap$_this$type21, _this$ext2, _item$templateConfig, _this$ext3;
     return {
-      searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
+      searchDefaultConditions: (_this$ext = _this.ext) !== null && _this$ext !== void 0 && _this$ext.isWarehousingStatus ? SYMBOL.in : SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.code),
       name: "".concat(_this.name),
-      filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
+      filterComponentType: (_this$ext2 = _this.ext) !== null && _this$ext2 !== void 0 && _this$ext2.isWarehousingStatus ? "MultipleSelect" : "SelectInput",
       props: {
         options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
         fieldNames: {
@@ -364,7 +479,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type22 = typeMap[_this.type]) === null || _typeMap$_this$type22 === void 0 ? void 0 : _typeMap$_this$type22.code), value);
         };
       },
-      formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
+      formatFilterValue: (_this$ext3 = _this.ext) !== null && _this$ext3 !== void 0 && _this$ext3.isWarehousingStatus ? null : function (value) {
         if (value.type === "in") {
           return value.keywords;
         } else {
@@ -384,6 +499,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
+  this.ext = ext;
   this.dataType = (_typeMap$options$type3 = (_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.dataType) !== null && _typeMap$options$type3 !== void 0 ? _typeMap$options$type3 : "object";
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
@@ -400,6 +516,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     }
   }] : [];
   this.align = "left";
-  this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS" || this.type === "WLN_WAREHOUSING_STATUS" || this.type === "JST_WAREHOUSING_STATUS" || this.type === "JKY_WAREHOUSING_STATUS";
+  //优化写法，this.type !== "WAREHOUSING_STATUS"不修改原有逻辑
+  this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || ((_this$ext4 = this.ext) === null || _this$ext4 === void 0 ? void 0 : _this$ext4.isWarehousingStatus) && this.type !== "WAREHOUSING_STATUS";
 });
 export default CommonMultiStatus;

package/dist/esm/components/GY/GyGoods/index.d.ts

@@ -14,8 +14,15 @@ declare class GyGoods implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     gyGoods: CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/GY/GyGoods/index.js

@@ -17,6 +17,7 @@ import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
   var _this = this,
     _this$componentConfig6;
@@ -33,7 +34,11 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "gyGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -123,5 +128,6 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
     }
   }] : [];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyGoods;

package/dist/esm/components/GY/GyReissue/index.d.ts

@@ -15,11 +15,18 @@ declare class GyReissue implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     bsType: BsType;
     bsMemo: BsMemo;
     systemOrderNo: SystemOrderNo;
     reissueGoods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/GY/GyReissue/index.js

@@ -18,6 +18,7 @@ import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   GY_REISSUE_GOODS: {
     key: "gyReissueGoods",
@@ -56,10 +57,14 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "bsType", void 0);
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "reissueGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -206,5 +211,6 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyReissue;

package/dist/esm/components/GY/GyReturn/index.d.ts

@@ -15,10 +15,17 @@ declare class GyReturn implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     gyType: BsType;
     systemOrderNo: SystemOrderNo;
     returnGoods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/GY/GyReturn/index.js

@@ -18,6 +18,7 @@ import CommonHeaderGoods from "../../CommonHeaderGood";
 import { GyReturn as Return, erpFormValidator } from "@kmkf-fe-packages/basic-components";
 import { BsType, SystemOrderNo } from "../../BS/common/index";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   GY_RETURN_GOODS: {
     key: "gyReturnGoods",
@@ -54,9 +55,13 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "gyType", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "returnGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.gyType.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -198,5 +203,6 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyReturn;

package/dist/esm/components/JST/JstSendGood/index.d.ts

@@ -20,13 +20,14 @@ declare class JstSendGood implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     format: ComponentInterface["format"];
+    effects: ComponentInterface["effects"];
     constructor(options: PickOption);
     getSortChildFields: (type: string, options: PickOption, fieldType?: string) => any;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "in";

package/dist/esm/components/JST/JstSendGood/index.js

@@ -99,6 +99,14 @@ var typeMap = {
     sendName: "dxdSendName",
     platformType: "dxd",
     dataType: "weakenArray"
+  },
+  TTX_SEND_GOOD: {
+    key: "ttxSendGood",
+    name: "ttx",
+    sendId: "ttxSendId",
+    sendName: "ttxSendName",
+    platformType: "ttx",
+    dataType: "weakenArray"
   }
 };
 var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
@@ -123,6 +131,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "format", void 0);
+  _defineProperty(this, "effects", void 0);
   _defineProperty(this, "getSortChildFields", function (type, options, fieldType) {
     var _typeMap$options$type, _typeMap$options$type2, _typeMap$options$type3;
     var sendName = {
@@ -182,12 +191,15 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _typeMap$_this$type6;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.key)];
+    if (!Array.isArray(list)) {
+      return '';
+    }
     return (list || []).map(function (item) {
       return [item === null || item === void 0 ? void 0 : item.sendId, SendDataCenter.getInstance(_this.type).getSendNameByCode(item === null || item === void 0 ? void 0 : item.sendName)].join("/");
     }).join(",");
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$componentConfig2, _typeMap$_this$type7;
+    var _this$componentConfig, _this$componentConfig2, _typeMap$_this$type7, _this$effects;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -199,6 +211,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
         type: 3,
         platformType: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.platformType,
+        form: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.form,
         onlyShowFieldSelect: _this.componentConfig ? _this.componentConfig.showField === "sendName" : false
       }))
     });
@@ -232,7 +245,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
           });
         };
       }
-    } : ["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD", "DXD_SEND_GOOD"].includes(_this.type) ? {
+    } : ["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD", "DXD_SEND_GOOD", "TTX_SEND_GOOD"].includes(_this.type) ? {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.sendName),
@@ -293,6 +306,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "", _options, _options.type);
   this.type = _options.type;
   this.dataType = (_typeMap$_options$typ3 = typeMap[_options.type]) === null || _typeMap$_options$typ3 === void 0 ? void 0 : _typeMap$_options$typ3.dataType;
+  this.effects = _options === null || _options === void 0 ? void 0 : _options.effects;
   this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
     required: true,
     validator: function validator(_, value) {

package/dist/esm/components/JST/JstSupply/index.d.ts

@@ -25,7 +25,7 @@ declare class JstSupply implements ComponentInterface {
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
         searchDefaultConditions: "like";

package/dist/esm/components/JST/JstSupply/index.js

@@ -80,6 +80,9 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(_options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")]) || [];
+    if (!Array.isArray(list)) {
+      return '';
+    }
     return list.map(function (item) {
       return [item === null || item === void 0 ? void 0 : item.supplyId, item === null || item === void 0 ? void 0 : item.supplyName].join("/");
     }).join(",");

package/dist/esm/components/KM/KmExchange/index.d.ts

@@ -14,8 +14,15 @@ declare class KmExchange implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     returnGoods: CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/KM/KmExchange/index.js

@@ -17,6 +17,7 @@ import { SYMBOL } from "../../../constant";
 // import { BsType, BsMemo } from "../../Bs/common";
 import { CommonExchangeGoods, erpFormValidator } from "@kmkf-fe-packages/basic-components";
 import CommonHeaderGoods from "../../CommonHeaderGood";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var KmExchange = /*#__PURE__*/_createClass(function KmExchange(options) {
   var _this = this,
     _this$componentConfig6,
@@ -34,7 +35,11 @@ var KmExchange = /*#__PURE__*/_createClass(function KmExchange(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "returnGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;
     var kmExchangeGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_kmExchangeGoods")]) || "[]");
@@ -132,5 +137,6 @@ var KmExchange = /*#__PURE__*/_createClass(function KmExchange(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default KmExchange;

package/dist/esm/components/KmErpSendGood/index.d.ts

@@ -28,7 +28,7 @@ declare class JstSendGood implements ComponentInterface {
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "in";

package/dist/esm/components/KmErpSendGood/index.js

@@ -85,6 +85,9 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.suffixKey)];
+    if (!Array.isArray(list)) {
+      return '';
+    }
     return (list || []).map(function (item) {
       return [item === null || item === void 0 ? void 0 : item.sendId, SendDataCenter.getInstance(_this.type).getSendNameByCode(item === null || item === void 0 ? void 0 : item.sendName)].join("/");
     }).join(",");

package/dist/esm/components/LogisticsInterception/index.d.ts

@@ -11,6 +11,7 @@ import InterceptState from "./InterceptState";
 import InterceptApiStatus from "./InterceptApiStatus";
 import Express from "../Express";
 import ExpressCode from "../ExpressCode";
+import InterceptLogisticsCustomerCode from "./interceptLogisticsCustomerCode";
 declare class Logistics implements ComponentInterface {
     name: string;
     columnHeader: string | JSX.Element;
@@ -25,6 +26,7 @@ declare class Logistics implements ComponentInterface {
     interceptApiStatus: InterceptApiStatus;
     interceptSenderMobile: InterceptSenderMobile;
     interceptApiStatusReason: InterceptApiStatusReason;
+    interceptLogisticsCustomerCode: InterceptLogisticsCustomerCode;
     interceptSnapshot: InterceptSnapshot;
     interceptState: InterceptState;
     isCombinationComponent: boolean;
@@ -60,6 +62,7 @@ declare class Logistics implements ComponentInterface {
         interceptSnapshot: any;
         interceptState: any;
         interceptApiStatusReason: any;
+        interceptLogisticsCustomerCode: string;
     };
     renderPc: () => null;
     renderExport: () => null;

package/dist/esm/components/LogisticsInterception/index.js

@@ -10,7 +10,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from "react";
 import { LogisticsInterception } from "@kmkf-fe-packages/basic-components";
-import { ExpressData, ExpressInterceptData, LogisticsAddressData, isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { ExpressData, ExpressInterceptData, isJdLogisticsCompany, LogisticsAddressData, isNull } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import InterceptSenderMobile from "./interceptSenderMobile";
 import InterceptApiStatusReason from "./interceptApiStatusReason";
@@ -23,6 +23,7 @@ import InterceptApiStatus from "./InterceptApiStatus";
 import Express from "../Express";
 import ExpressCode from "../ExpressCode";
 import ColumnHeader from "./columnHeader";
+import InterceptLogisticsCustomerCode from "./interceptLogisticsCustomerCode";
 // import InterceptLogisticsUserKCode from "./interceptLogisticsUserKCode";
 // import InterceptLogisticsUserSecretKey from "./interceptLogisticsUserSecretKey";
 // import interceptLogisticsUserKCode from "./interceptLogisticsUserKCode";
@@ -46,6 +47,7 @@ function Logistics(options) {
   _defineProperty(this, "interceptApiStatus", void 0);
   _defineProperty(this, "interceptSenderMobile", void 0);
   _defineProperty(this, "interceptApiStatusReason", void 0);
+  _defineProperty(this, "interceptLogisticsCustomerCode", void 0);
   _defineProperty(this, "interceptSnapshot", void 0);
   _defineProperty(this, "interceptState", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
@@ -61,10 +63,10 @@ function Logistics(options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "isChange", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptSenderMobile.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptLogisticsStatus.renderClient(record), _this.interceptApiStatus.renderClient(record), _this.interceptApiStatusReason.renderClient(record), _this.interceptSnapshot.renderClient(record), _this.interceptState.renderClient(record));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptSenderMobile.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptLogisticsStatus.renderClient(record), _this.interceptApiStatus.renderClient(record), _this.interceptApiStatusReason.renderClient(record), _this.interceptSnapshot.renderClient(record), _this.interceptState.renderClient(record), _this.interceptLogisticsCustomerCode.renderClient(record));
   });
   _defineProperty(this, "renderLog", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, !isNull(_this.express.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.name, ": ", _this.express.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.expressCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.expressCode.name, ": ", _this.expressCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSenderMobile.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSenderMobile.name, ":", " ", _this.interceptSenderMobile.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptType.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptType.name, ": ", _this.interceptType.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptAddress.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.name, ":", " ", _this.interceptAddress.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsStatus.name, ":", " ", _this.interceptLogisticsStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatus.name, ":", " ", _this.interceptApiStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatusReason.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatusReason.name, ":", " ", _this.interceptApiStatusReason.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSnapshot.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSnapshot.name, ":", " ", _this.interceptSnapshot.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptState.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptState.name, ":", " ", _this.interceptState.renderLog(record))));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsCustomerCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsCustomerCode.name, ":", " ", _this.interceptLogisticsCustomerCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.express.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.name, ": ", _this.express.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.expressCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.expressCode.name, ": ", _this.expressCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSenderMobile.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSenderMobile.name, ":", " ", _this.interceptSenderMobile.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptType.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptType.name, ": ", _this.interceptType.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptAddress.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.name, ":", " ", _this.interceptAddress.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsStatus.name, ":", " ", _this.interceptLogisticsStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatus.name, ":", " ", _this.interceptApiStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatusReason.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatusReason.name, ":", " ", _this.interceptApiStatusReason.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSnapshot.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSnapshot.name, ":", " ", _this.interceptSnapshot.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptState.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptState.name, ":", " ", _this.interceptState.renderLog(record))));
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return {
@@ -77,7 +79,8 @@ function Logistics(options) {
       interceptRedirectTo: _this.interceptAddress.getComponentValue(r),
       interceptSnapshot: _this.interceptSnapshot.getComponentValue(r),
       interceptState: _this.interceptState.getComponentValue(r),
-      interceptApiStatusReason: _this.interceptApiStatusReason.getComponentValue(r)
+      interceptApiStatusReason: _this.interceptApiStatusReason.getComponentValue(r),
+      interceptLogisticsCustomerCode: _this.interceptLogisticsCustomerCode.getComponentValue(r)
       // interceptLogisticsUserKCode:
       //   this.interceptLogisticsUserKCode.getComponentValue(r),
       // interceptLogisticsUserSecretKey:
@@ -133,7 +136,7 @@ function Logistics(options) {
       subKey: "interceptCompany"
     })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
       subKey: "interceptCode"
-    })), _this.interceptSenderMobile.filterConfig(item), _this.interceptLogisticsStatus.filterConfig(item), _this.interceptApiStatus.filterConfig(item), _this.interceptApiStatusReason.filterConfig(item), _this.interceptType.filterConfig(item), _this.interceptSnapshot.filterConfig(item), _this.interceptState.filterConfig(item)
+    })), _this.interceptSenderMobile.filterConfig(item), _this.interceptLogisticsStatus.filterConfig(item), _this.interceptApiStatus.filterConfig(item), _this.interceptApiStatusReason.filterConfig(item), _this.interceptType.filterConfig(item), _this.interceptSnapshot.filterConfig(item), _this.interceptState.filterConfig(item), _this.interceptLogisticsCustomerCode.filterConfig(item)
     // this.interceptLogisticsUserKCode.filterConfig(item),
     // this.interceptLogisticsUserSecretKey.filterConfig(item),
     ];
@@ -159,6 +162,7 @@ function Logistics(options) {
   this.interceptSnapshot = new InterceptSnapshot(options);
   this.interceptState = new InterceptState(options);
   this.interceptApiStatusReason = new InterceptApiStatusReason(options);
+  this.interceptLogisticsCustomerCode = new InterceptLogisticsCustomerCode(options);
   // this.interceptLogisticsUserSecretKey = new InterceptLogisticsUserSecretKey(
   //   options,
   // );
@@ -175,7 +179,7 @@ function Logistics(options) {
   this.canSort = false;
   this.dataType = "object";
   this.isChange = false;
-  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus, this.interceptApiStatus, this.interceptApiStatusReason, this.interceptSnapshot, this.interceptState
+  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus, this.interceptApiStatus, this.interceptApiStatusReason, this.interceptSnapshot, this.interceptState, this.interceptLogisticsCustomerCode
   // this.interceptLogisticsUserKCode,
   // this.interceptLogisticsUserSecretKey,
   ];
@@ -186,7 +190,10 @@ function Logistics(options) {
       if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required && (!(value !== null && value !== void 0 && value.interceptCompany) || !value.interceptCode)) {
         return Promise.reject(new Error("请填写物流信息"));
       }
-      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required && !(value !== null && value !== void 0 && value.interceptType)) {
+      if (isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && !(value !== null && value !== void 0 && value.interceptLogisticsCustomerCode)) {
+        return Promise.reject(new Error("请选择客户编码"));
+      }
+      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required && !isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && !(value !== null && value !== void 0 && value.interceptType)) {
         return Promise.reject(new Error("请选择拦截类型"));
       }
       var showAddress = _this.expressInterceptData.getShowNewAddressMap()["".concat(value === null || value === void 0 ? void 0 : value.interceptType)];