@kmkf-fe-packages/services-components 1.22.1-beta.4 → 1.22.1-beta.41

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

@@ -16,11 +16,11 @@ import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Ty
 import React, { useState, useMemo } from "react";
 import { ExpressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
-import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { CopyToClipboard } from "react-copy-to-clipboard";
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 import CopyText from "../../commonComponents/CopyText";
-import { KM_SYSTEM_ORDER_CONFIG } from '@kmkf-fe-packages/kmkf-utils';
+import { KM_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -39,7 +39,7 @@ export var getFormItem = function getFormItem(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "form-item--wrap",
     style: {
-      position: 'relative'
+      position: "relative"
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: name,
@@ -54,58 +54,71 @@ export var showImage = function showImage(_ref2) {
     type = _ref2.type,
     index = _ref2.index,
     showHeader = _ref2.showHeader;
-  var picUrl = item.picUrl ? (item === null || item === void 0 ? void 0 : item.platform) !== 'tabao' ? item.picUrl : item.picUrl + '_40x40.jpg' : defaultImg;
+  var picUrl = item.picUrl ? (item === null || item === void 0 ? void 0 : item.platform) !== "tabao" ? item.picUrl : item.picUrl + "_40x40.jpg" : defaultImg;
+  var showHeaderMap = useMemo(function () {
+    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+    var dataIndexList = [];
+    if (isStringArray) {
+      dataIndexList = showHeader;
+    } else if (isObjectArray) {
+      dataIndexList = showHeader.map(function (item) {
+        return item.dataIndex;
+      });
+    }
+    return dataIndexList;
+  }, [showHeader]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
-  }, type === 'itemCode' && !showHeader.includes('picUrl') ? null : (item === null || item === void 0 ? void 0 : item.platform) === 'taobao' ? /*#__PURE__*/React.createElement("a", {
+  }, type === "itemCode" && !showHeaderMap.includes("picUrl") ? null : (item === null || item === void 0 ? void 0 : item.platform) === "taobao" ? /*#__PURE__*/React.createElement("a", {
     target: "_blank",
-    href: item.numIid ? "https://item.taobao.com/item.htm?id=".concat(item.numIid) : 'javascript:void(0);'
+    href: item.numIid ? "https://item.taobao.com/item.htm?id=".concat(item.numIid) : "javascript:void(0);"
   }, /*#__PURE__*/React.createElement("img", {
     style: {
-      width: '40px',
-      height: '40px',
-      objectFit: 'contain'
+      width: "40px",
+      height: "40px",
+      objectFit: "contain"
     },
     src: picUrl
   })) : /*#__PURE__*/React.createElement("img", {
     style: {
-      width: '40px',
-      height: '40px',
-      objectFit: 'contain'
+      width: "40px",
+      height: "40px",
+      objectFit: "contain"
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.options
-  }, type === 'itemId' && /*#__PURE__*/React.createElement(TextTool, {
-    title: '商品id',
+  }, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
+    title: "商品id",
     text: item.numIid
-  }), type === 'itemCode' && /*#__PURE__*/React.createElement(React.Fragment, null, showHeader.includes('title') && /*#__PURE__*/React.createElement(TextTool, {
-    title: '商品名称',
+  }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeaderMap.includes("title") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "商品名称",
     text: item.title
-  }), showHeader.includes('outerId') && /*#__PURE__*/React.createElement(TextTool, {
-    title: '商品编码',
+  }), showHeaderMap.includes("outerId") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "商品编码",
     text: item.outerId
-  }), showHeader.includes('numIid') && /*#__PURE__*/React.createElement(TextTool, {
-    title: '商品id',
+  }), showHeaderMap.includes("numIid") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "商品id",
     text: item.numIid
-  }), showHeader.includes('skuId') && /*#__PURE__*/React.createElement(TextTool, {
-    title: 'SKU ID',
+  }), showHeaderMap.includes("skuId") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "SKU ID",
     text: item.skuId
-  }), showHeader.includes('outerSkuId') && /*#__PURE__*/React.createElement(TextTool, {
-    title: 'SKU 编码',
+  }), showHeaderMap.includes("outerSkuId") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "SKU 编码",
     text: item.outerSkuId
-  }), showHeader.includes('propertiesName') && /*#__PURE__*/React.createElement(TextTool, {
-    title: 'SKU 信息',
+  }), showHeaderMap.includes("propertiesName") && /*#__PURE__*/React.createElement(TextTool, {
+    title: "SKU 信息",
     text: item.propertiesName
-  })), (type === 'itemThird' || type === 'jstItemThird') && (item.itemId || item.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
-    title: '供应商编码',
+  })), (type === "itemThird" || type === "jstItemThird") && (item.itemId || item.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
+    title: "供应商编码",
     text: item.itemId || item.supplierItemOuterId
-  }), (type === 'itemThird' || type === 'jstItemThird') && item.supplierName && /*#__PURE__*/React.createElement(TextTool, {
-    title: '供应商名称',
+  }), (type === "itemThird" || type === "jstItemThird") && item.supplierName && /*#__PURE__*/React.createElement(TextTool, {
+    title: "供应商名称",
     text: item.supplierName
-  }), type !== 'itemCode' && item.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
-    title: '规格',
+  }), type !== "itemCode" && item.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
+    title: "规格",
     text: item.propertiesName
   })));
 };
@@ -118,9 +131,9 @@ var TextTool = function TextTool(_ref3) {
     title: text
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      overflow: 'hidden',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis'
+      overflow: "hidden",
+      whiteSpace: "nowrap",
+      textOverflow: "ellipsis"
     }
   }, title, ":", text));
 };
