@kmkf-fe-packages/basic-components 2.0.79-beta.51 → 2.0.79-beta.53

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, MinusCircleFilled, 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, 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, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, 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, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, 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, isNull, 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, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, isEmpty, intersection } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -12883,13 +12883,139 @@ var kmColumns = [{
   width: 150
 }];
 
+var getYesOrNo$1 = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var jyColumns = [{
+  dataIndex: 'productName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'productCode',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'productId',
+  title: '商品ID',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'imageUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'productShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'productGroupName',
+  title: "\u5546\u54C1\u7EC4",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'skuName',
+  title: '规格名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'skuCode',
+  title: '规格编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'skuId',
+  title: '规格ID',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'barcode',
+  title: '规格条码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'skuImage',
+  title: '规格图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'color',
+  title: "\u989C\u8272",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'size',
+  title: "\u5C3A\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'markedPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sellingPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'gift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+  }
+}, {
+  dataIndex: 'combination',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
     jst: jstColumns,
     wdt: wdtColumns,
     bse3: bse3Columns,
-    km: kmColumns
+    km: kmColumns,
+    jy: jyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -15603,6 +15729,245 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
 };
 var GyGoodsModal$2 = /*#__PURE__*/forwardRef(GyGoodsModal$1);
 
+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: 'specName'
+}, {
+  label: '规格编码',
+  name: 'specCode'
+}, {
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}];
+var GoodList$5 = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = 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];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = 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.goodNo]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.goodNo;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.goodNo !== record.goodNo;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.goodNo;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.goodNo;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.goodNo !== othVal.goodNo;
+        });
+        setSelect(list);
+      }
+    },
+    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 options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.goodNo;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.goodNo !== record.goodNo;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'goodNo',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$4,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: "goodNo",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
+
+var JyGoodsModal = function JyGoodsModal(props, ref) {
+  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 = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var jyGoodsListRef = 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.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(JyGoodsList, {
+    ref: jyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
+
 var getColumns = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -16533,7 +16898,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$1 = function getYesOrNo(val) {
+var getYesOrNo$2 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -16671,7 +17036,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       },
       width: 100
     }]
@@ -16683,7 +17048,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 (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -16793,7 +17158,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -16812,7 +17177,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -16932,7 +17297,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -17056,7 +17421,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -17835,7 +18200,537 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
+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;
+};
+var getYesOrNo$4 = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
 var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodsCode',
+      title: "\u8D27\u54C1\u7F16\u53F7",
+      width: 200
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150
+    }, {
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 200
+    }, {
+      dataIndex: 'specCode',
+      title: "\u89C4\u683C\u7F16\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      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: '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: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      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: 150
+    }, {
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      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({
+              qty: num,
+              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : 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({
+              price: num,
+              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.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.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'bfit');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
+    }, {
+      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, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'gift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
+    }, {
+      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 })),
+  };
+};
+
+var getColumns$8 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -17948,7 +18843,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({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -17977,8 +18872,12 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$7({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$7({
+    default: getColumns$8({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -18145,6 +19044,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 = function processGoods(_ref) {
@@ -18384,6 +19286,7 @@ var GoodsModalMap = {
   JST_EXCHANGE_GOODS: JstGoodsModal,
   KM_GOODS: KmGoodsModal,
   KM_REISSUE_GOODS: KmGoodsModal,
+  JY_GOODS: JyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -18392,7 +19295,8 @@ var systemOrderNoMap = {
   WDT_GOODS: 'tradeNo',
   BS_E3_GOODS: 'orderSn',
   JST_GOODS: 'oId',
-  WLN_GOODS: 'tradeNo'
+  WLN_GOODS: 'tradeNo',
+  JY_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -18520,6 +19424,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) {
@@ -18572,7 +19479,7 @@ var GoodItem$1 = function GoodItem(props) {
   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'].includes(type) || false;
+  var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -18659,6 +19566,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_RETURN_GOODS':
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
+        case 'JY_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -19754,7 +20662,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) {
@@ -19762,6 +20670,44 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         singletonMap$6.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/oms/jyOrderDetail', {
+        method: 'post',
+        data: {
+          tid: 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);
+          }
+          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: {
@@ -19785,22 +20731,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: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -19808,7 +20755,8 @@ var columnsMap = {
   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
+  JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
+  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
@@ -19817,7 +20765,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$3 = (function (props) {
   var value = props.value,
@@ -19845,6 +20794,8 @@ var index$3 = (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]);
@@ -20080,6 +21031,37 @@ var index$3 = (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 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,
@@ -20141,6 +21123,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) {
@@ -20398,6 +21383,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: 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) {
@@ -22599,7 +23610,7 @@ var styles$5 = {"systemNoDisabled":"index-module_systemNoDisabled__1s7aJ"};
 styleInject(css_248z$e);
 
 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',
@@ -22670,7 +23681,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,
@@ -22910,7 +23921,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',
@@ -23012,7 +24023,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,
@@ -23450,4 +24461,4 @@ var KmVideo = function KmVideo(_ref) {
   }))));
 };
 
-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, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$6 as getKmColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };
+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, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };