@kmkf-fe-packages/basic-components 2.2.39-beta.11 → 2.2.39-beta.14

package/dist/index.js

@@ -13963,7 +13963,7 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
   var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   React.useEffect(function () {
@@ -15333,6 +15333,223 @@ var jyColumns = [{
   }
 }];
 
+var jkyColumns = [{
+  dataIndex: 'goodsNo',
+  title: "\u8D27\u54C1\u7F16\u53F7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodsName',
+  title: "\u8D27\u54C1\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodsId',
+  title: "\u8D27\u54C1ID",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'barcode',
+  title: "\u8D27\u54C1\u6761\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specName',
+  title: "\u89C4\u683C\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specId',
+  title: "\u89C4\u683CID",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'skuImgUrl',
+  title: "\u89C4\u683C\u56FE\u7247",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'sellCount',
+  title: "\u6570\u91CF",
+  width: 100,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, val);
+  }
+}, {
+  dataIndex: 'actualSendCount',
+  title: "\u5B9E\u53D1\u6570\u91CF",
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'sellPrice',
+  title: "\u5355\u4EF7",
+  width: 150,
+  render: function render(val) {
+    return val || val === 0 ? Number(val).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'sellTotal',
+  title: "\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'discountTotal',
+  title: "\u62B5\u6263\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'shareFavourableFee',
+  title: "\u5206\u644A\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'shareFavourableAfterFee',
+  title: "\u5206\u644A\u540E\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'customerPrice',
+  title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
+  width: 150
+}, {
+  dataIndex: 'customerTotal',
+  title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'divideSellTotal',
+  title: "\u5B9E\u4ED8\u91D1\u989D",
+  width: 150
+}, {
+  dataIndex: 'isGift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'isFit',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'isPresell',
+  title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C",
+  align: 'center',
+  ellipsis: true,
+  width: 200,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'cateName',
+  title: "\u8D27\u54C1\u7C7B\u522B",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodsTags',
+  title: "\u8D27\u54C1\u6807\u7B7E",
+  align: 'center',
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodsMemo',
+  title: "\u8D27\u54C1\u5907\u6CE8",
+  align: 'center',
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'tradeGoodsNo',
+  title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
+  align: 'center',
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'tradeGoodsName',
+  title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'tradeGoodsSpec',
+  title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'sourceSubtradeNo',
+  title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'platGoodsId',
+  title: "\u5E73\u53F0\u5546\u54C1ID",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'subTradeId',
+  title: "\u5546\u54C1\u660E\u7EC6ID",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'batchNo',
+  title: "\u6279\u6B21\u53F7",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'sendCount',
+  title: "\u6279\u6B21\u6570\u91CF",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'productDate',
+  title: "\u751F\u4EA7\u65E5\u671F",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'expireDate',
+  title: "\u5230\u671F\u65E5\u671F",
+  ellipsis: true,
+  width: 250,
+  render: renderTextEllipsis
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return lodash.cloneDeep({
     gy: gyColumns,
@@ -15340,7 +15557,8 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns
+    jy: jyColumns,
+    jky: jkyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -18482,78 +18700,321 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
 };
 var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
 
-var getColumns = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //百胜E3补发商品
-    BS_E3_REISSUE_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: val
-        });
+var getTableData$6 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JY_ERP'
+    }, formData)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$5 = [{
+  label: '规格名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: '规格编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
+}, {
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}];
+var GoodList$6 = function GoodList(props, ref) {
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jky'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  React.useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
       }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u53F7ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorName',
