@kmkf-fe-packages/basic-components 2.3.3 → 2.3.5

package/dist/index.js

@@ -7774,7 +7774,9 @@ var Province = function Province(props) {
     gy: kmkfUtils.GyAddressData.getInstance(),
     km: kmkfUtils.AddressData.getInstance(),
     jst: kmkfUtils.JstAddressData.getInstance()
+    // jky: JkyAddressData.getInstance(),
   };
+
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
     style: {
@@ -8145,6 +8147,11 @@ var systemOrderMap = {
     ids: 'wdtSystemSelectIds',
     order: 'wdtSystemShowOrder'
   },
+  JKY_SYSTEM_ORDER: {
+    no: 'jkySystemOrderNo',
+    ids: 'jkySystemSelectIds',
+    order: 'jkySystemShowOrder'
+  },
   BS_E3_SYSTEM_ORDER: {
     no: 'bsE3SystemOrderNo',
     ids: 'bsE3SystemSelectIds',
@@ -8622,7 +8629,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WAREHOUSING_STATUS: 'inStockStatusItemList',
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
-      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
+      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -8716,6 +8724,33 @@ var processBsGoods = function processBsGoods(getValue) {
     return _defineProperty({}, nex.uniqueKey, _values);
   };
 };
+var processJkyGoods = function processJkyGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var _values = {
+        jkyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var selectIds = [];
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      var jkySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'JKY_SYSTEM_ORDER';
+      });
+      if (jkySystemOrder) {
+        selectIds = jsonParseSecurity(getValue("".concat(jkySystemOrder.uniqueKey, "_").concat(systemOrderMap[jkySystemOrder.workOrderComponentType].ids)), []);
+      }
+      _values.selectIds = selectIds;
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
 var processWdtGoods = function processWdtGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -9007,6 +9042,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         ids: 'wdtSystemSelectIds',
         order: 'wdtSystemShowOrder'
       },
+      JKY_SYSTEM_ORDER: {
+        no: 'jkySystemOrderNo',
+        ids: 'jkySystemSelectIds',
+        order: 'jkySystemShowOrder'
+      },
       BS_E3_SYSTEM_ORDER: {
         no: 'bsE3SystemOrderNo',
         ids: 'bsE3SystemSelectIds',
@@ -9266,14 +9306,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref73;
-    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
+    var _ref74;
+    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
+    var _ref75;
+    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9377,6 +9417,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
@@ -9392,6 +9433,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       WDT_GOODS: processWdtGoods(templateColumns),
+      JKY_GOODS: processJkyGoods(templateColumns),
       WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
       JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
       BS_E3_GOODS: processBsE3Goods(templateColumns),
@@ -9410,6 +9452,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       KM_SYSTEM_ORDER: processErpSystemOrder,
       WLN_SYSTEM_ORDER: processErpSystemOrder,
       WDT_SYSTEM_ORDER: processErpSystemOrder,
+      JKY_SYSTEM_ORDER: processErpSystemOrder,
       WDT_RETURN_BILL_NO: processErpSystemOrder,
       BS_E3_SYSTEM_ORDER: processErpSystemOrder,
       JST_SYSTEM_ORDER: processErpSystemOrder,
@@ -14001,7 +14044,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 () {
@@ -15373,6 +15416,187 @@ var jyColumns = [{
   }
 }];
 
+var getYesOrNo$2 = function getYesOrNo(val) {
+  if (!lodash.isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var jkyColumns = [{
+  dataIndex: 'goodName',
+  title: "\u8D27\u54C1\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodNo',
+  title: "\u8D27\u54C1\u7F16\u53F7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodId',
+  title: "\u8D27\u54C1ID",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodPicUrl',
+  title: "\u8D27\u54C1\u4E3B\u56FE",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u8D27\u54C1\u522B\u540D",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specBarcode',
+  title: "\u8D27\u54C1\u6761\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'categoryName',
+  title: "\u8D27\u54C1\u7C7B\u522B",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C",
+  align: 'center',
+  ellipsis: true,
+  width: 200,
+  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: 'specNo',
+  title: "\u89C4\u683C\u7F16\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
+  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: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'memberPrice',
+  title: "\u4F1A\u5458\u4EF7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'isVirtual',
+  title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val));
+  }
+}, {
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val === 'combine'));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return lodash.cloneDeep({
     gy: gyColumns,
@@ -15380,7 +15604,8 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns
+    jy: jyColumns,
+    jky: jkyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -18609,92 +18834,339 @@ 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
-        });
-      }
-    }, {
-      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
-    }, {
-      dataIndex: 'goodsPrice',
-      title: "\u5546\u54C1\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'shopPrice',
-      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
+var getTableData$6 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: {
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JKY_ERP',
+      conditionList: conditionList
+    }
+  }).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',
+  type: 'optionalInput'
+}, {
+  label: '货品名称',
+  name: 'goodName'
+}, {
+  label: '货品编码',
+  name: 'goodNo',
+  type: 'optionalInput'
+}];
+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;
+      }
+    };
+  });
+  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.specId || record.id;
+        }).includes(record.specId || record.id),
+        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
+    }, {
+      dataIndex: 'goodsPrice',
+      title: "\u5546\u54C1\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'shopPrice',
+      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
       width: 150,
       render: function render(val) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
@@ -19918,7 +20390,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$2 = function getYesOrNo(val) {
+var getYesOrNo$3 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20069,7 +20541,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       },
       width: 100
     }]
