@kmkf-fe-packages/basic-components 2.2.14 → 2.2.16

package/dist/index.js

@@ -13747,7 +13747,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'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
   var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   React.useEffect(function () {
@@ -13845,7 +13845,7 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(val) {
       changeInputHandle(val, 'logisticsCompany');
     },
-    value: platformType === 'gy' ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
+    value: ['gy', 'jy'].includes(platformType) ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
@@ -14900,13 +14900,139 @@ var kmColumns = [{
   width: 150
 }];
 
+var getYesOrNo$1 = function getYesOrNo(val) {
+  if (!lodash.isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var jyColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'imageUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    }) : null;
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'categoryName',
+  title: "\u5546\u54C1\u7EC4",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'specName',
+  title: '规格名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: '规格编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'specId',
+  title: '规格ID',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specBarcode',
+  title: '规格条码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'specImgUrl',
+  title: '规格图片',
+  width: 100,
+  render: function render(picUrl) {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    }) : null;
+  }
+}, {
+  dataIndex: 'colorName',
+  title: "\u989C\u8272",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'isGift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+  }
+}, {
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val === 'combine'));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return lodash.cloneDeep({
     gy: gyColumns,
     jst: jstColumns,
     wdt: wdtColumns,
     bse3: bse3Columns,
-    km: kmColumns
+    km: kmColumns,
+    jy: jyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -17181,11 +17307,12 @@ var SearchHeader = function SearchHeader(_ref) {
     timeOptions = _ref.timeOptions,
     ShopList = _ref.ShopList,
     onSubmit = _ref.onSubmit;
+  console.log('allFields', allFields);
   // const fixedFieldsOptions = useMemo(() => {
   //   return allFields.filter(item => fixedFields?.includes(item.id));
   // }, [fixedFields, allFields]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
-    className: 'search-header-wrap'
+    className: "search-header-wrap"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "".concat(status ? 'is-open' : 'not-open')
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -17342,6 +17469,9 @@ var WorkorderList = function WorkorderList(props, ref) {
         return selectedList.map(function (workOrderData) {
           return goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
         });
+      },
+      setDefaultSearchValue: function setDefaultSearchValue(value) {
+        value && form.setFieldsValue(_objectSpread2({}, value));
       }
     };
   });
@@ -17620,21 +17750,112 @@ var WorkorderList = function WorkorderList(props, ref) {
 };
 var WorkorderList$1 = /*#__PURE__*/React.forwardRef(WorkorderList);
 