-      title: "\u989C\u8272\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorCode',
-      title: "\u989C\u8272\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeName',
-      title: "\u5C3A\u7801\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeCode',
-      title: "\u5C3A\u7801\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
+    };
+  });
+  var _Form$useForm = antd.Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = ahooks.useAntdTable(getTableData$6, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(lodash.takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData$5,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
+    className: "GoodModalColumns",
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    },
+    size: "small"
+  }, tableProps))), /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
+};
+var JkyGoodsList = /*#__PURE__*/React.forwardRef(GoodList$6);
+
+var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+  React.useImperativeHandle(ref, function () {
+    return {
+      open: function open(shopCode) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        setVisible(true);
+        setSelectedRows(options.value || []);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var jkyGoodsListRef = React.useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _jkyGoodsListRef$curr;
+    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(JkyGoodsList, {
+    ref: jkyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JkyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JkyGoodsModal);
+
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //百胜E3补发商品
+    BS_E3_REISSUE_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'goodsSn',
+      title: "\u8D27\u53F7",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u53F7ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorName',
+      title: "\u989C\u8272\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorCode',
+      title: "\u989C\u8272\u4EE3\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeName',
+      title: "\u5C3A\u7801\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeCode',
+      title: "\u5C3A\u7801\u4EE3\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
       dataIndex: 'goodsNumber',
       title: "\u5546\u54C1\u6570\u91CF",
       width: 150
@@ -21399,32 +21860,16 @@ var getColumns$7 = function getColumns(_ref) {
       title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    },
-    // {
-    //   dataIndex: 'goodsName',
-    //   title: `货品名称`,
-    //   width: 250,
-    // },
-    // {
-    //   dataIndex: 'goodsCode',
-    //   title: `货品编号`,
-    //   width: 200,
-    // },
-    // {
-    //   dataIndex: 'goodsId',
-    //   title: `货品ID`,
-    //   width: 150,
-    // },
-    {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
       width: 150,
       render: renderTextEllipsis
     },
@@ -21615,93 +22060,636 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
-      align: 'center',
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var res = typeof qty === 'number' ? qty < 1 : true;
+          if (res) {
+            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'bfit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'bfit');
+          },
+          options: [{
+            label: '是',
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'gift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'gift');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var getColumns$8 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //[SKX]商品信息(ON)
+    SKX_GOODS: [{
+      dataIndex: 'skuEcode',
+      title: "[SKX]\u53D1\u8D27\u5355\u660E\u7EC6-skuEcode",
+      width: 250
+    }, {
+      dataIndex: 'subOrderId',
+      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'onBillNo',
+      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
+      width: 200
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    //[SKX]退货商品信息(TH)
+    SKX_RETURN_GOODS: [{
+      dataIndex: 'returnSkuEcode',
+      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
+      width: 300
+    }, {
+      dataIndex: 'returnSubOrderId',
+      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'returnBillNo',
+      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
+      width: 200
+    }]
+  };
+};
+
+var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$5(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$9 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JKY_GOODS: [{
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuImgUrl',
+      title: "\u89C4\u683C\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'actualSendCount',
+      title: "\u5B9E\u53D1\u6570\u91CF",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'discountTotal',
+      title: "\u62B5\u6263\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'shareFavourableFee',
+      title: "\u5206\u644A\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'shareFavourableAfterFee',
+      title: "\u5206\u644A\u540E\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'customerPrice',
+      title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'customerTotal',
+      title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'divideSellTotal',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'isFit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isFit');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'isPresell',
+      title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isPresell');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'cateName',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsTags',
+      title: "\u8D27\u54C1\u6807\u7B7E",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsMemo',
+      title: "\u8D27\u54C1\u5907\u6CE8",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'tradeGoodsNo',
+      title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'tradeGoodsName',
+      title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'tradeGoodsSpec',
+      title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sourceSubtradeNo',
+      title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platGoodsId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
-      align: 'center',
+      dataIndex: 'subTradeId',
+      title: "\u5546\u54C1\u660E\u7EC6ID",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
-      align: 'center',
+      dataIndex: 'batchNo',
+      title: "\u6279\u6B21\u53F7",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
+      dataIndex: 'sendCount',
+      title: "\u6279\u6B21\u6570\u91CF",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
+      dataIndex: 'productDate',
+      title: "\u751F\u4EA7\u65E5\u671F",
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      dataIndex: 'expireDate',
+      title: "\u5230\u671F\u65E5\u671F",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    // 巨益补发商品信息
+    JKY_REISSUE_GOODS: [{
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuImgUrl',
+      title: "\u89C4\u683C\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
     }, {
       dataIndex: 'sellCount',
-      title: "\u6570\u91CF",
+      title: "\u53D1\u8D27\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jkyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$5(goods === null || goods === void 0 ? void 0 : goods.sellCount);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodsName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodsName, "]") : '';
           }
           return res;
         })) {
-          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
         }
       },
       render: function render(val, record, index) {
@@ -21715,7 +22703,7 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -21735,131 +22723,87 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
-    }, {
-      dataIndex: 'mallSellingPrice',
-      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
-      width: 150
     }, {
       dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
-      width: 150
+      title: "\u603B\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.sellCount * record.sellPrice;
+      }
     }, {
-      dataIndex: 'bfit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      dataIndex: 'reason',
+      title: "\u9000\u6362\u539F\u56E0",
+      width: 250,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'reason');
+          }
+        });
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'bfit');
+            updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: '1'
           }, {
             label: '否',
-            value: 'False'
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }, {
-      dataIndex: 'combinationName',
-      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'combinationCode',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'gift',
-      title: "\u662F\u5426\u8D60\u54C1",
+      dataIndex: 'isFit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isFit');
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 'True'
           }, {
             label: '否',
-            value: '0'
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
-  };
-};
-
-var getColumns$8 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
-  return {
-    //[SKX]商品信息(ON)
-    SKX_GOODS: [{
-      dataIndex: 'skuEcode',
-      title: "[SKX]\u53D1\u8D27\u5355\u660E\u7EC6-skuEcode",
-      width: 250
     }, {
-      dataIndex: 'subOrderId',
-      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
-      width: 300
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'onBillNo',
-      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
-      width: 200
+      dataIndex: 'cateName',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
         ellipsis: true
       });
-    }),
-    //[SKX]退货商品信息(TH)
-    SKX_RETURN_GOODS: [{
-      dataIndex: 'returnSkuEcode',
-      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
-      width: 300
-    }, {
-      dataIndex: 'returnSubOrderId',
-      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
-      width: 300
-    }, {
-      dataIndex: 'returnBillNo',
-      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
-      width: 200
-    }]
+    })
   };
 };
 
-var getColumns$9 = function getColumns(_ref) {
+var getColumns$a = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -21976,7 +22920,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -22014,8 +22958,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$9({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), {}, {
-    default: getColumns$9({
+    default: getColumns$a({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -22162,6 +23111,9 @@ var isErpType = {
   },
   isJy: function isJy(type) {
     return ['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type);
+  },
+  isJky: function isJky(type) {
+    return ['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -22448,6 +23400,8 @@ var GoodsModalMap = {
   KM_REISSUE_GOODS: KmGoodsModal,
   JY_GOODS: JyGoodsModal$1,
   JY_REISSUE_GOODS: JyGoodsModal$1,
+  JKY_GOODS: JkyGoodsModal$1,
+  JKY_REISSUE_GOODS: JkyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -22460,6 +23414,8 @@ var systemOrderNoMap = {
   WLN_GOODS: 'tradeNo',
   JY_GOODS: 'tradeNo',
   JY_REISSUE_GOODS: 'tradeNo',
+  JKY_GOODS: 'tradeNo',
+  JKY_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   JST_REISSUE_GOODS: 'oId',
   GY_REISSUE_GOODS: 'code',
@@ -22634,6 +23590,9 @@ var getButtonText = function getButtonText() {
   if (['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type)) {
     return '选择巨益ERP商品';
   }
+  if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
+    return '选择吉客云ERP商品';
+  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -22691,7 +23650,7 @@ var GoodItem$1 = function GoodItem(props) {
   var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   // 判断是否为是否展示系统单筛选项
-  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
   var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
@@ -22783,6 +23742,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
         case 'JY_REISSUE_GOODS':
+        case 'JKY_GOODS':
+        case 'JKY_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -23987,7 +24948,7 @@ var jyUtils = {
 };
 
 var singletonMap$7 = new Map();
-var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
   if (!singletonMap$7.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
@@ -23995,6 +24956,50 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         singletonMap$7.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/jkyOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data, _res$data$tradeOrderD, _res$data3;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
+            var _filterJkyOrders, _res$data2;
+            res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
+              });
+            });
+          }
+          resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$7.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(res);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$7.set(orderNo, p);
+  }
+  return singletonMap$7.get(orderNo);
+};
+var jkyUtils = {
+  getJkyOrderListSingleton: getJkyOrderListSingleton
+};
+
+var singletonMap$8 = new Map();
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$8.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$8.delete(orderNo);
+        reject(err);
+      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -24018,16 +25023,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$7.delete(orderNo);
+            singletonMap$8.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$7.set(orderNo, p);
+    singletonMap$8.set(orderNo, p);
   }
-  return singletonMap$7.get(orderNo);
+  return singletonMap$8.get(orderNo);
 };
 var kmUtils = {
   getOrderListSingleton: getOrderListSingleton$2
@@ -24044,6 +25049,7 @@ var columnsMap = {
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
+  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 var rowKeyMap = {
@@ -24055,6 +25061,7 @@ var rowKeyMap = {
   GY_SYSTEM_ORDER: 'billNo',
   JST_SYSTEM_ORDER: 'oId',
   JY_SYSTEM_ORDER: 'tradeNo',
+  JKY_SYSTEM_ORDER: 'tradeNo',
   WDT_RETURN_BILL_NO: 'refundNo'
 };
 var index$2 = (function (props) {
@@ -24069,7 +25076,6 @@ var index$2 = (function (props) {
   React.useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
-    console.log('value77777777', value);
     if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length) && !onceRef.current) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
@@ -24088,6 +25094,8 @@ var index$2 = (function (props) {
         getJstOrderList(value.orderNo);
       } else if (type === 'JY_SYSTEM_ORDER') {
         getJyOrderList(value.orderNo);
+      } else if (type === 'JKY_SYSTEM_ORDER') {
+        getJkyOrderList(value.orderNo);
       }
     }
   }, [value, type]);
@@ -24352,6 +25360,31 @@ var index$2 = (function (props) {
       return _ref10.apply(this, arguments);
     };
   }();
+  var getJkyOrderList = /*#__PURE__*/function () {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
+              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
+                orders: trades,
+                showOrderInfo: trades
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    }));
+    return function getJkyOrderList(_x9) {
+      return _ref12.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -24776,16 +25809,16 @@ var orderSubFormConstants = {
 };
 
 var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
-var singletonMap$8 = new Map();
+var singletonMap$9 = new Map();
 var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
     shopId = parmas.shopId;
   var key = "".concat(orderNo, "-").concat(shopId);
-  if (!singletonMap$8.has(key)) {
+  if (!singletonMap$9.has(key)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$8.delete(key);
+        singletonMap$9.delete(key);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -24801,16 +25834,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$8.delete(key);
+            singletonMap$9.delete(key);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$8.set(key, p);
+    singletonMap$9.set(key, p);
   }
-  return singletonMap$8.get(key);
+  return singletonMap$9.get(key);
 };
 var renderEditItem = function renderEditItem(_ref) {
   var item = _ref.item,
@@ -25243,6 +26276,9 @@ var isErpType$1 = {
   },
   isJy: function isJy(type) {
     return ['JY_GOODS'].includes(type);
+  },
+  isJky: function isJky(type) {
+    return ['JKY_GOODS'].includes(type);
   }
 };
 var processAllOrders = function processAllOrders(_ref) {
@@ -25543,6 +26579,32 @@ var componentMap$2 = {
     },
     getOrderList: jyUtils.getJyOrderListSingleton
   },
+  JKY_GOODS: {
+    type: 'jky',
+    key: 'jkyGoods',
+    name: '吉客云',
+    orderNo: 'tradeNo',
+    goodDetailOrderNo: 'tradeNo',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'jkyType',
+      updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
+      selectListReturn: 'jkySelectListReturn',
+      selectList: 'jkySelectList',
+      reissueSelectList: 'jkyReissueSelectList',
+      reissueSelectListReturn: 'jkyReissueSelectListReturn',
+      reissueDeleteGood: 'jkyReissueDeleteGood',
+      changeShopCode: 'jkyChangeShopCode',
+      reissueType: 'jkyReissueType',
+      returnType: 'jkyReturnType',
+      returnSelectListReturn: 'jkyReturnSelectListReturn',
+      returnSelectList: 'jkyReturnSelectList',
+      deleteGood: 'jkyDeleteGood',
+      returnDeleteGood: 'jkyReturnDeleteGood',
+      exchangeDeleteGood: 'jkyExchangeDeleteGood'
+    },
+    getOrderList: jkyUtils.getJkyOrderListSingleton
+  },
   WDT_AFTERSALE_GOODS: {
     type: 'wdtAftersale',
     key: 'wdtAftersaleGoods',
@@ -25745,7 +26807,6 @@ var CommonGoods = function CommonGoods(props) {
   var getAllTradeGoodsDetails = function getAllTradeGoodsDetails(_ref3) {
     var mode = _ref3.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
-    console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
     if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
       orderBackGoodsLevel: props.orderBackGoodsLevel
@@ -29058,6 +30119,7 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
+  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 
@@ -29140,6 +30202,7 @@ exports.erpColumnsMap = erpColumnsMap;
 exports.erpFormValidator = erpFormValidator;
 exports.erpModalColumnsMap = index$1;
 exports.getGyColumns = getColumns$4;
+exports.getJkyColumns = getColumns$9;
 exports.getJstColumns = getColumns$5;
 exports.getJyColumns = getColumns$7;
 exports.getKmColumns = getColumns$6;