@@ -20081,7 +20553,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$3 = function getYesOrNo(val) {
+var getYesOrNo$4 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20196,7 +20668,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -20215,7 +20687,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -20341,7 +20813,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20470,7 +20942,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20886,10 +21358,121 @@ var getColumns$5 = function getColumns() {
       render: function render(val, record) {
         return (record.qty || 0) * (+record.salePrice || 0);
       }
-    }, {
-      dataIndex: 'batchId',
-      title: '批次号',
-      render: renderTextEllipsis
+    }, {
+      dataIndex: 'batchId',
+      title: '批次号',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : renderTextEllipsis(val);
+      }
+    }, {
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240,
+      render: renderTextEllipsis
+    }].map(fillAttrs),
+    JST_EXCHANGE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return (record.qty || 0) * (+record.salePrice || 0);
+      }
     }, {
       dataIndex: 'isGift',
       title: '是否赠品',
@@ -20923,67 +21506,248 @@ var getColumns$5 = function getColumns() {
           }
         }) : renderTextEllipsis(val);
       }
-    }, {
-      dataIndex: 'outerOiId',
-      title: '子订单号',
-      width: 240,
-      render: renderTextEllipsis
     }].map(fillAttrs),
-    JST_EXCHANGE_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
+    // jst售后商品信息
+    JST_AFTERSALE_GOODS: [{
+      dataIndex: 'asId',
+      title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: '商品编码',
+      dataIndex: 'asiId',
+      title: "\u552E\u540E\u5B50\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'outerOiId',
+      title: "\u5B50\u8BA2\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
       dataIndex: 'pic',
-      title: '商品图片',
+      title: "\u56FE\u7247",
       width: 100,
+      align: 'center',
       render: function render(val) {
         return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
           width: 30,
           src: val
         });
-      }
+      },
+      headerComponentType: 'pic'
+    }, {
+      dataIndex: 'name',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'propertiesValue',
-      title: '规格值',
+      title: "\u89C4\u683C\u5C5E\u6027\u503C",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+      dataIndex: 'qty',
+      title: "\u7533\u8BF7\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'rQty',
+      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'defectiveQty',
+      title: "\u6B21\u54C1\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'amount',
+      title: "\u7533\u8BF7\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopAmount',
+      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combineSkuId',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopSkuId',
+      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: "\u6B3E\u5F0F\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'type',
+      title: "\u552E\u540E\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuType',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      },
+      headerMapping: {
+        transformValue: function transformValue(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        },
+        renderExport: function renderExport(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        }
       }
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-          style: {
-            width: 70
-          },
-          value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      dataIndex: 'receiveDate',
+      title: "\u5165\u4ED3\u65F6\u95F4",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u660E\u7EC6\u5907\u6CE8",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$6 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    KM_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: imgUrl
+        });
       }
     }, {
-      dataIndex: 'qty',
-      title: '数量',
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
@@ -20991,216 +21755,212 @@ var getColumns$5 = function getColumns() {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
-      }
-    }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: true
-          }, {
-            label: '否',
-            value: false
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'remark',
-      title: '备注',
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
-            width: 70
+            width: 130
           },
           value: val,
