@kmkf-fe-packages/basic-components 2.2.13-beta.5 → 2.2.13-beta.50

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -9559,7 +9559,7 @@ var renderMap = {
     return /*#__PURE__*/React.createElement(FileRender, {
       id: "fileRender",
       fileList: value,
-      canDownload: !['ks', 'fxg'].includes(platform || '')
+      canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform || '')
     });
   },
   CHECKBOX: function CHECKBOX(value) {
@@ -9662,7 +9662,7 @@ var EditFileRender = function EditFileRender(_ref7) {
   })), /*#__PURE__*/React.createElement(FileRender, {
     id: "fileEdit",
     fileList: val,
-    canDownload: !['ks', 'fxg'].includes(platform)
+    canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform)
   }));
 };
 var EditRenderMap = {
@@ -13830,7 +13830,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) {
@@ -14650,21 +14650,21 @@ var wdtColumns = [{
   title: '市场价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
   dataIndex: 'retailPrice',
   title: '零售价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
   dataIndex: 'memberPrice',
   title: '会员价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }];
 
@@ -14890,17 +14890,17 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   return val ? '是' : '否';
 };
 var jyColumns = [{
-  dataIndex: 'productName',
+  dataIndex: 'goodName',
   title: '商品名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'productCode',
+  dataIndex: 'goodNo',
   title: '商品编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'productId',
+  dataIndex: 'goodId',
   title: '商品ID',
   width: 150,
   ellipsis: true
@@ -14909,22 +14909,22 @@ var jyColumns = [{
   title: '商品图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
+    return picUrl ? /*#__PURE__*/React.createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'productShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 150
 }, {
-  dataIndex: 'productGroupName',
+  dataIndex: 'categoryName',
   title: "\u5546\u54C1\u7EC4",
   ellipsis: true,
   width: 150
@@ -14934,56 +14934,56 @@ var jyColumns = [{
   width: 200,
   ellipsis: true
 }, {
-  dataIndex: 'skuName',
+  dataIndex: 'specName',
   title: '规格名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'skuCode',
+  dataIndex: 'specNo',
   title: '规格编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: '规格ID',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'specBarcode',
   title: '规格条码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuImage',
+  dataIndex: 'specImgUrl',
   title: '规格图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
+    return picUrl ? /*#__PURE__*/React.createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'color',
+  dataIndex: 'colorName',
   title: "\u989C\u8272",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'size',
+  dataIndex: 'sizeName',
   title: "\u5C3A\u7801",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'markedPrice',
+  dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'sellingPrice',
+  dataIndex: 'retailPrice',
   title: "\u96F6\u552E\u4EF7",
   ellipsis: true,
   width: 100
@@ -14993,7 +14993,7 @@ var jyColumns = [{
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'gift',
+  dataIndex: 'isGift',
   title: "\u662F\u5426\u8D60\u54C1",
   ellipsis: true,
   width: 150,
@@ -15001,12 +15001,12 @@ var jyColumns = [{
     return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
   }
 }, {
-  dataIndex: 'combination',
+  dataIndex: 'skuType',
   title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
   width: 150,
   render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val === 'combine'));
   }
 }];
 
@@ -17293,11 +17293,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.createElement("div", {
-    className: 'search-header-wrap'
+    className: "search-header-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(status ? 'is-open' : 'not-open')
   }, /*#__PURE__*/React.createElement("div", {
@@ -17454,6 +17455,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));
       }
     };
   });
@@ -17732,21 +17736,112 @@ var WorkorderList = function WorkorderList(props, ref) {
 };
 var WorkorderList$1 = /*#__PURE__*/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 = 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: '2h8KRbxMjD_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 = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     seletedGooods = _useState2[0],
     setSeletedGooods = _useState2[1];
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var goodsListRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode, options) {
@@ -17755,19 +17850,28 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
       }
     };
   });
-  var onSubmit = props.onSubmit,
-    width = props.width;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
-  var goodsListRef = useRef(null);
+  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();
   };