-// interface GoodModelProps {
-//   shopId: number | string;
-//   maxLength: number;
-//   shopList: any[];
-//   width?: string | number;
-//   shopCode?: string;
-//   companyKey: string;
-//   onSubmit: (...args: any[]) => any;
-// }
+var goodClassTransformValue = function goodClassTransformValue(value, config) {
+  var label = '';
+  var options = (config === null || config === void 0 ? void 0 : config.options) || [];
+  var labelList = kmkfUtils.findLabelBySelectValue(value, options);
+  var labelItem = labelList === null || labelList === void 0 ? void 0 : labelList.pop();
+  label = labelItem === null || labelItem === void 0 ? void 0 : labelItem.label;
+  return {
+    type: 'anylike',
+    keywords: label
+  };
+};
+var goodTypeTransformValue = function goodTypeTransformValue(value) {
+  return (value === null || value === void 0 ? void 0 : value.value) ? [value === null || value === void 0 ? void 0 : value.value] : '';
+};
+var relationComponentUniqueKeyMap = {
+  //小白熊自定义组件
+  PCE2Z5TXEVPL5D26I7KMBKMB: {
+    //补发类型
+    goodType: {
+      relationComponentKey: '6hldjQ9aMz',
+      reflectKey: 'C7M9rWJMjD_radio',
+      transformValue: function transformValue(value) {
+        return goodTypeTransformValue(value);
+      }
+    },
+    // 产品分类
+    goodClass: {
+      relationComponentKey: '8gozpyUFtA',
+      reflectKey: 'c66dt8s48A_input',
+      transformValue: function transformValue(value, config) {
+        return goodClassTransformValue(value, config);
+      }
+    }
+  },
+  // 测马奔腾
+  SZF4ZGWZSNW6PYXMCIFEWBXT: {
+    goodType: {
+      relationComponentKey: 'abVTwFX34E',
+      reflectKey: 'ipOHnYquYB_radio',
+      transformValue: function transformValue(value) {
+        return goodTypeTransformValue(value);
+      }
+    },
+    goodClass: {
+      relationComponentKey: 'U0es1pIDaE',
+      reflectKey: 'K1puYheEaE_input',
+      transformValue: function transformValue(value, config) {
+        return goodClassTransformValue(value, config);
+      }
+    }
+  }
+};
+// 该方法只用于小白熊定制，当管易商品/管易补发/管易退换货组件的数据来源于关联工单数据，且其补发类型自定义组件选了值，根据该值填充到商品库弹框中类型筛选项
+var useDefaultSearchValue = (function (props) {
+  var form = props.form,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
+    source = props.source,
+    erp = props.erp,
+    _props$templateDetail = props.templateDetail,
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
+  if (source !== 'workOrder' || erp !== 'gy') {
+    return '';
+  }
+  var result = {};
+  var relationComponentKeyMap = relationComponentUniqueKeyMap === null || relationComponentUniqueKeyMap === void 0 ? void 0 : relationComponentUniqueKeyMap[companyKey];
+  Object.entries(relationComponentKeyMap).forEach(function (_ref) {
+    var _templateDetail$compo;
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    var matchComponent = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.find(function (item) {
+      return item.uniqueKey === value.relationComponentKey;
+    });
+    if (!matchComponent) {
+      return;
+    }
+    var relationComponentValue = form === null || form === void 0 ? void 0 : form.getFieldValue(value.relationComponentKey);
+    if (relationComponentValue) {
+      if ((value === null || value === void 0 ? void 0 : value.transformValue) && typeof (value === null || value === void 0 ? void 0 : value.transformValue) === 'function') {
+        var _value$transformValue;
+        var newValue = value === null || value === void 0 ? void 0 : (_value$transformValue = value.transformValue) === null || _value$transformValue === void 0 ? void 0 : _value$transformValue.call(value, relationComponentValue, (matchComponent === null || matchComponent === void 0 ? void 0 : matchComponent.componentConfig) || {});
+        if (newValue) {
+          result[value.reflectKey] = newValue;
+        }
+      } else {
+        result[value.reflectKey] = relationComponentValue;
+      }
+    }
+  });
+  return result;
+});
+
 var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
-  var _props$goodsSource;
+  var _props$goodsSource2;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     seletedGooods = _useState2[0],
     setSeletedGooods = _useState2[1];
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var goodsListRef = React.useRef(null);
   React.useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode, options) {
@@ -17643,19 +17864,28 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
       }
     };
   });
-  var onSubmit = props.onSubmit,
-    width = props.width;
-  var _useState3 = React.useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
-  var goodsListRef = React.useRef(null);
+  React.useEffect(function () {
+    if (visible && goodsListRef.current) {
+      var _props$goodsSource;
+      var defaultSearchValue = useDefaultSearchValue({
+        form: props === null || props === void 0 ? void 0 : props.form,
+        companyKey: props === null || props === void 0 ? void 0 : props.companyKey,
+        source: (_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source,
+        erp: 'gy',
+        templateDetail: props === null || props === void 0 ? void 0 : props.templateDetail
+      });
+      if (defaultSearchValue) {
+        var _goodsListRef$current, _goodsListRef$current2;
+        (_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : (_goodsListRef$current2 = _goodsListRef$current.setDefaultSearchValue) === null || _goodsListRef$current2 === void 0 ? void 0 : _goodsListRef$current2.call(_goodsListRef$current, defaultSearchValue);
+      }
+    }
+  }, [visible]);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _goodsListRef$current;
-    var selectedList = ((_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : _goodsListRef$current.getSelectGoodList()) || [];
+    var _goodsListRef$current3;
+    var selectedList = ((_goodsListRef$current3 = goodsListRef.current) === null || _goodsListRef$current3 === void 0 ? void 0 : _goodsListRef$current3.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -17670,7 +17900,7 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, ((_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source) === 'workOrder' ? /*#__PURE__*/React__default['default'].createElement(WorkorderList$1, {
+  }, ((_props$goodsSource2 = props.goodsSource) === null || _props$goodsSource2 === void 0 ? void 0 : _props$goodsSource2.source) === 'workOrder' ? /*#__PURE__*/React__default['default'].createElement(WorkorderList$1, {
     erp: "gy",
     goodsSource: props.goodsSource,
     seletedGooods: seletedGooods,
@@ -17682,45 +17912,286 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
 };
 var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
 
-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
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 60,
-          src: val
-        });
+var getTableData$5 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JY_ERP'
+    }, formData)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$4 = [{
+  label: '规格名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: '规格编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
+}, {
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}];
+var GoodList$5 = 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('jy'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  React.useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
       }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      width: 150
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u53F7ID",
+    };
+  });
+  var _Form$useForm = antd.Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = ahooks.useAntdTable(getTableData$5, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(lodash.takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData$4,
+    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({
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, 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 JyGoodsList = /*#__PURE__*/React.forwardRef(GoodList$5);
+
+var JyGoodsModal = function JyGoodsModal(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 jyGoodsListRef = React.useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _jyGoodsListRef$curre;
+    var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.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(JyGoodsList, {
+    ref: jyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+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
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'goodsSn',
+      title: "\u8D27\u53F7",
+      width: 150
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u53F7ID",
       width: 150
     }, {
       dataIndex: 'colorName',
@@ -18612,7 +19083,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$1 = function getYesOrNo(val) {
+var getYesOrNo$2 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -18750,7 +19221,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
       },
       width: 100
     }]
@@ -18762,7 +19233,7 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$2 = function getYesOrNo(val) {
+var getYesOrNo$3 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -18872,7 +19343,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$2(val));
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -18891,7 +19362,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -19011,7 +19482,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -19135,7 +19606,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -19782,59 +20253,487 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'type',
       title: "\u5546\u54C1\u7C7B\u578B",
       width: 150
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    KM_REISSUE_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
+      width: 170
+    }, {
+      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$2(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: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$7 = 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",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    },
+    // {
+    //   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
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150
+    },
+    // {
+    //   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
+    }, {
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
+          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var res = typeof qty === 'number' ? qty < 1 : true;
+          if (res) {
+            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: '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
+    }, {
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 150
+    }, {
+      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
+    }, {
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'code',
+      title: "\u6761\u7801",
       width: 150
     }, {
-      dataIndex: 'title',
+      dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
-      width: 170
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
     }, {
-      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$2(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$3(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) {
@@ -19846,64 +20745,86 @@ 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$1(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$1(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
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 60,
-          src: val
-        });
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 150
+    }, {
+      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, {
+          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), {}, {
@@ -19914,7 +20835,7 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
-var getColumns$7 = function getColumns(_ref) {
+var getColumns$8 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
@@ -19956,7 +20877,7 @@ var getColumns$7 = function getColumns(_ref) {
   };
 };
 
-var getColumns$8 = function getColumns(_ref) {
+var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -20069,7 +20990,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({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -20099,11 +21020,16 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled: disabled,
     updateHandle: updateHandle
   })), getColumns$7({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
+  })), getColumns$8({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
   })), {}, {
-    default: getColumns$8({
+    default: getColumns$9({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -20247,6 +21173,9 @@ var isErpType = {
   },
   isKm: function isKm(type) {
     return ['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type);
+  },
+  isJy: function isJy(type) {
+    return ['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -20292,6 +21221,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJy(type)) {
+    newList = processJyGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -20302,11 +21238,49 @@ var processGoods$1 = function processGoods(_ref) {
   }
   return newList;
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref2) {
+var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
-    type = _ref2.type,
     canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specName = item.specName,
+      specNo = item.specNo,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      goodsName: goodName,
+      goodsCode: goodNo,
+      goodsId: goodId,
+      code: specBarcode,
+      specCode: specNo,
+      productName: goodName,
+      productCode: goodNo,
+      productId: goodId,
+      skuName: specName,
+      skuCode: specNo,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      gift: isGift ? '1' : '0',
+      bfit: skuType === 'combine' ? 'True' : 'False',
+      uuid: kmkfUtils.uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: retailPrice,
+      sellTotal: (retailPrice * 1).toFixed(2),
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref3) {
+  var list = _ref3.list,
+    type = _ref3.type,
+    canUpdateNumber = _ref3.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: kmkfUtils.uuid(),
@@ -20324,9 +21298,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref2) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
-  var list = _ref3.list,
-    canUpdateNumber = _ref3.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
+  var list = _ref4.list,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -20361,9 +21335,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref4) {
-  var list = _ref4.list,
-    source = _ref4.source;
+var processGyGoods$1 = function processGyGoods(_ref5) {
+  var list = _ref5.list,
+    source = _ref5.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -20390,8 +21364,8 @@ var processGyGoods$1 = function processGyGoods(_ref4) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref5) {
-  var list = _ref5.list;
+var processJstGoods$1 = function processJstGoods(_ref6) {
+  var list = _ref6.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -20409,9 +21383,9 @@ var processJstGoods$1 = function processJstGoods(_ref5) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref6) {
-  var list = _ref6.list,
-    type = _ref6.type;
+var processKmGoods$1 = function processKmGoods(_ref7) {
+  var list = _ref7.list,
+    type = _ref7.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -20441,9 +21415,9 @@ var processKmGoods$1 = function processKmGoods(_ref6) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref7) {
-  var list = _ref7.list,
-    canUpdateNumber = _ref7.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref8) {
+  var list = _ref8.list,
+    canUpdateNumber = _ref8.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -20486,6 +21460,8 @@ var GoodsModalMap = {
   JST_EXCHANGE_GOODS: JstGoodsModal,
   KM_GOODS: KmGoodsModal,
   KM_REISSUE_GOODS: KmGoodsModal,
+  JY_GOODS: JyGoodsModal$1,
+  JY_REISSUE_GOODS: JyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -20494,7 +21470,9 @@ var systemOrderNoMap = {
   WDT_GOODS: 'tradeNo',
   BS_E3_GOODS: 'orderSn',
   JST_GOODS: 'oId',
-  WLN_GOODS: 'tradeNo'
+  WLN_GOODS: 'tradeNo',
+  JY_GOODS: 'tradeNo',
+  JY_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -20552,6 +21530,12 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item[uniqueKey];
+    }));
+    console.log('selectedRowKeys', selectedRowKeys);
+    console.log('currentTradeOriginGoods', currentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -20626,6 +21610,9 @@ var getButtonText = function getButtonText() {
   if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
     return '选择聚水潭ERP商品';
   }
+  if (['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type)) {
+    return '选择巨益ERP商品';
+  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -20672,13 +21659,15 @@ var GoodItem$1 = function GoodItem(props) {
     tradeGoods = props.tradeGoods,
     form = props.form,
     systemOrders = props.systemOrders,
-    selectedSystemOrders = props.selectedSystemOrders;
+    selectedSystemOrders = props.selectedSystemOrders,
+    _props$templateDetail = props.templateDetail,
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
   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 isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS'].includes(type) || false;
+  var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -20765,6 +21754,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_RETURN_GOODS':
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
+        case 'JY_GOODS':
+        case 'JY_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -20994,7 +21985,9 @@ var GoodItem$1 = function GoodItem(props) {
     maxLength: maxLength,
     companyKey: companyKey,
     goodsSource: goodsSource,
-    useGoodsSourceFormat: useGoodsSourceFormat
+    useGoodsSourceFormat: useGoodsSourceFormat,
+    form: form,
+    templateDetail: templateDetail
   }));
 };
 
@@ -21862,7 +22855,7 @@ var bsUtils = {
 };
 
 var singletonMap$6 = new Map();
-var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
   if (!singletonMap$6.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
@@ -21870,6 +22863,50 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         singletonMap$6.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/jyOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data, _res$data$tradeOrderD;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
+            var _filterJyOrders, _res$data2;
+            res.data.trades = (_filterJyOrders = kmkfUtils.filterJyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJyOrders === void 0 ? void 0 : _filterJyOrders.map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeType: kmkfUtils.JY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: kmkfUtils.JY_ORDER_STATUS_MAP[item.tradeStatus]
+              });
+            });
+          }
+          resolve(res.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$6.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(res);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$6.set(orderNo, p);
+  }
+  return singletonMap$6.get(orderNo);
+};
+var jyUtils = {
+  getJyOrderListSingleton: getJyOrderListSingleton
+};
+
+var singletonMap$7 = new Map();
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$7.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$7.delete(orderNo);
+        reject(err);
+      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -21893,22 +22930,23 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$6.delete(orderNo);
+            singletonMap$7.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$6.set(orderNo, p);
+    singletonMap$7.set(orderNo, p);
   }
-  return singletonMap$6.get(orderNo);
+  return singletonMap$7.get(orderNo);
 };
 var kmUtils = {
   getOrderListSingleton: getOrderListSingleton$2
 };
 
-var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
+var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
+  _excluded2 = ["shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: kmkfUtils.BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
@@ -21916,7 +22954,8 @@ var columnsMap = {
   WDT_SYSTEM_ORDER: kmkfUtils.WDT_SYSTEM_ORDER_CONFIG.columns,
   BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
-  JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns
+  JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
+  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
@@ -21925,7 +22964,8 @@ var rowKeyMap = {
   WDT_SYSTEM_ORDER: 'billNo',
   BS_E3_SYSTEM_ORDER: 'orderSn',
   GY_SYSTEM_ORDER: 'billNo',
-  JST_SYSTEM_ORDER: 'oId'
+  JST_SYSTEM_ORDER: 'oId',
+  JY_SYSTEM_ORDER: 'tradeNo'
 };
 var index$2 = (function (props) {
   var value = props.value,
@@ -21953,6 +22993,8 @@ var index$2 = (function (props) {
         getGyOrderList(value.orderNo);
       } else if (type === 'JST_SYSTEM_ORDER') {
         getJstOrderList(value.orderNo);
+      } else if (type === 'JY_SYSTEM_ORDER') {
+        getJyOrderList(value.orderNo);
       }
     }
   }, [value, type]);
@@ -22188,6 +23230,37 @@ var index$2 = (function (props) {
       return _ref9.apply(this, arguments);
     };
   }();
+  var getJyOrderList = /*#__PURE__*/function () {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        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);
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
+                orders: trades,
+                showOrderInfo: trades.map(function (_ref12) {
+                  var shopCode = _ref12.shopCode,
+                    rest = _objectWithoutProperties(_ref12, _excluded2);
+                  return _objectSpread2(_objectSpread2({}, rest), {}, {
+                    shopCode: shopCode
+                  });
+                })
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8);
+    }));
+    return function getJyOrderList(_x8) {
+      return _ref11.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -22229,7 +23302,8 @@ var index$2 = (function (props) {
     size: "small",
     pagination: false,
     scroll: {
-      x: 'max-content'
+      x: 'max-content',
+      y: 500
     },
     locale: {
       emptyText: '暂无数据'
@@ -22611,16 +23685,16 @@ var orderSubFormConstants = {
 };
 
 var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
-var singletonMap$7 = new Map();
+var singletonMap$8 = new Map();
 var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
     shopId = parmas.shopId;
   var key = "".concat(orderNo, "-").concat(shopId);
-  if (!singletonMap$7.has(key)) {
+  if (!singletonMap$8.has(key)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$7.delete(key);
+        singletonMap$8.delete(key);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -22636,16 +23710,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$7.delete(key);
+            singletonMap$8.delete(key);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$7.set(key, p);
+    singletonMap$8.set(key, p);
   }
-  return singletonMap$7.get(key);
+  return singletonMap$8.get(key);
 };
 var renderEditItem = function renderEditItem(_ref) {
   var item = _ref.item,
@@ -23075,6 +24149,9 @@ var isErpType$1 = {
   },
   isWln: function isWln(type) {
     return ['WLN_GOODS'].includes(type);
+  },
+  isJy: function isJy(type) {
+    return ['JY_GOODS'].includes(type);
   }
 };
 var processAllOrders = function processAllOrders(_ref) {
@@ -23102,6 +24179,11 @@ var processAllOrders = function processAllOrders(_ref) {
     newList = processWlnOrders({
       data: data
     });
+  } else if (isErpType$1.isJy(type)) {
+    newList = processJyOrders({
+      data: data,
+      orderNo: orderNo
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -23133,12 +24215,20 @@ var processGyOrders = function processGyOrders(_ref4) {
   });
   return trades;
 };
-var processWlnOrders = function processWlnOrders(_ref5) {
-  var data = _ref5.data;
-  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+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);
+  });
+  return trades;
 };
-var processDefaultOrders = function processDefaultOrders(_ref6) {
+var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
+  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref7) {
+  var data = _ref7.data;
   return data || [];
 };
 
@@ -23332,6 +24422,32 @@ var componentMap$2 = {
       exchangeDeleteGood: 'kmExchangeDeleteGood'
     },
     getOrderList: kmUtils.getOrderListSingleton
+  },
+  JY_GOODS: {
+    type: 'jy',
+    key: 'jyGoods',
+    name: '巨益',
+    orderNo: 'tid',
+    goodDetailOrderNo: 'originalDealCode',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'jyType',
+      updateGoodsHandle: kmkfUtils.updateJyGoodsHandle,
+      selectListReturn: 'jySelectListReturn',
+      selectList: 'jySelectList',
+      reissueSelectList: 'jyReissueSelectList',
+      reissueSelectListReturn: 'jyReissueSelectListReturn',
+      reissueDeleteGood: 'jyReissueDeleteGood',
+      changeShopCode: 'jyChangeShopCode',
+      reissueType: 'jyReissueType',
+      returnType: 'jyReturnType',
+      returnSelectListReturn: 'jyReturnSelectListReturn',
+      returnSelectList: 'jyReturnSelectList',
+      deleteGood: 'jyDeleteGood',
+      returnDeleteGood: 'jyReturnDeleteGood',
+      exchangeDeleteGood: 'jyExchangeDeleteGood'
+    },
+    getOrderList: jyUtils.getJyOrderListSingleton
   }
 };
 var CommonGoods = function CommonGoods(props) {
@@ -24230,10 +25346,25 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'subOrders',
     uniqueKey: 'id'
+  },
+  JY_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'jyReissueGoods',
+    typeName: 'jyReissueType',
+    systemOrder: 'jySystemOrder',
+    systemOrderNo: 'jySystemOrderNo',
+    getOrderList: jyUtils.getJyOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateJyGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'tradeNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'subOrderDetails',
+    isShowSelectTradeGoods: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type33, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _value$typeMap$type$s7, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49;
+  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _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;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -24350,9 +25481,11 @@ var PublicReissue = function PublicReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type18, _typeMap$type19, _order$typeMap$type$g, _typeMap$type20, _typeMap$type21;
+    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22;
     var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo;
+      sysOrderNo = _ref4.sysOrderNo,
+      _ref4$isAllOrders = _ref4.isAllOrders,
+      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -24366,39 +25499,48 @@ var PublicReissue = function PublicReissue(props) {
         orderBackGoodsLevel: props.orderBackGoodsLevel,
         canEdit: true
       };
+    } else if (['JY_REISSUE_GOODS', 'JY_RETURN_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
-    var goodDetails = (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) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest)) : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle([order], orderRest) : [];
+    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];
+    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;
+    });
+    var goodDetails = hasGoodDetails ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest)) : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    var list = mode ? goodDetails.filter(function (goodItem) {
+    var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
     }) : goodDetails;
     return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type22;
+    var _typeMap$type23;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type23, _typeMap$type24, _value$typeMap$type$t2, _typeMap$type29, _value$typeMap$type$t3, _typeMap$type31;
+    var _typeMap$type24, _typeMap$type25, _value$typeMap$type$t2, _typeMap$type30, _value$typeMap$type$t3, _typeMap$type32;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderBillType) {
-      var _value$typeMap$type$s6, _typeMap$type25, _typeMap$type27, _typeMap$type28;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [];
+    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.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType) {
+      var _value$typeMap$type$s7, _typeMap$type26, _typeMap$type28, _typeMap$type29;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type26;
-        return oItem[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.oIdKey] === val;
+        var _typeMap$type27;
+        return oItem[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.oIdKey] === val;
       });
-      newValue[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type30;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[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)] = getGoodDetails({
+      newValue[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type31;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[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)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -24406,26 +25548,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$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type34, _typeMap$type35, _uniqBy, _typeMap$type36;
+    var _typeMap$type35, _typeMap$type36, _typeMap$type37, _uniqBy, _typeMap$type38;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".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)]) || [];
-    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)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      var _typeMap$type37;
-      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey]);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)]) || [];
+    newValue["".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)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type39;
+      return skuList.includes(item[(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']);
     });
     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$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.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$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key) || "".concat(Date.now())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -24441,12 +25584,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$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderNo)],
+    value: 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.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.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],
@@ -24468,11 +25611,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$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -24481,7 +25624,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$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrderBillType)],
+    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.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -24490,22 +25633,25 @@ var PublicReissue = function PublicReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.showErpGoodsBtn,
+    showChangeBtn: showChangeBtn || (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.isShowSelectTradeGoods),
+    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$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.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$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.key)],
+    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)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: false,
     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,
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -25533,7 +26679,7 @@ var styles$6 = {"systemNoDisabled":"index-module_systemNoDisabled__1s7aJ"};
 styleInject(css_248z$f);
 
 var _excluded$r = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
-  _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+  _excluded2$1 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$4 = {
   GY_REISSUE_GOODS: {
     key: 'gyReissueGoods',
@@ -25604,7 +26750,7 @@ var GyReissue = function GyReissue(props) {
                   deliveryState = _ref2.deliveryState,
                   vipCode = _ref2.vipCode,
                   shopCode = _ref2.shopCode,
-                  rest = _objectWithoutProperties(_ref2, _excluded2);
+                  rest = _objectWithoutProperties(_ref2, _excluded2$1);
                 return _objectSpread2(_objectSpread2({}, rest), {}, {
                   billNo: billNo,
                   billType: billType,
@@ -25844,7 +26990,7 @@ var GyReissue = function GyReissue(props) {
 };
 
 var _excluded$s = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
-  _excluded2$1 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+  _excluded2$2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$5 = {
   GY_RETURN_GOODS: {
     key: 'gyReturnGoods',
@@ -25946,7 +27092,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
                   deliveryState = _ref2.deliveryState,
                   vipCode = _ref2.vipCode,
                   shopCode = _ref2.shopCode,
-                  rest = _objectWithoutProperties(_ref2, _excluded2$1);
+                  rest = _objectWithoutProperties(_ref2, _excluded2$2);
                 return _objectSpread2(_objectSpread2({}, rest), {}, {
                   billNo: billNo,
                   billType: billType,
@@ -26844,8 +27990,9 @@ exports.erpFormValidator = erpFormValidator;
 exports.erpModalColumnsMap = index$1;
 exports.getGyColumns = getColumns$4;
 exports.getJstColumns = getColumns$5;
+exports.getJyColumns = getColumns$7;
 exports.getKmColumns = getColumns$6;
-exports.getSkxColumns = getColumns$7;
+exports.getSkxColumns = getColumns$8;
 exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;
 exports.orderSubFormConstants = orderSubFormConstants;