-          onChange: function onChange(e) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : renderTextEllipsis(val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
-    }].map(fillAttrs),
-    // jst售后商品信息
-    JST_AFTERSALE_GOODS: [{
-      dataIndex: 'asId',
-      title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'asiId',
-      title: "\u552E\u540E\u5B50\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
     }, {
-      dataIndex: 'outerOiId',
-      title: "\u5B50\u8BA2\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'pic',
-      title: "\u56FE\u7247",
-      width: 100,
-      align: 'center',
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      },
-      headerComponentType: 'pic'
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
     }, {
-      dataIndex: 'name',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 250,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'propertiesValue',
-      title: "\u89C4\u683C\u5C5E\u6027\u503C",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'qty',
-      title: "\u7533\u8BF7\u6570\u91CF",
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'rQty',
-      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'defectiveQty',
-      title: "\u6B21\u54C1\u6570\u91CF",
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'amount',
-      title: "\u7533\u8BF7\u91D1\u989D",
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopAmount',
-      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'price',
-      title: "\u5355\u4EF7",
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'combineSkuId',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 250,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopSkuId',
-      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: "\u6B3E\u5F0F\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
+          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var res = typeof realNum === 'number' ? realNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\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) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'realNum');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'desiredNum',
+      title: "\u5E94\u8865\u53D1\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) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      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) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
     }, {
       dataIndex: 'type',
-      title: "\u552E\u540E\u7C7B\u578B",
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuType',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      },
-      headerMapping: {
-        transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
-        },
-        renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
-        }
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: imgUrl
+        });
       }
-    }, {
-      dataIndex: 'receiveDate',
-      title: "\u5165\u4ED3\u65F6\u95F4",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'remark',
-      title: "\u660E\u7EC6\u5907\u6CE8",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }]
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
   };
 };
 
-function toNum$3(value) {
+var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$4(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -21209,69 +21969,117 @@ function toNum$3(value) {
   }
   return void 0;
 }
-var getColumns$6 = function getColumns(_ref) {
+var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return {
-    KM_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250,
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
-      width: 170,
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'outerSkuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
-      width: 170,
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
+      dataIndex: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: imgUrl
-        });
-      }
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'num',
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
@@ -21283,13 +22091,16 @@ var getColumns$6 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
@@ -21300,98 +22111,198 @@ var getColumns$6 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__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: 'settlementPrice',
+      title: "\u7ED3\u7B97\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'divideOrderFee',
+      title: "\u5206\u644A\u5B9E\u4ED8\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
+      });
+    }),
+    // 巨益补发商品信息
+    JY_REISSUE_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'supplierName',
-      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'supplierCode',
-      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    KM_REISSUE_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250,
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'code',
+      title: "\u6761\u7801",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
+      dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
+      dataIndex: 'mallSkuId',
       title: "\u5E73\u53F0\u89C4\u683CID",