@@ -17782,7 +17886,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.createElement(WorkorderList$1, {
+  }, ((_props$goodsSource2 = props.goodsSource) === null || _props$goodsSource2 === void 0 ? void 0 : _props$goodsSource2.source) === 'workOrder' ? /*#__PURE__*/React.createElement(WorkorderList$1, {
     erp: "gy",
     goodsSource: props.goodsSource,
     seletedGooods: seletedGooods,
@@ -17821,10 +17925,12 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'specName'
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
   label: '规格编码',
-  name: 'specCode'
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -17870,29 +17976,29 @@ var GoodList$5 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.goodNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.goodNo !== record.goodNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         })));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.goodNo !== othVal.goodNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -17900,9 +18006,9 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.goodNo || row.skuId;
-        }).includes(record.goodNo || record.skuId),
-        name: record.goodNo
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
       };
       return options;
     }
@@ -17910,10 +18016,10 @@ var GoodList$5 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.goodNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.goodNo !== record.goodNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -17937,7 +18043,7 @@ var GoodList$5 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'goodNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -17966,7 +18072,7 @@ var GoodList$5 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodNo",
+    rowKey: "id",
     columns: columns,
     scroll: {
       x: '100%',
@@ -18481,7 +18587,7 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120,
+      width: 250,
       align: 'center',
       ellipsis: true
     }, {
@@ -18569,7 +18675,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -18628,6 +18734,11 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center'
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 180,
+      align: 'center'
     }, {
       dataIndex: 'orderPrice',
       title: "\u6210\u4EA4\u603B\u91D1\u989D",
@@ -18676,7 +18787,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -18821,7 +18932,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -20270,10 +20381,15 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
+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,
@@ -20282,52 +20398,234 @@ var getColumns$7 = function getColumns(_ref) {
   return {
     //巨益商品信息
     JY_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
     }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
+      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\u54C1ID",
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
     }, {
       dataIndex: 'code',
       title: "\u6761\u7801",
       width: 150
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
+    },
+    // {
+    //   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: 200
+      width: 250
     }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 150