@@ -136,6 +149,19 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
+  var showHeaderMap = useMemo(function () {
+    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+    var dataIndexList = [];
+    if (isStringArray) {
+      dataIndexList = showHeader;
+    } else if (isObjectArray) {
+      dataIndexList = showHeader.map(function (item) {
+        return item.dataIndex;
+      });
+    }
+    return dataIndexList;
+  }, [showHeader]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: function onClick() {
@@ -150,62 +176,62 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
     title: "\u6240\u6709\u9009\u62E9\u5B9D\u8D1D"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      display: 'flex',
-      flexWrap: 'wrap'
+      display: "flex",
+      flexWrap: "wrap"
     }
   }, allImage.map(function (i, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        width: '50%'
+        width: "50%"
       },
       key: index
-    }, type === 'itemCode' && !showHeader.includes('picUrl') ? null : /*#__PURE__*/React.createElement("a", {
-      href: i.link || ((i === null || i === void 0 ? void 0 : i.platform) === 'taobao' && i.numIid ? "https://item.taobao.com/item.htm?id=".concat(i.numIid) : 'javascript:void(0);'),
+    }, type === "itemCode" && !showHeaderMap.includes("picUrl") ? null : /*#__PURE__*/React.createElement("a", {
+      href: i.link || ((i === null || i === void 0 ? void 0 : i.platform) === "taobao" && i.numIid ? "https://item.taobao.com/item.htm?id=".concat(i.numIid) : "javascript:void(0);"),
       target: "__blank",
       style: {
-        marginRight: '12px',
-        marginTop: '8px',
-        padding: '2px',
-        border: '1px dashed #ccc',
-        display: 'inline-block'
+        marginRight: "12px",
+        marginTop: "8px",
+        padding: "2px",
+        border: "1px dashed #ccc",
+        display: "inline-block"
       }
     }, /*#__PURE__*/React.createElement("img", {
       alt: "",
       src: i.picUrl || defaultImg,
       style: {
-        width: '72px',
-        height: '72px',
-        objectFit: 'contain'
+        width: "72px",
+        height: "72px",
+        objectFit: "contain"
       }
-    })), /*#__PURE__*/React.createElement("div", null, type === 'itemId' && /*#__PURE__*/React.createElement(TextTool, {
-      title: '商品id',
+    })), /*#__PURE__*/React.createElement("div", null, type === "itemId" && /*#__PURE__*/React.createElement(TextTool, {
+      title: "商品id",
       text: i.numIid
-    }), type === 'itemCode' && /*#__PURE__*/React.createElement(React.Fragment, null, showHeader.includes('title') && /*#__PURE__*/React.createElement(TextTool, {
-      title: '商品名称',
+    }), type === "itemCode" && /*#__PURE__*/React.createElement(React.Fragment, null, showHeaderMap.includes("title") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "商品名称",
       text: i.title
-    }), showHeader.includes('outerId') && /*#__PURE__*/React.createElement(TextTool, {
-      title: '商品编码',
+    }), showHeaderMap.includes("outerId") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "商品编码",
       text: i.outerId
-    }), showHeader.includes('numIid') && /*#__PURE__*/React.createElement(TextTool, {
-      title: '商品id',
+    }), showHeaderMap.includes("numIid") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "商品id",
       text: i.numIid
-    }), showHeader.includes('skuId') && /*#__PURE__*/React.createElement(TextTool, {
-      title: 'SKU ID',
+    }), showHeaderMap.includes("skuId") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "SKU ID",
       text: i.skuId
-    }), showHeader.includes('outerSkuId') && /*#__PURE__*/React.createElement(TextTool, {
-      title: 'SKU 编码',
+    }), showHeaderMap.includes("outerSkuId") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "SKU 编码",
       text: i.outerSkuId
-    }), showHeader.includes('propertiesName') && /*#__PURE__*/React.createElement(TextTool, {
-      title: 'SKU 信息',
+    }), showHeaderMap.includes("propertiesName") && /*#__PURE__*/React.createElement(TextTool, {
+      title: "SKU 信息",
       text: i.propertiesName
-    })), (type === 'itemThird' || type === 'jstItemThird') && (i.itemId || i.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
-      title: '供应商编码',
+    })), (type === "itemThird" || type === "jstItemThird") && (i.itemId || i.supplierItemOuterId) && /*#__PURE__*/React.createElement(TextTool, {
+      title: "供应商编码",
       text: i.itemId || i.supplierItemOuterId
-    }), (type === 'itemThird' || type === 'jstItemThird') && i.supplierName && /*#__PURE__*/React.createElement(TextTool, {
-      title: '供应商名称',
+    }), (type === "itemThird" || type === "jstItemThird") && i.supplierName && /*#__PURE__*/React.createElement(TextTool, {
+      title: "供应商名称",
       text: i.supplierName
-    }), type !== 'itemCode' && i.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
-      title: '规格',
+    }), type !== "itemCode" && i.propertiesName && /*#__PURE__*/React.createElement(TextTool, {
+      title: "规格",
       text: i.propertiesName
     })));
   }))));
@@ -215,21 +241,34 @@ export var GoodImage = function GoodImage(_ref5) {
   var _list$slice;
   var list = _ref5.list,
     _ref5$type = _ref5.type,
-    type = _ref5$type === void 0 ? '' : _ref5$type,
+    type = _ref5$type === void 0 ? "" : _ref5$type,
     _ref5$showHeader = _ref5.showHeader,
     showHeader = _ref5$showHeader === void 0 ? [] : _ref5$showHeader;
   var total = (list === null || list === void 0 ? void 0 : list.length) || 0;
   var initShowTotal = 3;
+  var showHeaderMap = useMemo(function () {
+    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+    var dataIndexList = [];
+    if (isStringArray) {
+      dataIndexList = showHeader;
+    } else if (isObjectArray) {
+      dataIndexList = showHeader.map(function (item) {
+        return item.dataIndex;
+      });
+    }
+    return dataIndexList;
+  }, [showHeader]);
   return (list === null || list === void 0 ? void 0 : list.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     style: {
-      display: type === 'itemSelect' ? 'flex' : 'block'
+      display: type === "itemSelect" ? "flex" : "block"
     }
   }, list === null || list === void 0 ? void 0 : (_list$slice = list.slice(0, initShowTotal)) === null || _list$slice === void 0 ? void 0 : _list$slice.map(function (item, index) {
     return showImage({
       item: item,
       type: type,
       index: index,
-      showHeader: showHeader
+      showHeader: showHeaderMap
     });
   }), total > initShowTotal && /*#__PURE__*/React.createElement(ShowTotalImage, {
     total: total,
@@ -239,11 +278,16 @@ export var GoodImage = function GoodImage(_ref5) {
   })) : null;
 };
 var content = function content(item, index) {
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      maxHeight: "300px",
+      overflowY: "auto"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
-      textAlign: 'center'
+      textAlign: "center"
     }
-  }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
+  }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F"), item.sid && /*#__PURE__*/React.createElement("span", null, "(\u7CFB\u7EDF\u5355\u53F7:", item.sid, ")")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index
     }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Image, {
@@ -258,8 +302,8 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     list = _ref6$list === void 0 ? [] : _ref6$list,
     type = _ref6.type,
     _ref6$platformType = _ref6.platformType,
-    platformType = _ref6$platformType === void 0 ? 'default' : _ref6$platformType;
-  var getSendName = function getSendName(item, platformType) {
+    platformType = _ref6$platformType === void 0 ? "default" : _ref6$platformType;
+  var getSendName = function getSendName(item) {
     return SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendName);
   };
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
@@ -273,14 +317,14 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     }, /*#__PURE__*/React.createElement("span", {
       key: index,
       style: {
-        color: '#1890ff',
-        cursor: 'pointer'
+        color: "#1890ff",
+        cursor: "pointer"
       }
     }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? /*#__PURE__*/React.createElement(React.Fragment, null, company, "/", /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
     })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
-    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item, 'platformType')].join("/") : item.sendId ? item.sendId : getSendName(item, 'platformType')) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
+    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join("/") : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item)].join("/") : item.sendId ? item.sendId : getSendName(item)) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || "") : null));
   }) : null;
 };
 export var BsExpressRender = function BsExpressRender(_ref7) {
@@ -301,10 +345,10 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
     }, /*#__PURE__*/React.createElement("span", {
       key: index,
       style: {
-        color: '#1890ff',
-        cursor: 'pointer'
+        color: "#1890ff",
+        cursor: "pointer"
       }
-    }, "\u5305\u88F9", ":")), showField === 'company' ? /*#__PURE__*/React.createElement("span", null, company ? company : null) : null, showField === 'code' ? /*#__PURE__*/React.createElement("span", null, item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
+    }, "\u5305\u88F9", ":")), showField === "company" ? /*#__PURE__*/React.createElement("span", null, company ? company : null) : null, showField === "code" ? /*#__PURE__*/React.createElement("span", null, item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
     }) : null) : null));
   }) : null;
@@ -312,24 +356,51 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
 export var CommonOrderContent = function CommonOrderContent(_ref8) {
   var _ref8$list = _ref8.list,
     list = _ref8$list === void 0 ? [] : _ref8$list,
-    valueKey = _ref8.valueKey,
+    initValueKey = _ref8.valueKey,
     failValue = _ref8.failValue,
     _ref8$options = _ref8.options,
     options = _ref8$options === void 0 ? [] : _ref8$options,
     _ref8$isShowPopover = _ref8.isShowPopover,
     isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover;
+  var getContentData = function getContentData(item, index) {
+    if (item.platformId) return {
+      text: "平台售后单号",
+      id: item.platformId
+    };
+    if (item.returnLogisticsCode) return {
+      text: "物流单号",
+      id: item.returnLogisticsCode
+    };
+    return {
+      text: "系统订单号" + (index + 1),
+      id: item.systemOrderId
+    };
+  };
   var orderContent = function orderContent(item, index) {
+    var contentData = getContentData(item, index);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       style: {
-        textAlign: 'center'
+        textAlign: "center"
       }
-    }, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId));
+    }, contentData.text, "\uFF1A", contentData.id));
   };
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var _options$find;
+    var valueKey = "";
+    if (Array.isArray(initValueKey)) {
+      for (var _index = 0; _index < initValueKey.length; _index++) {
+        var itemKey = initValueKey[_index];
+        if (item[itemKey]) {
+          valueKey = itemKey;
+          break;
+        }
+      }
+    } else {
+      valueKey = initValueKey;
+    }
     var color = ((_options$find = options.find(function (it) {
       return item[valueKey] === it.value;
-    })) === null || _options$find === void 0 ? void 0 : _options$find.color) || '#000';
+    })) === null || _options$find === void 0 ? void 0 : _options$find.color) || "#000";
     var currentOption = options.find(function (option) {
       return item[valueKey] === option.value;
     });
@@ -341,14 +412,14 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     }, /*#__PURE__*/React.createElement("span", {
       key: index,
       style: {
-        color: '#1890ff',
-        cursor: 'pointer'
+        color: "#1890ff",
+        cursor: "pointer"
       }
-    }, "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1), ":")) : null, /*#__PURE__*/React.createElement("span", {
+    }, "".concat(getContentData(item, index).text), ":")) : null, /*#__PURE__*/React.createElement("span", {
       style: {
         color: color
       }
-    }, currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || '')), item.reason && (item === null || item === void 0 ? void 0 : item[valueKey]) !== '成功' && /*#__PURE__*/React.createElement("div", {
+    }, currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "")), item.reason && (item === null || item === void 0 ? void 0 : item[valueKey]) !== "成功" && /*#__PURE__*/React.createElement("div", {
       className: "c-red"
     }, item.reason));
   }) : null;
@@ -360,22 +431,22 @@ export var BsGoodImage = function BsGoodImage(_ref9) {
     index = _ref9.index;
   var picUrl = item.picUrl || defaultImg;
   var keyMap = {
-    name: 'bs名称',
-    code: 'bs编码',
-    skuId: 'bssku编码',
-    money: 'bs实付金额',
-    number: 'bs数量',
-    share: 'bs分摊价',
-    type: 'bs赠品类型'
+    name: "bs名称",
+    code: "bs编码",
+    skuId: "bssku编码",
+    money: "bs实付金额",
+    number: "bs数量",
+    share: "bs分摊价",
+    type: "bs赠品类型"
   };
   return /*#__PURE__*/React.createElement("div", {
     className: styles.goodImgBox,
     key: index
   }, /*#__PURE__*/React.createElement("img", {
     style: {
-      width: '40px',
-      height: '40px',
-      objectFit: 'contain'
+      width: "40px",
+      height: "40px",
+      objectFit: "contain"
     },
     src: picUrl
   }), /*#__PURE__*/React.createElement("div", {
@@ -397,11 +468,11 @@ export var BsExchangeList = function BsExchangeList(_ref10) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, BsGoodsTable({
       list: (item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods) || [],
       showHeader: showHeader,
-      text: '退回'
+      text: "退回"
     }), BsGoodsTable({
       list: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
       showHeader: showHeader,
-      text: '换出'
+      text: "换出"
     }));
   }));
 };
@@ -418,31 +489,31 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
   var list = _ref11.list,
     showHeader = _ref11.showHeader,
     _ref11$text = _ref11.text,
-    text = _ref11$text === void 0 ? '' : _ref11$text,
+    text = _ref11$text === void 0 ? "" : _ref11$text,
     type = _ref11.type;
   //商品信息
   var COLUMNS_MAP = function COLUMNS_MAP() {
-    var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
     return function (type) {
       var columns = [];
       switch (type) {
-        case 'ITEM_ENCODE':
+        case "ITEM_ENCODE":
           columns = [{
-            dataIndex: 'title',
-            title: '商品名称',
-            align: 'center',
+            dataIndex: "title",
+            title: "商品名称",
+            align: "center",
             ellipsis: true,
             width: 200
           }, {
-            dataIndex: 'outerId',
-            title: '商品编码',
-            align: 'center',
+            dataIndex: "outerId",
+            title: "商品编码",
+            align: "center",
             ellipsis: true,
             width: 140
           }, {
-            dataIndex: 'picUrl',
-            title: '图片',
-            align: 'center',
+            dataIndex: "picUrl",
+            title: "图片",
+            align: "center",
             ellipsis: true,
             width: 100,
             render: function render(val) {
@@ -452,73 +523,73 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
               });
             }
           }, {
-            dataIndex: 'numIid',
-            title: '商品id',
-            align: 'center',
+            dataIndex: "numIid",
+            title: "商品id",
+            align: "center",
             ellipsis: true,
             width: 200
           }, {
-            dataIndex: 'skuId',
-            title: 'SKU ID',
-            align: 'center',
+            dataIndex: "skuId",
+            title: "SKU ID",
+            align: "center",
             ellipsis: true,
             width: 200
           }, {
-            dataIndex: 'outerSkuId',
-            title: 'SKU 编码',
-            align: 'center',
+            dataIndex: "outerSkuId",
+            title: "SKU 编码",
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'propertiesName',
-            title: 'SKU 信息',
-            align: 'center',
+            dataIndex: "propertiesName",
+            title: "SKU 信息",
+            align: "center",
             ellipsis: true,
             width: 200
           }];
           break;
-        case 'WDT_REISSUE_GOODS':
-        case 'WDT_GOODS':
+        case "WDT_REISSUE_GOODS":
+        case "WDT_GOODS":
           columns = [{
-            dataIndex: 'goodId',
+            dataIndex: "goodId",
             title: "\u5546\u54C1ID",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 70
           }, {
-            dataIndex: 'goodNo',
+            dataIndex: "goodNo",
             title: "\u5546\u54C1\u7F16\u7801",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 180
           }, {
-            dataIndex: 'goodName',
+            dataIndex: "goodName",
             title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 250
           }, {
-            dataIndex: 'specId',
+            dataIndex: "specId",
             title: "".concat(text, "SKUID"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'specNo',
+            dataIndex: "specNo",
             title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 180
           }, {
-            dataIndex: 'specName',
+            dataIndex: "specName",
             title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 250
           }, {
-            dataIndex: 'imgUrl',
+            dataIndex: "imgUrl",
             title: "\u56FE\u7247",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100,
             render: function render(val) {
@@ -528,15 +599,15 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
               });
             }
           }, {
-            dataIndex: 'orderPrice',
+            dataIndex: "orderPrice",
             title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'num',
+            dataIndex: "num",
             title: "".concat(text, "\u6570\u91CF"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           },
@@ -548,242 +619,242 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
           //   width: 100,
           // },
           {
-            dataIndex: 'sharePrice',
+            dataIndex: "sharePrice",
             title: "\u5206\u644A\u4EF7",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 70
           }, {
-            dataIndex: 'giftType',
+            dataIndex: "giftType",
             title: "\u8D60\u54C1\u65B9\u5F0F",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100,
             render: function render(val) {
               var giftTypeMap = {
-                0: '非赠品',
-                1: '自动赠送',
-                2: '手工赠送',
-                3: '回购自动送赠品',
-                4: '前N有礼送赠品',
-                6: '天猫优仓赠品',
-                7: '淘宝CRM会员送赠'
+                0: "非赠品",
+                1: "自动赠送",
+                2: "手工赠送",
+                3: "回购自动送赠品",
+                4: "前N有礼送赠品",
+                6: "天猫优仓赠品",
+                7: "淘宝CRM会员送赠"
               };
               return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
             }
           }];
           break;
-        case 'WDT_RETURN_GOODS':
+        case "WDT_RETURN_GOODS":
           {
             columns = [{
-              dataIndex: 'goodId',
+              dataIndex: "goodId",
               title: "\u5546\u54C1ID",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 70
             }, {
-              dataIndex: 'goodNo',
+              dataIndex: "goodNo",
               title: "\u5546\u54C1\u7F16\u7801",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 180
             }, {
-              dataIndex: 'goodName',
+              dataIndex: "goodName",
               title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 250
             }, {
-              dataIndex: 'specId',
+              dataIndex: "specId",
               title: "".concat(text, "SKUID"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'specNo',
+              dataIndex: "specNo",
               title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 180
             }, {
-              dataIndex: 'specName',
+              dataIndex: "specName",
               title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 250
             }, {
-              dataIndex: 'num',
+              dataIndex: "num",
               title: "".concat(text, "\u9000\u8D27\u6570\u91CF"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'sharePrice',
+              dataIndex: "sharePrice",
               title: "\u5206\u644A\u4EF7",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 80
             }, {
-              dataIndex: 'returnPrice',
+              dataIndex: "returnPrice",
               title: "".concat(text, "\u9000\u8D27\u91D1\u989D"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'giftType',
+              dataIndex: "giftType",
               title: "\u8D60\u54C1\u65B9\u5F0F",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
                 var giftTypeMap = {
-                  0: '非赠品',
-                  1: '自动赠送',
-                  2: '手工赠送',
-                  3: '回购自动送赠品',
-                  4: '前N有礼送赠品',
-                  6: '天猫优仓赠品',
-                  7: '淘宝CRM会员送赠'
+                  0: "非赠品",
+                  1: "自动赠送",
+                  2: "手工赠送",
+                  3: "回购自动送赠品",
+                  4: "前N有礼送赠品",
+                  6: "天猫优仓赠品",
+                  7: "淘宝CRM会员送赠"
                 };
                 return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
               }
             }, {
-              dataIndex: 'type',
+              dataIndex: "type",
               title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
                 var typeMap = {
-                  '1': '单品',
-                  '2': '组合装'
+                  "1": "单品",
+                  "2": "组合装"
                 };
                 return /*#__PURE__*/React.createElement("span", null, typeMap[val]);
               }
             }];
           }
           break;
-        case 'WDT_EXCHANGE_GOODS':
+        case "WDT_EXCHANGE_GOODS":
           {
             columns = [{
-              dataIndex: 'goodId',
+              dataIndex: "goodId",
               title: "\u5546\u54C1ID",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 70
             }, {
-              dataIndex: 'goodNo',
+              dataIndex: "goodNo",
               title: "\u5546\u54C1\u7F16\u7801",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 180
             }, {
-              dataIndex: 'goodName',
+              dataIndex: "goodName",
               title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 250
             }, {
-              dataIndex: 'specId',
+              dataIndex: "specId",
               title: "".concat(text, "SKUID"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'specNo',
+              dataIndex: "specNo",
               title: "".concat(text, "\u5546\u54C1SKU\u7F16\u7801"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 180
             }, {
-              dataIndex: 'specName',
+              dataIndex: "specName",
               title: "".concat(text, "\u5546\u54C1SKU\u540D\u79F0"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 250
             }, {
-              dataIndex: 'num',
+              dataIndex: "num",
               title: "".concat(text, "\u6362\u51FA\u6570\u91CF"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'price',
+              dataIndex: "price",
               title: "".concat(text, "\u5546\u54C1\u5355\u4EF7"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'exchangePrice',
+              dataIndex: "exchangePrice",
               title: "".concat(text, "\u6362\u51FA\u91D1\u989D"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'giftType',
+              dataIndex: "giftType",
               title: "\u8D60\u54C1\u65B9\u5F0F",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
                 var giftTypeMap = {
-                  0: '非赠品',
-                  1: '自动赠送',
-                  2: '手工赠送',
-                  3: '回购自动送赠品',
-                  4: '前N有礼送赠品',
-                  6: '天猫优仓赠品',
-                  7: '淘宝CRM会员送赠'
+                  0: "非赠品",
+                  1: "自动赠送",
+                  2: "手工赠送",
+                  3: "回购自动送赠品",
+                  4: "前N有礼送赠品",
+                  6: "天猫优仓赠品",
+                  7: "淘宝CRM会员送赠"
                 };
                 return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
               }
             }, {
-              dataIndex: 'type',
+              dataIndex: "type",
               title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
                 var typeMap = {
-                  '1': '单品',
-                  '2': '组合装'
+                  "1": "单品",
+                  "2": "组合装"
                 };
                 return /*#__PURE__*/React.createElement("span", null, typeMap[val]);
               }
             }];
           }
           break;
-        case 'BS_E3_REISSUE_GOODS':
-        case 'BS_E3_GOODS':
+        case "BS_E3_REISSUE_GOODS":
+        case "BS_E3_GOODS":
           {
             columns = [{
-              dataIndex: 'sku',
+              dataIndex: "sku",
               title: "SKU",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'skuId',
+              dataIndex: "skuId",
               title: "SKU ID",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsName',
+              dataIndex: "goodsName",
               title: "\u5546\u54C1\u540D\u79F0",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsShortName',
+              dataIndex: "goodsShortName",
               title: "\u5546\u54C1\u7B80\u79F0",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'picPath',
+              dataIndex: "picPath",
               title: "\u5546\u54C1\u56FE\u7247",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
@@ -793,105 +864,105 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
                 });
               }
             }, {
-              dataIndex: 'goodsSn',
+              dataIndex: "goodsSn",
               title: "\u8D27\u53F7",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsId',
+              dataIndex: "goodsId",
               title: "\u8D27\u53F7ID",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'colorName',
+              dataIndex: "colorName",
               title: "\u989C\u8272\u540D\u79F0",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'colorCode',
+              dataIndex: "colorCode",
               title: "\u989C\u8272\u4EE3\u7801",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'sizeName',
+              dataIndex: "sizeName",
               title: "\u5C3A\u7801\u540D\u79F0",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'sizeCode',
+              dataIndex: "sizeCode",
               title: "\u5C3A\u7801\u4EE3\u7801",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'brandName',
+              dataIndex: "brandName",
               title: "\u54C1\u724C\u540D\u79F0",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsNumber',
+              dataIndex: "goodsNumber",
               title: "\u5546\u54C1\u6570\u91CF",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'goodsPrice',
+              dataIndex: "goodsPrice",
               title: "\u5546\u54C1\u5355\u4EF7",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 120
             }, {
-              dataIndex: 'shopPrice',
+              dataIndex: "shopPrice",
               title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 120
             }, {
-              dataIndex: 'sharePrice',
+              dataIndex: "sharePrice",
               title: "\u5206\u644A\u4EF7",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 120
             }, {
-              dataIndex: 'sharePayment',
+              dataIndex: "sharePayment",
               title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 120
             }, {
-              dataIndex: 'payment',
+              dataIndex: "payment",
               title: "\u5B9E\u4ED8\u91D1\u989D",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 120
             }, {
-              dataIndex: 'tcSku',
+              dataIndex: "tcSku",
               title: "\u5957\u9910SKU",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'tcGoodsNumber',
+              dataIndex: "tcGoodsNumber",
               title: "\u5957\u9910\u5957\u6570",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'taoCanSingleSl',
+              dataIndex: "taoCanSingleSl",
               title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'isGift',
+              dataIndex: "isGift",
               title: "\u662F\u5426\u8D60\u54C1",
-              align: 'center',
+              align: "center",
               ellipsis: true,
               width: 100,
               render: function render(val) {
@@ -900,35 +971,116 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
             }];
           }
           break;
+        case "BS_GOODS":
+          columns = [{
+            dataIndex: "mark",
+            title: "\u5546\u54C1\u6807\u8BB0",
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "skuName",
+            title: "".concat(text, "sku\u540D\u79F0"),
+            align: "center",
+            ellipsis: true,
+            width: 200
+          }, {
+            dataIndex: "sku",
+            title: "".concat(text, "sku\u7F16\u7801"),
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "name",
+            title: "".concat(text, "\u540D\u79F0"),
+            align: "center",
+            ellipsis: true,
+            width: 200
+          }, {
+            dataIndex: "pic",
+            title: "\u56FE\u7247",
+            align: "center",
+            ellipsis: true,
+            width: 100,
+            render: function render(val) {
+              return /*#__PURE__*/React.createElement(Image, {
+                width: 60,
+                src: val
+              });
+            }
+          }, {
+            dataIndex: "code",
+            title: "".concat(text, "\u7F16\u7801"),
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "money",
+            title: "\u5B9E\u4ED8\u91D1\u989D",
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "number",
+            title: "".concat(text, "\u6570\u91CF"),
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "share",
+            title: "\u5206\u644A\u4EF7",
+            align: "center",
+            ellipsis: true,
+            width: 70
+          }, {
+            dataIndex: "type",
+            title: "\u8D60\u54C1\u7C7B\u578B",
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "batch",
+            title: "\u6279\u6B21\u53F7",
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: "expireDate",
+            title: "\u6709\u6548\u671F",
+            align: "center",
+            ellipsis: true,
+            width: 100
+          }];
+          break;
         default:
           columns = [{
-            dataIndex: 'mark',
+            dataIndex: "mark",
             title: "\u5546\u54C1\u6807\u8BB0",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'skuName',
+            dataIndex: "skuName",
             title: "".concat(text, "sku\u540D\u79F0"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 200
           }, {
-            dataIndex: 'sku',
+            dataIndex: "sku",
             title: "".concat(text, "sku\u7F16\u7801"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'name',
+            dataIndex: "name",
             title: "".concat(text, "\u540D\u79F0"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 200
           }, {
-            dataIndex: 'pic',
+            dataIndex: "pic",
             title: "\u56FE\u7247",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100,
             render: function render(val) {
@@ -938,33 +1090,33 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
               });
             }
           }, {
-            dataIndex: 'code',
+            dataIndex: "code",
             title: "".concat(text, "\u7F16\u7801"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'money',
+            dataIndex: "money",
             title: "\u5B9E\u4ED8\u91D1\u989D",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'number',
+            dataIndex: "number",
             title: "".concat(text, "\u6570\u91CF"),
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }, {
-            dataIndex: 'share',
+            dataIndex: "share",
             title: "\u5206\u644A\u4EF7",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 70
           }, {
-            dataIndex: 'type',
+            dataIndex: "type",
             title: "\u8D60\u54C1\u7C7B\u578B",
-            align: 'center',
+            align: "center",
             ellipsis: true,
             width: 100
           }];
@@ -974,7 +1126,7 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
   };
   //商品信息
   var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
-    var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
@@ -982,31 +1134,47 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
   //   return
   // }
   var newColumns = useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = [];
+    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+    if (isStringArray) {
+      baseInfoColumns = initBaseInfoColumns.filter(function (col) {
+        return showHeader.includes(col.dataIndex);
+      });
+    } else if (isObjectArray) {
+      baseInfoColumns = showHeader.filter(function (col) {
+        return col.show !== false;
+      }).map(function (col) {
+        var currentCol = initBaseInfoColumns.find(function (item) {
+          return item.dataIndex === col.dataIndex;
+        });
+        return currentCol ? currentCol : undefined;
+      }).filter(Boolean);
+    }
     var columnList = [{
-      dataIndex: '',
-      title: '序号',
-      align: 'center',
+      dataIndex: "",
+      title: "序号",
+      align: "center",
       ellipsis: true,
       width: 50,
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
-    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS(text).filter(function (t) {
-      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
-    })));
+    }].concat(_toConsumableArray(baseInfoColumns));
     return columnList;
   }, [showHeader, list]);
   return /*#__PURE__*/React.createElement(Table, {
     columns: newColumns,
     dataSource: list,
-    rowKey: 'uuid',
+    rowKey: "uuid",
     size: "small",
     pagination: false,
     scroll: {
-      x: '100%'
+      x: "100%"
     },
     locale: {
-      emptyText: '暂无数据'
+      emptyText: "暂无数据"
     }
   });
 };