-      width: 170,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'outerSkuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
-      width: 170,
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'realNum',
-      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value) {
-        var title = '';
-        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
-          var res = typeof realNum === 'number' ? realNum < 1 : true;
+        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) {
-            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+            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(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
         }
       },
       render: function render(val, record, index) {
@@ -21403,76 +22314,88 @@ var getColumns$6 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'realNum');
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'desiredNum',
-      title: "\u5E94\u8865\u53D1\u6570\u91CF",
-      width: 100,
+      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: 70
+            width: 130
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      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.InputNumber, {
-          style: {
-            width: 130
-          },
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+          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: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'supplierName',
-      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'supplierCode',
-      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      dataIndex: 'gift',
+      title: "\u662F\u5426\u8D60\u54C1",
       width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: imgUrl
-        });
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          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), {}, {
@@ -21483,12 +22406,54 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
-var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+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$4(value) {
+function toNum$5(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -21497,44 +22462,44 @@ function toNum$4(value) {
   }
   return void 0;
 }
-var getColumns$7 = function getColumns(_ref) {
+var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
   return {
-    //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+    //吉客云商品信息
+    JKY_GOODS: [{
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
@@ -21546,82 +22511,18 @@ var getColumns$7 = function getColumns(_ref) {
       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: 'specName',
-    //   title: `规格名称`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 200,
-    // },
-    // {
-    //   dataIndex: 'specCode',
-    //   title: `规格编号`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 150,
-    // },
-    {
-      dataIndex: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'skuImgUrl',
+      title: "\u89C4\u683C\u56FE\u7247",
       align: 'center',
       ellipsis: true,
       width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
     }, {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
@@ -21637,11 +22538,16 @@ 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);
       }
+    }, {
+      dataIndex: 'actualSendCount',
+      title: "\u5B9E\u53D1\u6570\u91CF",
+      width: 150,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sellPrice',
       title: "\u5355\u4EF7",
@@ -21657,30 +22563,57 @@ 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",
+      dataIndex: 'sellTotal',
+      title: "\u603B\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
+      dataIndex: 'discountTotal',
+      title: "\u62B5\u6263\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'settlementPrice',
-      title: "\u7ED3\u7B97\u4EF7",
+      dataIndex: 'shareFavourableFee',
+      title: "\u5206\u644A\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'divideOrderFee',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'shareFavourableAfterFee',
+      title: "\u5206\u644A\u540E\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'bfit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      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,
+      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({
+              divideSellTotal: num
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      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, {
@@ -21692,30 +22625,45 @@ var getColumns$7 = function getColumns(_ref) {
           },
           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",
+      dataIndex: 'isFit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
-      render: renderTextEllipsis
+      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: 'gift',
-      title: "\u662F\u5426\u8D60\u54C1",
+      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, {
@@ -21727,7 +22675,7 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isPresell');
           },
           options: [{
             label: '是',
@@ -21736,121 +22684,175 @@ var getColumns$7 = function getColumns(_ref) {
             label: '否',
             value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == '1' ? '是' : '否');
       }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    // 巨益补发商品信息
-    JY_REISSUE_GOODS: [{
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'cateName',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'goodsTags',
+      title: "\u8D27\u54C1\u6807\u7B7E",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'goodsMemo',
+      title: "\u8D27\u54C1\u5907\u6CE8",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      dataIndex: 'tradeGoodsNo',
+      title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
+      dataIndex: 'tradeGoodsName',
+      title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
+      dataIndex: 'tradeGoodsSpec',
+      title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      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
+    }].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) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
@@ -21860,7 +22862,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);
@@ -21870,7 +22872,7 @@ var getColumns$7 = function getColumns(_ref) {
       title: "\u5355\u4EF7",
       width: 150,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 130
           },
@@ -21880,119 +22882,90 @@ 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) {
+        if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
+          return record.sellCount * record.sellPrice;
+        }
+        return '';
+      }
     }, {
-      dataIndex: 'bfit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      dataIndex: 'reason',
+      title: "\u9000\u6362\u539F\u56E0",
+      width: 250,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
+          onChange: function onChange(e) {
+            updateHandle(e.target.value, index, 'reason');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      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, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           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, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isFit');
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__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: '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,
@@ -22109,7 +23082,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
@@ -22147,8 +23120,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
@@ -22295,6 +23273,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) {
@@ -22347,6 +23328,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJky(type)) {
+    newList = processJkyGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -22395,11 +23383,45 @@ var processJyGoods = function processJyGoods(_ref2) {
     });
   });
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref3) {
+var processJkyGoods$1 = function processJkyGoods(_ref3) {
   var list = _ref3.list,
-    type = _ref3.type,
     canUpdateNumber = _ref3.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType,
+      specImgUrl = item.specImgUrl,
+      categoryName = item.categoryName;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      cateName: categoryName,
+      goodsName: goodName,
+      goodsNo: goodNo,
+      goodsId: goodId,
+      barcode: specBarcode,
+      skuImgUrl: specImgUrl,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      isGift: isGift ? 1 : 0,
+      isFit: skuType === 'combine' ? 1 : 0,
+      uuid: kmkfUtils.uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: retailPrice,
+      sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref4) {
+  var list = _ref4.list,
+    type = _ref4.type,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: kmkfUtils.uuid(),
@@ -22417,9 +23439,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref3) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
-  var list = _ref4.list,
-    canUpdateNumber = _ref4.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
+  var list = _ref5.list,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -22454,9 +23476,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref5) {
-  var list = _ref5.list,
-    source = _ref5.source;
+var processGyGoods$1 = function processGyGoods(_ref6) {
+  var list = _ref6.list,
+    source = _ref6.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -22483,8 +23505,8 @@ var processGyGoods$1 = function processGyGoods(_ref5) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref6) {
-  var list = _ref6.list;
+var processJstGoods$1 = function processJstGoods(_ref7) {
+  var list = _ref7.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -22502,9 +23524,9 @@ var processJstGoods$1 = function processJstGoods(_ref6) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref7) {
-  var list = _ref7.list,
-    type = _ref7.type;
+var processKmGoods$1 = function processKmGoods(_ref8) {
+  var list = _ref8.list,
+    type = _ref8.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -22536,9 +23558,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref8) {
-  var list = _ref8.list,
-    canUpdateNumber = _ref8.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref9) {
+  var list = _ref9.list,
+    canUpdateNumber = _ref9.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -22583,6 +23605,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 = {
@@ -22595,6 +23619,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',
@@ -22807,6 +23833,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
+SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
@@ -22827,6 +23854,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) {
@@ -22884,8 +23914,8 @@ 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 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 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', 'JKY_REISSUE_GOODS'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -22976,6 +24006,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':
           {
@@ -24180,7 +25212,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) {
@@ -24188,6 +25220,54 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         singletonMap$7.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
+        method: 'post',
+        data: {
+          sourceTradeNos: orderNo
+        }
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data, _res$data2;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
+            var _filterJkyOrders;
+            res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
+                tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus],
+                logisticName: kmkfUtils.getJkyLogisticInfo(item, 'logisticName'),
+                logisticCode: kmkfUtils.getJkyLogisticInfo(item, 'logisticCode'),
+                logisticNo: kmkfUtils.getJkyLogisticInfo(item, 'logisticNo')
+              });
+            });
+          }
+          resolve(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.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: {
@@ -24211,16 +25291,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
@@ -24237,6 +25317,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 = {
@@ -24248,6 +25329,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) {
@@ -24262,7 +25344,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') {
@@ -24281,6 +25362,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]);
@@ -24520,8 +25603,8 @@ var index$2 = (function (props) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             jyUtils.getJyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+              var trades = (data || []).filter(function (item) {
+                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
@@ -24545,6 +25628,28 @@ 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) {
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
+                orders: data || [],
+                showOrderInfo: data || []
+              }));
+            });
+            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,
@@ -24969,16 +26074,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', {
@@ -24994,16 +26099,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,
@@ -25436,6 +26541,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) {
@@ -25505,8 +26613,8 @@ var processGyOrders = function processGyOrders(_ref4) {
 var processJyOrders = function processJyOrders(_ref5) {
   var data = _ref5.data,
     orderNo = _ref5.orderNo;
-  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  var trades = (data || []).filter(function (item) {
+    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
   });
   return trades;
 };
@@ -25736,6 +26844,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',
@@ -26166,6 +27300,7 @@ var CommonGoods = function CommonGoods(props) {
     }
   }));
 };