+      width: 250
     }, {
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      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,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
       width: 150
     }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      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.createElement(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.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.createElement(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.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
@@ -20355,6 +20653,20 @@ var getColumns$7 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150
     }, {
       dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
@@ -20386,9 +20698,22 @@ var getColumns$7 = function getColumns(_ref) {
       ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'sellcount',
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
+      validator: function validator(_rule, value) {
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$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.createElement(InputNumber, {
           style: {
@@ -20399,9 +20724,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20420,8 +20744,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20434,32 +20758,30 @@ var getColumns$7 = function getColumns(_ref) {
       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.createElement(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'bfit');
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20475,323 +20797,31 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'gift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
       }
-    }, {
-      dataIndex: 'skuNote',
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
         ellipsis: true
       });
     })
-    //巨益补发商品信息
-    // JY_REISSUE_GOODS: [
-    //   {
-    //     dataIndex: 'goodName',
-    //     title: `商品名称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodShortName',
-    //     title: `商品简称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodNo',
-    //     title: `商品编码`,
-    //     width: 200,
-    //   },
-    //   {
-    //     dataIndex: 'specName',
-    //     title: `SKU名称`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 250,
-    //   },
-    //   {
-    //     dataIndex: 'specNo',
-    //     title: `SKU编码`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'qty',
-    //     title: `数量`,
-    //     width: 100,
-    //     validator: (_rule: any, value: any) => {
-    //       let goodsName = '';
-    //       if (
-    //         (value?.gyReissueGoods || []).some((goods: any) => {
-    //           const qty = toNum(goods?.qty);
-    //           const res = typeof qty === 'number' ? qty < 1 : true;
-    //           if (res) {
-    //             goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
-    //           }
-    //           return res;
-    //         })
-    //       ) {
-    //         return Promise.reject(`${goodsName}数量必须大于0`);
-    //       }
-    //     },
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 70 }}
-    //           value={val}
-    //           min={1}
-    //           precision={0}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 qty: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.price)
-    //                     ? num * record.price
-    //                     : null,
-    //                 originAmount:
-    //                   num && isNumberOrNumberString(record.originPrice)
-    //                     ? num * record.originPrice
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'price',
-    //     title: `实际单价`,
-    //     width: 150,
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 130 }}
-    //           value={val}
-    //           min={0}
-    //           precision={2}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 price: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.qty)
-    //                     ? num * record.qty
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'amount',
-    //     title: `实际金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originPrice',
-    //     title: `标准单价`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originAmount',
-    //     title: `标准金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'isGift',
-    //     title: `是否赠品`,
-    //     width: 150,
-    //     render: (val: number, record: any, index: number) =>
-    //       record.canEdit && !disabled ? (
-    //         <Select
-    //           value={val}
-    //           onChange={(value) => {
-    //             updateHandle(value, index, 'isGift');
-    //           }}
-    //           options={[
-    //             { label: '是', value: 1 },
-    //             { label: '否', value: 0 },
-    //           ]}
-    //         />
-    //       ) : (
-    //         <span>{getYesOrNo(val)}</span>
-    //       ),
-    //   },
-    // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
-    // //巨益退货商品信息
-    // JY_RETURN_GOODS: [
-    //   {
-    //     dataIndex: 'goodName',
-    //     title: `商品名称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodShortName',
-    //     title: `商品简称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodNo',
-    //     title: `商品编码`,
-    //     width: 200,
-    //   },
-    //   {
-    //     dataIndex: 'specName',
-    //     title: `SKU名称`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 250,
-    //   },
-    //   {
-    //     dataIndex: 'specNo',
-    //     title: `SKU编码`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'qty',
-    //     title: `数量`,
-    //     width: 100,
-    //     validator: (_rule: any, value: any) => {
-    //       let goodsName = '';
-    //       if (
-    //         (value?.gyReturnGoods || []).some((goods: any) => {
-    //           const qty = toNum(goods?.qty);
-    //           const res = typeof qty === 'number' ? qty < 1 : true;
-    //           if (res) {
-    //             goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
-    //           }
-    //           return res;
-    //         })
-    //       ) {
-    //         return Promise.reject(`${goodsName}数量必须大于0`);
-    //       }
-    //     },
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 70 }}
-    //           value={val}
-    //           min={1}
-    //           precision={0}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 qty: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.price)
-    //                     ? num * record.price
-    //                     : null,
-    //                 originAmount:
-    //                   num && isNumberOrNumberString(record.originPrice)
-    //                     ? num * record.originPrice
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'price',
-    //     title: `实际单价`,
-    //     width: 150,
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 130 }}
-    //           value={val}
-    //           min={0}
-    //           precision={2}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 price: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.qty)
-    //                     ? num * record.qty
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'amount',
-    //     title: `实际金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originPrice',
-    //     title: `标准单价`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originAmount',
-    //     title: `标准金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'discountFee',
-    //     title: `让利金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'amountAfter',
-    //     title: `让利后金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'isGift',
-    //     title: `是否赠品`,
-    //     width: 150,
-    //     render: (val: number, record: any, index: number) =>
-    //       record.canEdit && !disabled ? (
-    //         <Select
-    //           value={val}
-    //           onChange={(value) => {
-    //             updateHandle(value, index, 'isGift');
-    //           }}
-    //           options={[
-    //             { label: '是', value: 1 },
-    //             { label: '否', value: 0 },
-    //           ]}
-    //         />
-    //       ) : (
-    //         <span>{getYesOrNo(val)}</span>
-    //       ),
-    //   },
-    // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
   };
 };
 