@@ -1019,15 +1187,15 @@ export var FileRender = function FileRender(_ref12) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
-  var _useState5 = useState(''),
+  var _useState5 = useState(""),
     _useState6 = _slicedToArray(_useState5, 2),
     fileUrl = _useState6[0],
     setFileUrl = _useState6[1];
-  var _useState7 = useState(''),
+  var _useState7 = useState(""),
     _useState8 = _slicedToArray(_useState7, 2),
     fileType = _useState8[0],
     setFileType = _useState8[1];
-  var _useState9 = useState(''),
+  var _useState9 = useState(""),
     _useState10 = _slicedToArray(_useState9, 2),
     fileName = _useState10[0],
     setFileName = _useState10[1];
@@ -1036,24 +1204,24 @@ export var FileRender = function FileRender(_ref12) {
     downloading = _useState12[0],
     setDownloading = _useState12[1];
   var handleCancel = function handleCancel() {
-    setFileUrl('');
-    setFileName('');
+    setFileUrl("");
+    setFileName("");
     setVisible(false);
     setDownloading(false);
   };
   var onPreview = function onPreview(file) {
     var _file$url;
-    var fileArr = file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('.');
+    var fileArr = file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split(".");
     var fileType = fileArr[fileArr.length - 1];
-    if (['png', 'jpg', 'jpeg', 'gif', 'bmp', 'svg'].includes(fileType.toLowerCase())) {
+    if (["png", "jpg", "jpeg", "gif", "bmp", "svg"].includes(fileType.toLowerCase())) {
       setFileUrl(file === null || file === void 0 ? void 0 : file.url);
       setFileName(file === null || file === void 0 ? void 0 : file.name);
-      setFileType('pic');
+      setFileType("pic");
       setVisible(true);
-    } else if (['mp4', 'avi', 'mpeg', 'asf', 'mov', '3gp', 'wmv', 'rmvb'].includes(fileType.toLowerCase())) {
+    } else if (["mp4", "avi", "mpeg", "asf", "mov", "3gp", "wmv", "rmvb"].includes(fileType.toLowerCase())) {
       setFileUrl(file === null || file === void 0 ? void 0 : file.url);
       setFileName(file === null || file === void 0 ? void 0 : file.name);
-      setFileType('video');
+      setFileType("video");
       setVisible(true);
     } else {
       window.open(file === null || file === void 0 ? void 0 : file.url);
@@ -1064,9 +1232,9 @@ export var FileRender = function FileRender(_ref12) {
     fetch(url).then(function (res) {
       return res.blob();
     }).then(function (blob) {
-      var a = document.createElement('a');
+      var a = document.createElement("a");
       document.body.appendChild(a);
-      a.style.display = 'none';
+      a.style.display = "none";
       var url = window.URL.createObjectURL(blob);
       a.href = url;
       a.download = name;
@@ -1080,9 +1248,9 @@ export var FileRender = function FileRender(_ref12) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, fileList.map(function (item) {
     return /*#__PURE__*/React.createElement("a", {
       style: {
-        color: '#1890ff',
-        cursor: 'pointer',
-        display: 'block'
+        color: "#1890ff",
+        cursor: "pointer",
+        display: "block"
       },
       onClick: function onClick(e) {
         e.preventDefault();
@@ -1104,20 +1272,20 @@ export var FileRender = function FileRender(_ref12) {
   }, "\u4E0B\u8F7D") : /*#__PURE__*/React.createElement(CopyToClipboard, {
     text: fileUrl,
     onCopy: function onCopy() {
-      message.success('复制成功');
+      message.success("复制成功");
     }
   }, /*#__PURE__*/React.createElement(Button, {
     type: "link"
-  }, "\u4E0B\u8F7D\u5730\u5740")), fileType === 'pic' ? /*#__PURE__*/React.createElement("img", {
+  }, "\u4E0B\u8F7D\u5730\u5740")), fileType === "pic" ? /*#__PURE__*/React.createElement("img", {
     alt: "example",
     style: {
-      width: '100%'
+      width: "100%"
     },
     src: fileUrl
   }) : /*#__PURE__*/React.createElement("video", {
     style: {
-      width: '100%',
-      height: '100%'
+      width: "100%",
+      height: "100%"
     },
     autoPlay: true,
     controls: true,
@@ -1129,20 +1297,20 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     type = _ref13.type;
   var columnMap = {
     BS_SYSTEM_ORDER: [{
-      dataIndex: 'billType',
-      title: '订单类型'
+      dataIndex: "billType",
+      title: "订单类型"
     }, {
-      dataIndex: 'billNo',
-      title: '系统订单号'
+      dataIndex: "billNo",
+      title: "系统订单号"
     }, {
-      dataIndex: 'billTag',
-      title: '标签'
+      dataIndex: "billTag",
+      title: "标签"
     }, {
-      title: '主播名称',
-      dataIndex: 'authorName'
+      title: "主播名称",
+      dataIndex: "authorName"
     }, {
-      title: '主播ID',
-      dataIndex: 'authorId'
+      title: "主播ID",
+      dataIndex: "authorId"
     }
     // {
     //   title: '直播活动',
@@ -1152,24 +1320,24 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
 
     KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
     WLN_SYSTEM_ORDER: [{
-      dataIndex: 'billType',
-      title: '单据类型'
+      dataIndex: "billType",
+      title: "单据类型"
     }, {
-      dataIndex: 'billNo',
-      title: '系统订单号'
+      dataIndex: "billNo",
+      title: "系统订单号"
     }, {
-      dataIndex: 'billTag',
-      title: '标签'
+      dataIndex: "billTag",
+      title: "标签"
     }],
     WDT_SYSTEM_ORDER: [{
-      dataIndex: 'billType',
-      title: '订单类型'
+      dataIndex: "billType",
+      title: "订单类型"
     }, {
-      dataIndex: 'billNo',
-      title: '系统订单号'
+      dataIndex: "billNo",
+      title: "系统订单号"
     }, {
-      dataIndex: 'billTag',
-      title: '订单标签'
+      dataIndex: "billTag",
+      title: "订单标签"
     }],
     BS_E3_SYSTEM_ORDER: [{
       title: "系统订单号",
@@ -1240,16 +1408,16 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     }]
   };
   var rowKeyMap = {
-    BS_SYSTEM_ORDER: 'billNo',
-    KM_SYSTEM_ORDER: 'billNo',
-    WLN_SYSTEM_ORDER: 'billNo',
-    WDT_SYSTEM_ORDER: 'billNo',
-    BS_E3_SYSTEM_ORDER: 'orderSn'
+    BS_SYSTEM_ORDER: "billNo",
+    KM_SYSTEM_ORDER: "billNo",
+    WLN_SYSTEM_ORDER: "billNo",
+    WDT_SYSTEM_ORDER: "billNo",
+    BS_E3_SYSTEM_ORDER: "orderSn"
   };
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
       if (next.select) {
-        prv.push(next[rowKeyMap[type]] || 'billNo');
+        prv.push(next[rowKeyMap[type]] || "billNo");
       }
       return prv;
     }, []),
@@ -1265,14 +1433,14 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     dataSource: (value === null || value === void 0 ? void 0 : value.showOrderInfo) || [],
     columns: columnMap[type] || [],
     rowSelection: rowSelection,
-    rowKey: rowKeyMap[type] || 'billNo',
+    rowKey: rowKeyMap[type] || "billNo",
     size: "small",
     pagination: false,
     scroll: {
-      x: '100%'
+      x: "100%"
     },
     locale: {
-      emptyText: '暂无数据'
+      emptyText: "暂无数据"
     }
   });
 };
@@ -1292,20 +1460,20 @@ export var MsgContent = function MsgContent(_ref14) {
     _ref14$options = _ref14.options,
     options = _ref14$options === void 0 ? [] : _ref14$options;
   var msgTypeCh = {
-    pdd: '拼多多',
-    ding: '钉钉',
-    wechat: '微信',
-    qq: 'QQ',
-    qywx: '企业微信',
-    YZDKH: '邮政拦截',
-    YT: '圆通拦截',
-    feishu: '飞书'
+    pdd: "拼多多",
+    ding: "钉钉",
+    wechat: "微信",
+    qq: "QQ",
+    qywx: "企业微信",
+    YZDKH: "邮政拦截",
+    YT: "圆通拦截",
+    feishu: "飞书"
   };
   var getColorByStatus = function getColorByStatus(value) {
     var _options$find2;
     return ((_options$find2 = options.find(function (innerItem) {
       return value === innerItem.label || value === innerItem.oldValue;
-    })) === null || _options$find2 === void 0 ? void 0 : _options$find2.color) || '#000';
+    })) === null || _options$find2 === void 0 ? void 0 : _options$find2.color) || "#000";
   };
   var detailContent = function detailContent(item) {
     var _item$msgReceivers;
@@ -1327,14 +1495,14 @@ export var MsgContent = function MsgContent(_ref14) {
     }, "\u5931\u8D25\u539F\u56E0\uFF1A", item.failReason)));
   };
   return /*#__PURE__*/React.createElement(Space, {
-    direction: !horizontal ? 'vertical' : 'horizontal'
+    direction: !horizontal ? "vertical" : "horizontal"
   }, Array.isArray(list) ? (list || []).map(function (item, index) {
     var _item$msgReceivers2;
     var color = getColorByStatus(item[valueKey]);
     var currentOption = options.find(function (option) {
       return item[valueKey] === option.value;
     });
-    var key = item.msgType || 'ding';
+    var key = item.msgType || "ding";
     var formatMsgContent = /*#__PURE__*/React.createElement("span", {
       key: index
     }, msgTypeCh[key] || key, "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
@@ -1362,7 +1530,7 @@ export var AlipayBill = function AlipayBill(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     visible = _useState14[0],
     setVisible = _useState14[1];
-  var _useState15 = useState(''),
+  var _useState15 = useState(""),
     _useState16 = _slicedToArray(_useState15, 2),
     msg = _useState16[0],
     setMsg = _useState16[1];
@@ -1387,7 +1555,7 @@ export var AlipayBill = function AlipayBill(props) {
             data = res.data, msg = res.message;
             if (data) {
               setHasUrl(true);
-              if (['fxg'].includes(platform)) {
+              if (["fxg"].includes(platform)) {
                 setMsg(data);
                 setVisible(true);
               } else {
@@ -1414,8 +1582,8 @@ export var AlipayBill = function AlipayBill(props) {
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     style: {
-      color: '#1890ff',
-      cursor: 'pointer'
+      color: "#1890ff",
+      cursor: "pointer"
     },
     onClick: voucherHandle
   }, value), /*#__PURE__*/React.createElement(Modal, {
@@ -1423,7 +1591,7 @@ export var AlipayBill = function AlipayBill(props) {
     visible: visible,
     footer: false,
     onCancel: closeHandle
-  }, ['fxg'].includes(platform) && hasUrl ? /*#__PURE__*/React.createElement("div", null, "\u8BF7\u590D\u5236\u94FE\u63A5\u5728\u6D4F\u89C8\u5668\u4E0A\u6253\u5F00\uFF0C\u94FE\u63A5\uFF1A", /*#__PURE__*/React.createElement(Paragraph, {
+  }, ["fxg"].includes(platform) && hasUrl ? /*#__PURE__*/React.createElement("div", null, "\u8BF7\u590D\u5236\u94FE\u63A5\u5728\u6D4F\u89C8\u5668\u4E0A\u6253\u5F00\uFF0C\u94FE\u63A5\uFF1A", /*#__PURE__*/React.createElement(Paragraph, {
     copyable: true
   }, msg)) : msg));
 };