+CommonGoods.displayName = 'CommonGoods';
 
 var componentMap$3 = {
   WDT_RETURN_GOODS: {
@@ -26817,10 +27952,26 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'subOrderDetails',
     isShowSelectTradeGoods: true
+  },
+  JKY_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'jkyReissueGoods',
+    typeName: 'jkyReissueType',
+    systemOrder: 'jkySystemOrder',
+    systemOrderNo: 'jkySystemOrderNo',
+    getOrderList: jkyUtils.getJkyOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'tradeNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'goodsDetail',
+    isShowSelectTradeGoods: true,
+    showModeBtn: false
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
+  var _typeMap$type35, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44, _value$typeMap$type$s8, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27021,7 +28172,7 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, [sysItemIdMap]);
   var getGoodDetails = function getGoodDetails(_ref5) {
-    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
+    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23;
     var mode = _ref5.mode,
       sysOrderNo = _ref5.sysOrderNo,
       _ref5$isAllOrders = _ref5.isAllOrders,
@@ -27043,14 +28194,17 @@ var PublicReissue = function PublicReissue(props) {
       orderRest = {
         canEdit: true
       };
+    } else if (['JKY_REISSUE_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
     var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
     });
-    console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
-    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
+    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest)) : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -27058,30 +28212,30 @@ var PublicReissue = function PublicReissue(props) {
     return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type25;
+    var _typeMap$type24;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
+    var _typeMap$type25, _typeMap$type26, _value$typeMap$type$t2, _typeMap$type31, _value$typeMap$type$t3, _typeMap$type33;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
-      var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderBillType) {
+      var _value$typeMap$type$s7, _typeMap$type27, _typeMap$type29, _typeMap$type30;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type29;
-        return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
+        var _typeMap$type28;
+        return oItem[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.oIdKey] === val;
       });
-      newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type33;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type35;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
+      newValue[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type32;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type34;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -27089,27 +28243,27 @@ var PublicReissue = function PublicReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
+    var _typeMap$type36, _typeMap$type37, _typeMap$type38, _uniqBy, _typeMap$type39;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict,
-      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
+      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      var _typeMap$type41;
-      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type40;
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key) || "".concat(Date.now())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -27125,12 +28279,12 @@ var PublicReissue = function PublicReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -27152,11 +28306,11 @@ var PublicReissue = function PublicReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -27165,7 +28319,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -27176,15 +28330,15 @@ var PublicReissue = function PublicReissue(props) {
     canUpdateNumber: showChangeBtn,
     hasSelectedSystemOrder: showChangeBtn,
     // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
     // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
-    showModeBtn: false,
+    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showModeBtn),
     isStrict: isStrict,
     isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
     systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
@@ -27199,6 +28353,7 @@ var PublicReissue = function PublicReissue(props) {
     }
   })));
 };
+PublicReissue.displayName = 'PublicReissue';
 
 var css_248z$g = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$g);
@@ -29491,6 +30646,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
 };
 
@@ -29573,6 +30729,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;