@@ -20982,7 +21012,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   })), getColumns$7({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), getColumns$8({
     text: text,
     disabled: disabled,
@@ -21180,6 +21211,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,
@@ -21190,11 +21228,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: 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: uuid(),
@@ -21212,9 +21288,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,
@@ -21249,9 +21325,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,
@@ -21278,8 +21354,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,
@@ -21297,9 +21373,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
@@ -21329,9 +21405,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,
@@ -21375,6 +21451,7 @@ var GoodsModalMap = {
   KM_GOODS: KmGoodsModal,
   KM_REISSUE_GOODS: KmGoodsModal,
   JY_GOODS: JyGoodsModal$1,
+  JY_REISSUE_GOODS: JyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -21384,7 +21461,8 @@ var systemOrderNoMap = {
   BS_E3_GOODS: 'orderSn',
   JST_GOODS: 'oId',
   WLN_GOODS: 'tradeNo',
-  JY_GOODS: 'tradeNo'
+  JY_GOODS: 'tradeNo',
+  JY_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -21442,6 +21520,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 = {
@@ -21565,13 +21649,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 = Form === null || Form === void 0 ? void 0 : 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', 'JY_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 = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -21659,6 +21745,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
+        case 'JY_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -21705,8 +21792,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21726,6 +21814,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21762,8 +21858,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21775,7 +21879,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,
@@ -21888,7 +21992,9 @@ var GoodItem$1 = function GoodItem(props) {
     maxLength: maxLength,
     companyKey: companyKey,
     goodsSource: goodsSource,
-    useGoodsSourceFormat: useGoodsSourceFormat
+    useGoodsSourceFormat: useGoodsSourceFormat,
+    form: form,
+    templateDetail: templateDetail
   }));
 };
 
@@ -22523,7 +22629,7 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName,
+                billTag: item.tagName || item.tags,
                 tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
               });
             });
@@ -22764,16 +22870,22 @@ var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
         singletonMap$6.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/oms/jyOrderDetail', {
+      extendRequest('/qy/gdfw/order/jyOrderDetail', {
         method: 'post',
         data: {
-          tid: orderNo
+          billNo: orderNo
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
-            res.data.trades = filterJyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo);
+          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 = 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: JY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: JY_ORDER_STATUS_MAP[item.tradeStatus]
+              });
+            });
           }
           resolve(res.data);
           // 延迟10秒清除,保证订单的时效性
@@ -22866,7 +22978,9 @@ var index$2 = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
     disabled = props.disabled,
-    type = props.type;
+    type = props.type,
+    _props$showHeader = props.showHeader,
+    showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
   var onceRef = useRef(false);
   var valueRef = useRef(null);
   useEffect(function () {
@@ -22894,8 +23008,12 @@ var index$2 = (function (props) {
     }
   }, [value, type]);
   var columns = useMemo(function () {
-    return columnsMap[type] || [];
-  }, [type]);
+    var baseInfoColumns = getSystemShowHead({
+      columns: columnsMap[type] || [],
+      showHeader: showHeader
+    });
+    return baseInfoColumns || [];
+  }, [type, showHeader]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -23197,7 +23315,8 @@ var index$2 = (function (props) {
     size: "small",
     pagination: false,
     scroll: {
-      x: 'max-content'
+      x: '100%',
+      y: 500
     },
     locale: {
       emptyText: '暂无数据'
@@ -24073,6 +24192,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
@@ -24104,12 +24228,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 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 || [];
 };
 
@@ -25227,10 +25359,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: 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,
@@ -25347,9 +25494,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) {
@@ -25363,39 +25512,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
       });
@@ -25403,26 +25561,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 = 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 = 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 = 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.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(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.createElement(Col, {
     className: "gutter-row",
     xs: {
@@ -25438,12 +25597,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.createElement(Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -25465,11 +25624,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.createElement(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.createElement(Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -25478,7 +25637,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React.createElement(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.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -25487,22 +25646,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
     }
   })));
@@ -27763,4 +27925,15 @@ var SkxGoods = function SkxGoods(props) {
   }));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap };
+var SYSTEM_ORDER_COLUMNS_MAP = {
+  BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
+  KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
+  WLN_SYSTEM_ORDER: WLN_SYSTEM_ORDER_CONFIG.columns,
+  WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
+  BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
+  GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
+  JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
+  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
+};
+
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap };