@kmkf-fe-packages/basic-components 2.0.16 → 2.0.17

package/dist/index.js

@@ -11020,7 +11020,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11037,7 +11037,8 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   React.useEffect(function () {
     //没有值塞个默认值
@@ -11049,7 +11050,7 @@ var jstGoods = function jstGoods(props) {
     if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
       setChangeIndex(0);
     }
-  }, value);
+  }, [value]);
   var content = function content(item, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -11077,7 +11078,14 @@ var jstGoods = function jstGoods(props) {
       changeOrderInfo['sendId'] = option.value;
     }
     if (isSelectName && type === 'sendName') {
-      changeOrderInfo['sendSnapshotName'] = option.label;
+      if (isSendGoodSavedId) {
+        // 如果发货仓名称存的是id，将名称存入快照
+        changeOrderInfo['sendSnapshotName'] = option.label;
+      } else {
+        // 如果发货仓名称存的是name，将id存入快照，同时把id替换成名称
+        changeOrderInfo['sendSnapshotId'] = option.value;
+        changeOrderInfo['sendName'] = option.label;
+      }
     }
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
@@ -11177,7 +11185,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendName) || null,
+    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11187,14 +11195,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
+    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
   })) : null) : null);
 };
 
@@ -12166,19 +12174,13 @@ var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
 var getTableData$1 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
+      platform: 'JST_ERP'
+    }, formData)
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -12186,9 +12188,7 @@ var getTableData$1 = function getTableData(_ref, formData) {
       _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(_objectSpread2({}, item), {}, {
-        index: index + 1
-      });
+      return _objectSpread2({}, item);
     });
     return {
       total: total,
@@ -12207,90 +12207,86 @@ var columns$2 = [{
     }, index + 1);
   },
   width: 80
-}, {
-  dataIndex: 'specNo',
-  title: "SKU",
-  ellipsis: true,
-  width: 200
-}, {
-  dataIndex: 'specId',
-  title: "SKU ID",
-  ellipsis: true,
-  width: 80
 }, {
   dataIndex: 'goodName',
-  title: "\u5546\u54C1\u540D\u79F0",
-  ellipsis: true,
-  width: 250
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
 }, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-},
-// {
-//   dataIndex: 'goodPicUrl',
-//   title: `商品图片`,
-//   ellipsis: true,
-//   width: 100,
-//   render: (picUrl: string) => {
-//     return (
-//       <img
-//         style={{
-//           width: '40px',
-//           height: '40px',
-//           objectFit: 'contain',
-//         }}
-//         src={picUrl}
-//       ></img>
-//     );
-//   },
-// },
-{
   dataIndex: 'goodNo',
-  title: "\u8D27\u53F7",
-  ellipsis: true,
-  width: 150
-}, {
-  dataIndex: 'goodId',
-  title: "\u8D27\u53F7ID",
-  ellipsis: true,
-  width: 100
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'colorName',
-  title: "\u989C\u8272\u540D\u79F0",
-  ellipsis: true,
-  width: 100
+  dataIndex: 'styleCode',
+  title: '款式编码',
+  width: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'colorCode',
-  title: "\u989C\u8272\u4EE3\u7801",
-  ellipsis: true,
-  width: 100
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'sizeName',
-  title: "\u5C3A\u7801\u540D\u79F0",
-  ellipsis: true,
-  width: 100
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
 }, {
-  dataIndex: 'sizeCode',
-  title: "\u5C3A\u7801\u4EE3\u7801",
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 100
+  width: 250
 }, {
   dataIndex: 'brandName',
-  title: "\u54C1\u724C\u540D\u79F0",
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u9500\u552E\u4EF7\u683C",
   ellipsis: true,
-  width: 100
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
 }, {
   dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
-  width: 100
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u552E\u4EF7",
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
   ellipsis: true,
-  width: 100
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'skuType',
+  title: "\u5546\u54C1\u7C7B\u578B",
+  ellipsis: true,
+  width: 100,
+  render: function render() {
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
+    return {
+      'combine': '组合装商品',
+      'normal': '普通商品'
+    }[type] || type;
+  }
 }];
 var GoodList$1 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -12324,17 +12320,6 @@ var GoodList$1 = function GoodList(props, ref) {
     layout: "inline",
     form: form
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u8D27\u53F7",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "goodName",
     style: {
       marginBottom: '12px'
@@ -12346,23 +12331,23 @@ var GoodList$1 = function GoodList(props, ref) {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuCode",
+    name: "goodNo",
     style: {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU",
+    placeholder: "\u5546\u54C1\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuId",
+    name: "styleCode",
     style: {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU ID",
+    placeholder: "\u6B3E\u5F0F\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
@@ -12385,41 +12370,50 @@ var GoodList$1 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== record.goodNo;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return t.goodNo !== record.goodNo;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
+          return t.goodNo;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
+          return t.goodNo;
         })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          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.specNo;
+        return t !== record.goodNo;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return t.goodNo !== record.goodNo;
       }));
     };
     var showColumns = [{
@@ -12443,7 +12437,7 @@ var GoodList$1 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: 'goodNo',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -12463,7 +12457,7 @@ var GoodList$1 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: "goodNo",
     columns: columns$2,
     scroll: {
       x: '100%',
@@ -12480,13 +12474,15 @@ var GoodList$1 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
 };
-var BsE3GoodList = /*#__PURE__*/React.forwardRef(GoodList$1);
+var GyGoodsList = /*#__PURE__*/React.forwardRef(GoodList$1);
 
-var GoodsModal$4 = function GoodsModal(props, ref) {
+var GyGoodsModal = function GyGoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         setVisible(true);
+        setSelectedRows(options.value || []);
       }
     };
   });
@@ -12496,13 +12492,17 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var bsE3GoodListRef = React.useRef(null);
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var gyGoodsListRef = React.useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _bsE3GoodListRef$curr;
-    var selectedList = ((_bsE3GoodListRef$curr = bsE3GoodListRef.current) === null || _bsE3GoodListRef$curr === void 0 ? void 0 : _bsE3GoodListRef$curr.getSelectGoodList()) || [];
+    var _gyGoodsListRef$curre;
+    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -12517,28 +12517,28 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(BsE3GoodList, {
-    ref: bsE3GoodListRef
+  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList, {
+    ref: gyGoodsListRef,
+    selectedRows: selectedRows
   })));
 };
-var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
+var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
 
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
+    goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
+    skuCode: formData.skuCode || null,
+    skuId: formData.skuId || null
   };
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
+      platform: 'BS_E3_ERP'
     }, data)
   }).then(function (res) {
     var _res$data = res.data,
@@ -12547,7 +12547,9 @@ var getTableData$2 = function getTableData(_ref, formData) {
       _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 _objectSpread2(_objectSpread2({}, item), {}, {
+        index: index + 1
+      });
     });
     return {
       total: total,
@@ -12566,58 +12568,88 @@ var columns$3 = [{
     }, index + 1);
   },
   width: 80
-}, {
-  dataIndex: 'specName',
-  title: 'SKU名称',
-  width: 250,
-  ellipsis: true
 }, {
   dataIndex: 'specNo',
-  title: 'SKU编码',
-  width: 200,
-  ellipsis: true
+  title: "SKU",
+  ellipsis: true,
+  width: 200
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 80
 }, {
   dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
+  title: "\u5546\u54C1\u540D\u79F0",
+  ellipsis: true,
+  width: 250
 }, {
   dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 250
-}, {
+},
+// {
+//   dataIndex: 'goodPicUrl',
+//   title: `商品图片`,
+//   ellipsis: true,
+//   width: 100,
+//   render: (picUrl: string) => {
+//     return (
+//       <img
+//         style={{
+//           width: '40px',
+//           height: '40px',
+//           objectFit: 'contain',
+//         }}
+//         src={picUrl}
+//       ></img>
+//     );
+//   },
+// },
+{
   dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
+  title: "\u8D27\u53F7",
+  ellipsis: true,
+  width: 150
 }, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
+  dataIndex: 'goodId',
+  title: "\u8D27\u53F7ID",
+  ellipsis: true,
+  width: 100
 }, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
+  dataIndex: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
+  ellipsis: true,
+  width: 100
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u6807\u51C6\u552E\u4EF7",
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'costPrice',
-  title: "\u6210\u672C\u4EF7",
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u552E\u4EF7",
   ellipsis: true,
   width: 100
 }];
@@ -12653,23 +12685,23 @@ var GoodList$2 = function GoodList(props, ref) {
     layout: "inline",
     form: form
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodShortName",
+    name: "goodNo",
     style: {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
+    placeholder: "\u5546\u54C1\u8D27\u53F7",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuName",
+    name: "goodName",
     style: {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
+    placeholder: "\u5546\u54C1\u540D\u79F0",
     allowClear: true,
     style: {
       width: 150
@@ -12680,29 +12712,18 @@ var GoodList$2 = function GoodList(props, ref) {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
+    placeholder: "SKU",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
+    name: "skuId",
     style: {
       marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
+    placeholder: "SKU ID",
     allowClear: true,
     style: {
       width: 150
@@ -12820,9 +12841,9 @@ var GoodList$2 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
 };
-var GyGoodsList = /*#__PURE__*/React.forwardRef(GoodList$2);
+var BsE3GoodList = /*#__PURE__*/React.forwardRef(GoodList$2);
 
-var GyGoodsModal = function GyGoodsModal(props, ref) {
+var GoodsModal$4 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       open: function open() {
@@ -12836,13 +12857,13 @@ var GyGoodsModal = function GyGoodsModal(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var gyGoodsListRef = React.useRef(null);
+  var bsE3GoodListRef = React.useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _gyGoodsListRef$curre;
-    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
+    var _bsE3GoodListRef$curr;
+    var selectedList = ((_bsE3GoodListRef$curr = bsE3GoodListRef.current) === null || _bsE3GoodListRef$curr === void 0 ? void 0 : _bsE3GoodListRef$curr.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -12857,35 +12878,375 @@ var GyGoodsModal = function GyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList, {
-    ref: gyGoodsListRef
+  }, /*#__PURE__*/React__default['default'].createElement(BsE3GoodList, {
+    ref: bsE3GoodListRef
   })));
 };
-var GyGoodsModal$1 = /*#__PURE__*/React.forwardRef(GyGoodsModal);
+var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
 
-var getColumns = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //百胜E3补发商品
-    BS_E3_REISSUE_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
+var getTableData$3 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    goodShortName: formData.goodShortName || null,
+    skuName: formData.skuName || null,
+    skuCode: formData.skuCode || null,
+    goodName: formData.goodName || null,
+    goodNo: formData.goodNo || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'GY_ERP'
+    }, data)
+  }).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 columns$4 = [{
+  dataIndex: 'index',
+  title: 'NO',
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: 25
+      }
+    }, index + 1);
+  },
+  width: 80
+}, {
+  dataIndex: 'specName',
+  title: 'SKU名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: 'SKU编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u6807\u51C6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 100
+}];
+var GoodList$3 = function GoodList(props, ref) {
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  React.useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = antd.Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = ahooks.useAntdTable(getTableData$3, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
+    layout: "inline",
+    form: form
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "goodShortName",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1\u7B80\u79F0",
+    allowClear: true,
+    style: {
       width: 150
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "skuName",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1sku\u540D\u79F0",
+    allowClear: true,
+    style: {
       width: 150
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "skuCode",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1sku\u7F16\u7801",
+    allowClear: true,
+    style: {
       width: 150
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "goodName",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1\u540D\u79F0",
+    allowClear: true,
+    style: {
       width: 150
-    }, {
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "goodNo",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1\u7F16\u7801",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    type: "primary",
+    style: {
+      marginRight: '8px'
+    },
+    onClick: submit
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    onClick: reset
+  }, "\u91CD\u7F6E")));
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.specNo;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.specNo !== record.specNo;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.specNo;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.specNo;
+        })));
+        var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.specNo !== othVal.specNo;
+        });
+        setSelect(list);
+      }
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.specNo;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.specNo !== record.specNo;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(lodash.takeRight(columns$4, columns$4.length - 1));
+    return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+      columns: showColumns,
+      rowKey: 'specNo',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, advanceSearchForm, /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: "specNo",
+    columns: columns$4,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, tableProps))), /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
+};
+var GyGoodsList$1 = /*#__PURE__*/React.forwardRef(GoodList$3);
+
+var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
+  React.useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var gyGoodsListRef = React.useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _gyGoodsListRef$curre;
+    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList$1, {
+    ref: gyGoodsListRef
+  })));
+};
+var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
+
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //百胜E3补发商品
+    BS_E3_REISSUE_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      width: 150
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
       dataIndex: 'picPath',
       title: "\u5546\u54C1\u56FE\u7247",
       width: 150,
@@ -13874,148 +14235,622 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u8BA9\u5229\u540E\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'cancel',
-      title: "\u662F\u5426\u53D6\u6D88",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+      dataIndex: 'cancel',
+      title: "\u662F\u5426\u53D6\u6D88",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+      }
+    }, {
+      dataIndex: 'skuNote',
+      title: "\u5546\u54C1\u5907\u6CE8",
+      width: 150
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    //管易补发商品信息
+    GY_REISSUE_GOODS: [{
+      dataIndex: 'goodName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodNo',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200
+    }, {
+      dataIndex: 'specName',
+      title: "SKU\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'specNo',
+      title: "SKU\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'qty',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5B9E\u9645\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'amount',
+      title: "\u5B9E\u9645\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'originPrice',
+      title: "\u6807\u51C6\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'originAmount',
+      title: "\u6807\u51C6\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var fillAttrs = function fillAttrs(item) {
+  if (!item.width) item.width = 150;
+  if (typeof item.ellipsis !== 'boolean') item.ellipsis = true;
+  if (!item.align) item.align = 'center';
+  return item;
+};
+var getColumns$5 = function getColumns() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    JST_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      ellipsis: true,
+      align: 'center',
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(val, record, index) {
+        return (record.qty || 0) * (+record.salePrice || 0);
+      }
+    }, {
+      dataIndex: 'batchId',
+      title: '批次号',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240,
+      ellipsis: true,
+      align: 'center'
+    }],
+    JST_REISSUE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      width: 150,
+      ellipsis: true,
+      align: 'center'
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      ellipsis: true,
+      align: 'center',
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }],
+    JST_RETURN_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称'
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码'
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码'
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值'
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return (record.qty || 0) * (+record.salePrice || 0);
       }
+    }, {
+      dataIndex: 'batchId',
+      title: '批次号'
     }, {
       dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
+      title: '是否赠品',
+      width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: true
           }, {
             label: '否',
-            value: 0
+            value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
     }, {
-      dataIndex: 'skuNote',
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    //管易补发商品信息
-    GY_REISSUE_GOODS: [{
-      dataIndex: 'goodName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
     }, {
-      dataIndex: 'goodNo',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240
+    }].map(fillAttrs),
+    JST_EXCHANGE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称'
     }, {
-      dataIndex: 'specName',
-      title: "SKU\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250
+      dataIndex: 'skuId',
+      title: '商品编码'
     }, {
-      dataIndex: 'specNo',
-      title: "SKU\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150
+      dataIndex: 'iId',
+      title: '款式编码'
     }, {
-      dataIndex: 'qty',
-      title: "\u6570\u91CF",
+      dataIndex: 'pic',
+      title: '商品图片',
       width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值'
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150,
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
-            width: 130
+            width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'amount',
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'originPrice',
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'originAmount',
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return (record.qty || 0) * (+record.salePrice || 0);
+      }
     }, {
       dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
+      title: '是否赠品',
+      width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: true
           }, {
             label: '否',
-            value: 0
+            value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }].map(fillAttrs)
   };
 };
 
-var getColumns$5 = function getColumns(_ref) {
+var getColumns$6 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -14128,7 +14963,7 @@ var getColumnsMap = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -14149,8 +14984,12 @@ var getColumnsMap = function getColumnsMap(args) {
     disabled: disabled,
     updateHandle: updateHandle,
     updateDataHandle: updateDataHandle
+  })), getColumns$5({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$5({
+    default: getColumns$6({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -14254,27 +15093,50 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
-var MAIN_FIELD = 'uuid';
+var GoodsModalMap = {
+  WDT_REISSUE_GOODS: WdtGoodsModal,
+  WDT_GOODS: WdtGoodsModal,
+  WDT_EXCHANGE_GOODS: WdtGoodsModal,
+  BS_E3_REISSUE_GOODS: BsE3GoodsModal,
+  BS_E3_GOODS: BsE3GoodsModal,
+  BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
+  GY_GOODS: GyGoodsModal$2,
+  GY_REISSUE_GOODS: GyGoodsModal$2,
+  JST_GOODS: JstGoodsModal,
+  JST_REISSUE_GOODS: JstGoodsModal,
+  JST_RETURN_GOODS: JstGoodsModal,
+  JST_EXCHANGE_GOODS: JstGoodsModal,
+  OTHER_GOODS: GoodsModal$2
+};
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
+    getDataSourceAsync = _ref.getDataSourceAsync,
     selectedRowKeys = _ref.selectedRowKeys,
-    onChangeSelectedKeys = _ref.onChangeSelectedKeys;
+    onChangeSelectedKeys = _ref.onChangeSelectedKeys,
+    _ref$uniqueKey = _ref.uniqueKey,
+    uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     tradeGoodsVisible = _useState2[0],
     setTradeGoodsVisible = _useState2[1];
   var openModal = function openModal() {
-    return setTradeGoodsVisible(true);
+    if (getDataSourceAsync) {
+      getDataSourceAsync().then(function () {
+        setTradeGoodsVisible(true);
+      });
+    } else {
+      setTradeGoodsVisible(true);
+    }
   };
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
   var currentTradeOriginGoods = lodash.intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+    return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }), selectedRowKeys);
   var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+    return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
     console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
@@ -14293,7 +15155,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     footer: null,
     onCancel: closeModal
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: MAIN_FIELD,
+    rowKey: uniqueKey,
     rowSelection: rowSelection,
     columns: columns,
     dataSource: dataSource,
@@ -14315,6 +15177,9 @@ var getButtonText = function getButtonText() {
   if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
     return '选择管易ERP商品';
   }
+  if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
+    return '选择聚水潭ERP商品';
+  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -14334,6 +15199,8 @@ var GoodItem$1 = function GoodItem(props) {
     maxLength = _props$maxLength === void 0 ? 20 : _props$maxLength,
     _props$showChangeBtn = props.showChangeBtn,
     showChangeBtn = _props$showChangeBtn === void 0 ? true : _props$showChangeBtn,
+    _props$showErpGoodsBt = props.showErpGoodsBtn,
+    showErpGoodsBtn = _props$showErpGoodsBt === void 0 ? true : _props$showErpGoodsBt,
     _props$showModeBtn = props.showModeBtn,
     showModeBtn = _props$showModeBtn === void 0 ? false : _props$showModeBtn,
     _props$isStrict = props.isStrict,
@@ -14352,7 +15219,12 @@ var GoodItem$1 = function GoodItem(props) {
     onSelect = props.onSelect,
     onDelete = props.onDelete,
     onModeChange = props.onModeChange,
-    tradeGoods = props.tradeGoods;
+    tradeGoods = props.tradeGoods,
+    form = props.form;
+  var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
+  // 监听聚水潭退货商品
+  var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
+  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -14372,7 +15244,7 @@ var GoodItem$1 = function GoodItem(props) {
   // TODO: 商品订单中以选中商品
   var selectedGoods = React.useMemo(function () {
     return value === null || value === void 0 ? void 0 : value.map(function (v) {
-      return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
+      return v === null || v === void 0 ? void 0 : v[uniqueKey];
     });
   }, [value]);
   var updateHandle = function updateHandle(val, index, columnType) {
@@ -14414,7 +15286,7 @@ var GoodItem$1 = function GoodItem(props) {
   };
   var COLUMNS_MAP = function COLUMNS_MAP() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    var operate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    var columnsOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return function (type) {
       var columns = [];
       switch (type) {
@@ -14425,11 +15297,15 @@ var GoodItem$1 = function GoodItem(props) {
         case 'BS_GOODS':
         case 'WLN_GOODS':
         case 'GY_GOODS':
+        case 'JST_GOODS':
+        case 'JST_REISSUE_GOODS':
+        case 'JST_EXCHANGE_GOODS':
+        case 'JST_RETURN_GOODS':
         case 'GY_REISSUE_GOODS':
           {
             columns = getColumnsMap({
               text: text,
-              disabled: disabled,
+              disabled: disabled || columnsOptions.disabled,
               updateHandle: updateHandle,
               updateDataHandle: updateDataHandle
             })[type];
@@ -14438,25 +15314,25 @@ var GoodItem$1 = function GoodItem(props) {
         case 'WDT_REISSUE_GOODS':
           {
             columns = getWdtReissueGoodColumns({
-              disabled: disabled,
+              disabled: disabled || columnsOptions.disabled,
               updateHandle: updateHandle,
-              operate: operate
+              operate: columnsOptions.operate
             });
           }
           break;
         case 'BS_E3_REISSUE_GOODS':
           {
             columns = getBsE3ReissueGoodColumns({
-              disabled: disabled,
+              disabled: disabled || columnsOptions.disabled,
               updateHandle: updateHandle,
-              operate: operate
+              operate: columnsOptions.operate
             });
           }
           break;
         default:
           columns = getColumnsMap({
             text: text,
-            disabled: disabled,
+            disabled: disabled || columnsOptions.disabled,
             updateHandle: updateHandle,
             updateDataHandle: updateDataHandle
           })['default'];
@@ -14519,7 +15395,10 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled]);
   var orderColumns = React.useMemo(function () {
-    var columns = COLUMNS_MAP('', false)(type);
+    var columns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
     return [{
       dataIndex: '',
       title: '序号',
@@ -14603,6 +15482,23 @@ var GoodItem$1 = function GoodItem(props) {
           originAmount: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null
         });
       });
+    } else if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
+      newList = list.map(function (item) {
+        return {
+          name: item.goodName,
+          skuId: item.goodNo,
+          iId: item.styleCode,
+          pic: item.goodPicUrl,
+          propertiesValue: item.propertiesValue,
+          saleBasePrice: item.retailPrice,
+          salePrice: item.retailPrice,
+          remark: '',
+          uuid: kmkfUtils.uuid(),
+          canDelete: true,
+          canEdit: true,
+          qty: 1
+        };
+      });
     } else {
       newList = list.map(function (item) {
         var goodsId = item.goodsId,
@@ -14634,11 +15530,13 @@ var GoodItem$1 = function GoodItem(props) {
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
     setSelectedRowKeys(newSelectedRowKeys);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value.filter(function (t) {
-      return newSelectedRowKeys.includes(t.uuid);
+      return newSelectedRowKeys.includes(t[uniqueKey]);
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
-    refModal.current.open(shopCode);
+    refModal.current.open(shopCode, {
+      value: value
+    });
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -14655,6 +15553,7 @@ var GoodItem$1 = function GoodItem(props) {
     }
     return params;
   }, [tableSelect, selectedRowKeys]);
+  var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       float: 'right'
@@ -14662,18 +15561,20 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     checked: isStrict,
     onChange: handleCheckboxChange
-  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
+    uniqueKey: uniqueKey,
     columns: orderColumns,
     dataSource: tradeGoods.originDataSource,
+    getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange
-  }), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+  }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
   }, getButtonText(type)), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
-    rowKey: 'uuid',
+    rowKey: uniqueKey,
     size: "small",
     pagination: false,
     scroll: {
@@ -14682,31 +15583,7 @@ var GoodItem$1 = function GoodItem(props) {
     locale: {
       emptyText: '暂无数据'
     }
-  })), ['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type) ? /*#__PURE__*/React__default['default'].createElement(WdtGoodsModal, {
-    ref: refModal,
-    onSubmit: onSubmit,
-    width: width,
-    shopList: shopList,
-    shopId: shopId,
-    maxLength: maxLength,
-    companyKey: companyKey
-  }) : ['BS_E3_REISSUE_GOODS', 'BS_E3_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? /*#__PURE__*/React__default['default'].createElement(BsE3GoodsModal, {
-    ref: refModal,
-    onSubmit: onSubmit,
-    width: width,
-    shopList: shopList,
-    shopId: shopId,
-    maxLength: maxLength,
-    companyKey: companyKey
-  }) : ['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type) ? /*#__PURE__*/React__default['default'].createElement(GyGoodsModal$1, {
-    ref: refModal,
-    onSubmit: onSubmit,
-    width: width,
-    shopList: shopList,
-    shopId: shopId,
-    maxLength: maxLength,
-    companyKey: companyKey
-  }) : /*#__PURE__*/React__default['default'].createElement(GoodsModal$2, {
+  })), /*#__PURE__*/React__default['default'].createElement(TheGoodsModal, {
     ref: refModal,
     onSubmit: onSubmit,
     width: width,
@@ -15453,12 +16330,45 @@ var gyUtils = {
 };
 
 var singletonMap$3 = new Map();
-var getOrderListSingleton = function getOrderListSingleton(orderNo) {
+var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
   if (!singletonMap$3.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$3.delete(orderNo);
+        // singletonMap.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/jst/erp/orderOut/list', {
+        method: 'post',
+        data: {
+          soId: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          data.data = kmkfUtils.filterJstOrders({
+            orderList: (data === null || data === void 0 ? void 0 : data.data) || []
+          }, orderNo);
+          resolve(data.data);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$3.set(orderNo, p);
+  }
+  return singletonMap$3.get(orderNo);
+};
+var jstUtils = {
+  getJstOrderListSingleton: getJstOrderListSingleton
+};
+
+var singletonMap$4 = new Map();
+var getOrderListSingleton = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$4.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$4.delete(orderNo);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -15484,16 +16394,16 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$3.delete(orderNo);
+            singletonMap$4.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$3.set(orderNo, p);
+    singletonMap$4.set(orderNo, p);
   }
-  return singletonMap$3.get(orderNo);
+  return singletonMap$4.get(orderNo);
 };
 var kmUtils = {
   getOrderListSingleton: getOrderListSingleton
@@ -15506,7 +16416,8 @@ var columnsMap = {
   WLN_SYSTEM_ORDER: kmkfUtils.WLN_SYSTEM_ORDER_CONFIG.columns,
   WDT_SYSTEM_ORDER: kmkfUtils.WDT_SYSTEM_ORDER_CONFIG.columns,
   BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
-  GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns
+  GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
+  JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
@@ -15514,7 +16425,8 @@ var rowKeyMap = {
   WLN_SYSTEM_ORDER: 'billNo',
   WDT_SYSTEM_ORDER: 'billNo',
   BS_E3_SYSTEM_ORDER: 'orderSn',
-  GY_SYSTEM_ORDER: 'billNo'
+  GY_SYSTEM_ORDER: 'billNo',
+  JST_SYSTEM_ORDER: 'oId'
 };
 var index$1 = (function (props) {
   var value = props.value,
@@ -15539,6 +16451,8 @@ var index$1 = (function (props) {
       } else if (type === 'GY_SYSTEM_ORDER') {
         console.log('触发gy--getGyOrderList--1');
         getGyOrderList(value.orderNo);
+      } else if (type === 'JST_SYSTEM_ORDER') {
+        getJstOrderList(value.orderNo);
       }
     }
   }, [value, type]);
@@ -15694,18 +16608,41 @@ var index$1 = (function (props) {
       return _ref5.apply(this, arguments);
     };
   }();
-  var getKmOrderList = /*#__PURE__*/function () {
+  var getJstOrderList = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            jstUtils.getJstOrderListSingleton(orderNo).then(function (data) {
+              var trades = data || [];
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+                orders: trades,
+                showOrderInfo: trades
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function getJstOrderList(_x5) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var getKmOrderList = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref7) {
-                  var billNo = _ref7.billNo,
-                    billType = _ref7.billType,
-                    billTag = _ref7.billTag;
+                showOrderInfo: trades.map(function (_ref8) {
+                  var billNo = _ref8.billNo,
+                    billType = _ref8.billType,
+                    billTag = _ref8.billTag;
                   return {
                     billNo: billNo,
                     billType: billType,
@@ -15717,18 +16654,18 @@ var index$1 = (function (props) {
             onceRef.current = false;
           case 2:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
-    return function getKmOrderList(_x5) {
-      return _ref6.apply(this, arguments);
+    return function getKmOrderList(_x6) {
+      return _ref7.apply(this, arguments);
     };
   }();
   var getGyOrderList = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
               var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
@@ -15736,15 +16673,15 @@ var index$1 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref9) {
-                  var billNo = _ref9.billNo,
-                    billType = _ref9.billType,
-                    billTag = _ref9.billTag,
-                    tradeTagName = _ref9.tradeTagName,
-                    deliveryState = _ref9.deliveryState,
-                    vipCode = _ref9.vipCode,
-                    shopCode = _ref9.shopCode,
-                    rest = _objectWithoutProperties(_ref9, _excluded$g);
+                showOrderInfo: trades.map(function (_ref10) {
+                  var billNo = _ref10.billNo,
+                    billType = _ref10.billType,
+                    billTag = _ref10.billTag,
+                    tradeTagName = _ref10.tradeTagName,
+                    deliveryState = _ref10.deliveryState,
+                    vipCode = _ref10.vipCode,
+                    shopCode = _ref10.shopCode,
+                    rest = _objectWithoutProperties(_ref10, _excluded$g);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     billNo: billNo,
                     billType: billType,
@@ -15761,12 +16698,12 @@ var index$1 = (function (props) {
             onceRef.current = false;
           case 2:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    return function getGyOrderList(_x6) {
-      return _ref8.apply(this, arguments);
+    return function getGyOrderList(_x7) {
+      return _ref9.apply(this, arguments);
     };
   }();
   var rowSelection = {
@@ -15915,6 +16852,31 @@ var componentMap$1 = {
       returnDeleteGood: 'gyReturnDeleteGood',
       exchangeDeleteGood: 'gyExchangeDeleteGood'
     }
+  },
+  JST_GOODS: {
+    type: 'jst',
+    key: 'jstGoods',
+    name: '聚水潭',
+    orderNo: 'dealCode',
+    goodDetailOrderNo: 'originalDealCode',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'jstType',
+      updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
+      selectListReturn: 'jstSelectListReturn',
+      selectList: 'jstSelectList',
+      reissueSelectList: 'jstReissueSelectList',
+      reissueSelectListReturn: 'jstReissueSelectListReturn',
+      reissueDeleteGood: 'jstReissueDeleteGood',
+      changeShopCode: 'jstChangeShopCode',
+      reissueType: 'jstReissueType',
+      returnType: 'jstReturnType',
+      returnSelectListReturn: 'jstReturnSelectListReturn',
+      returnSelectList: 'jstReturnSelectList',
+      deleteGood: 'jstDeleteGood',
+      returnDeleteGood: 'jstReturnDeleteGood',
+      exchangeDeleteGood: 'jstExchangeDeleteGood'
+    }
   }
 };
 var CommonGoods = function CommonGoods(props) {
@@ -16264,27 +17226,58 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
 };
 
 var componentMap$3 = {
-  'WDT_EXCHANGE_GOODS': {
+  WDT_EXCHANGE_GOODS: {
     type: 'wdt',
     valueKey: 'wdtExchangeGoods',
     returnTypeKey: 'wdtExchangeType',
     name: '旺店通',
     eventNameMap: {
-      changeShopCode: 'wdtChangeShopCode',
-      exchangeDeleteGood: 'wdtExchangeDeleteGood',
+      // pubsub 事件
       exchangeCopyGood: 'wdtExchangeCopyGood',
       exchangeBackCopyGood: 'wdtExchangeBackCopyGood'
     }
+  },
+  JST_EXCHANGE_GOODS: {
+    type: 'jst',
+    showChooseTradeGoodsBtn: true,
+    valueKey: 'jstExchangeGoods',
+    returnTypeKey: 'jstExchangeType',
+    systemOrder: 'jstSystemOrder',
+    systemOrderNo: 'jstSystemOrderNo',
+    oIdKey: 'oId',
+    goodDetailsKey: 'items',
+    skuIdKey: 'skuId',
+    outerOiIdKey: '',
+    name: '聚水潭',
+    updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
+    eventNameMap: {
+      // pubsub 事件
+      exchangeCopyGood: 'jstExchangeCopyGood',
+      exchangeBackCopyGood: 'jstExchangeBackCopyGood',
+      returnGoodsSysorder: 'jstReturnGoodsSysorder',
+      returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
+    }
   }
 };
 var CommonExchangeGoods = function CommonExchangeGoods(props) {
+  var _componentMap$compTyp, _componentMap$compTyp4;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
     compType = props.type;
+  var uniqueKey = (componentMap$3 === null || componentMap$3 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$3[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.skuIdKey) || 'uuid';
   var valueRef = React.useRef({});
+  // PS: 目前选择订单商品，只有聚水潭换出商品，而且聚水潭不用考虑合并单，所以这个值一直是 false
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isStrict = _useState2[0],
+    setIsStrict = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    originDataSource = _useState4[0],
+    setOriginDataSource = _useState4[1];
   React.useEffect(function () {
-    var subscription = pubsub__default['default'].subscribe(componentMap$3[compType].eventNameMap.exchangeBackCopyGood, function (_, data) {
+    var subscription = componentMap$3[compType].eventNameMap.exchangeBackCopyGood && pubsub__default['default'].subscribe(componentMap$3[compType].eventNameMap.exchangeBackCopyGood, function (_, data) {
       if (disabled) return;
       var newValue = {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
@@ -16306,26 +17299,11 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     });
     return function () {
-      pubsub__default['default'].unsubscribe(subscription);
+      subscription && pubsub__default['default'].unsubscribe(subscription);
     };
-  });
+  }, []);
   React.useEffect(function () {
     valueRef.current = value;
-    pubsub__default['default'].subscribeOnce(componentMap$3[compType].eventNameMap.exchangeDeleteGood, function (_, data) {
-      if (disabled) return;
-      if (value) {
-        var newValue = _objectSpread2({}, value);
-        newValue[componentMap$3[compType].valueKey] = newValue[componentMap$3[compType].valueKey].filter(function (item) {
-          return item.sku !== data;
-        });
-        onChange(newValue);
-      }
-    });
-    pubsub__default['default'].subscribeOnce(componentMap$3[compType].eventNameMap.changeShopCode, function (type, data) {
-      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        shopCode: data.shopCode
-      }));
-    });
   }, [value]);
   var changeGoodHandle = function changeGoodHandle(val) {
     var newValue = _objectSpread2({}, value);
@@ -16340,13 +17318,53 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   };
   var copyGoods = function copyGoods() {
     var copyHandle = function copyHandle() {
-      pubsub__default['default'].publish(componentMap$3[compType].eventNameMap.exchangeCopyGood, 'WDT_EXCHANGE_GOODS');
+      pubsub__default['default'].publish(componentMap$3[compType].eventNameMap.exchangeCopyGood, compType);
     };
     return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       type: "link",
       onClick: copyHandle
     }, "\u590D\u5236\u9000\u56DE\u5546\u54C1");
   };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _componentMap$compTyp2, _componentMap$compTyp3, _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = originDataSource || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value[componentMap$3 === null || componentMap$3 === void 0 ? void 0 : (_componentMap$compTyp2 = componentMap$3[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.valueKey]) || [];
+    newValue[componentMap$3 === null || componentMap$3 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$3[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.valueKey] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), uniqueKey)) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item[uniqueKey]);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value[componentMap$3 === null || componentMap$3 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$3[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.valueKey], isStrict, originDataSource]);
+  var getGoodDetails = function getGoodDetails(_ref) {
+    var _componentMap$compTyp5, _componentMap$compTyp6, _order$componentMap$c, _componentMap$compTyp7;
+    var returnGoodsValue = _ref.returnGoodsValue,
+      mode = _ref.mode,
+      sysOrderNo = _ref.sysOrderNo;
+    var systemOrder = returnGoodsValue === null || returnGoodsValue === void 0 ? void 0 : returnGoodsValue[(_componentMap$compTyp5 = componentMap$3[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : returnGoodsValue === null || returnGoodsValue === void 0 ? void 0 : returnGoodsValue[(_componentMap$compTyp6 = componentMap$3[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.systemOrderNo];
+    var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
+      return order[componentMap$3[compType].oIdKey] === systemOrderNo;
+    });
+    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$3[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$3[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], true) : []);
+    var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
+    return mode ? goodDetails.filter(function (goodItem) {
+      return !orderNo || goodItem[componentMap$3[compType].outerOiIdKey] === orderNo;
+    }) : goodDetails;
+  };
+  var getDataSourceAsync = function getDataSourceAsync() {
+    return new Promise(function (resolve) {
+      pubsub__default['default'].subscribeOnce(componentMap$3[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
+        resolve(data);
+        setOriginDataSource(getGoodDetails({
+          returnGoodsValue: data,
+          mode: isStrict
+        }));
+      });
+      pubsub__default['default'].publish(componentMap$3[compType].eventNameMap.returnGoodsSysorder, compType);
+    });
+  };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$3[compType].type
   }, props), {}, {
@@ -16356,6 +17374,12 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value[componentMap$3[compType].valueKey],
     otherOperations: copyGoods(),
+    tradeGoods: componentMap$3[compType].showChooseTradeGoodsBtn ? {
+      uniqueKey: uniqueKey,
+      originDataSource: originDataSource,
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    } : void 0,
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     }
@@ -16634,6 +17658,305 @@ var wdtReissue = function wdtReissue(props) {
   })));
 };
 
+var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type"];
+var typeMap$2 = {
+  JST_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'jstReissueGoods',
+    typeName: 'jstReissueType',
+    systemOrder: 'jstSystemOrder',
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType',
+    getOrderList: jstUtils.getJstOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
+    orderTypeKey: 'orderType',
+    oIdKey: 'oId',
+    outerOiIdKey: '',
+    goodDetailsKey: 'items'
+  },
+  JST_RETURN_GOODS: {
+    compType: '退货',
+    key: 'jstReturnGoods',
+    typeName: 'jstReturnType',
+    systemOrder: 'jstSystemOrder',
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType',
+    getOrderList: jstUtils.getJstOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateJstGoodsHandle,
+    orderTypeKey: 'orderType',
+    oIdKey: 'oId',
+    outerOiIdKey: '',
+    goodDetailsKey: 'items',
+    showErpGoodsBtn: false,
+    eventNameMap: {
+      // pubsub 事件
+      exchangeCopyGood: 'jstExchangeCopyGood',
+      exchangeBackCopyGood: 'jstExchangeBackCopyGood',
+      returnGoodsSysorder: 'jstReturnGoodsSysorder',
+      returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
+    }
+  }
+};
+var PublicReissue = function PublicReissue(props) {
+  var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43;
+  var value = props.value,
+    onChange = props.onChange,
+    _props$reasonList = props.reasonList,
+    reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
+    disabled = props.disabled,
+    type = props.type,
+    other = _objectWithoutProperties(props, _excluded$i);
+  var getOrderFlag = React.useRef(false);
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isStrict = _useState2[0],
+    setIsStrict = _useState2[1];
+  // TODO: 在修改场景下手动获取一次订单详情中数据
+  React.useEffect(function () {
+    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$2[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$2[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
+      var _value$typeMap$type$s4, _typeMap$type3;
+      getOrderFlag.current = true;
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$2[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+    }
+    return;
+  }, [value]);
+  var valueRef = React.useRef({});
+  React.useEffect(function () {
+    valueRef.current = value;
+  }, [value]);
+  React.useEffect(function () {
+    var subscription;
+    var subscription2;
+    if (typeMap$2[type].eventNameMap) {
+      subscription = pubsub__default['default'].subscribe(typeMap$2[type].eventNameMap.exchangeCopyGood, function () {
+        var _valueRef$current, _valueRef$current2;
+        pubsub__default['default'].publish(typeMap$2[type].eventNameMap.exchangeBackCopyGood, {
+          list: lodash.cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current[typeMap$2[type].key]) || []),
+          shopCode: valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.shopCode
+        });
+      });
+      subscription2 = pubsub__default['default'].subscribe(typeMap$2[type].eventNameMap.returnGoodsSysorder, function () {
+        pubsub__default['default'].publish(typeMap$2[type].eventNameMap.returnGoodsSysorderBack, lodash.cloneDeep(valueRef.current));
+      });
+    }
+    return function () {
+      subscription && pubsub__default['default'].unsubscribe(subscription);
+      subscription2 && pubsub__default['default'].unsubscribe(subscription2);
+    };
+  }, []);
+  var getOrderList = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      var _typeMap$type4;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            (_typeMap$type4 = typeMap$2[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
+              var _typeMap$type5, _typeMap$type6, _typeMap$type10, _typeMap$type11;
+              var orders = data || [];
+              var showOrderInfo = orders.map(function (orderItem) {
+                return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
+              });
+              var typeObj = {};
+              var systemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrderNo];
+              if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type6 = typeMap$2[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrderBillType) {
+                var _typeMap$type8, _typeMap$type9;
+                var targetOrder = orders.find(function (oItem) {
+                  var _typeMap$type7;
+                  return oItem[(_typeMap$type7 = typeMap$2[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.oIdKey] === systemOrderNo;
+                });
+                typeObj[(_typeMap$type8 = typeMap$2[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type9 = typeMap$2[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.orderTypeKey];
+              }
+              onChange(_objectSpread2(_objectSpread2(_objectSpread2({}, value), typeObj), {}, _defineProperty({}, (_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrder]), {}, {
+                showOrderInfo: showOrderInfo,
+                orders: orders
+              }))));
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getOrderList(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var changeTypeHandle = function changeTypeHandle(val) {
+    var _typeMap$type12;
+    var typeName = val === null || val === void 0 ? void 0 : val[0];
+    // if (typeName === value?.[typeMap[type]?.typeName]?.[0]) return
+    // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
+    var newValue = _objectSpread2({}, value);
+    newValue[(_typeMap$type12 = typeMap$2[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.typeName] = val;
+    if (typeName === '1') {
+      var _typeMap$type13;
+      newValue[(_typeMap$type13 = typeMap$2[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = getGoodDetails({
+        mode: isStrict
+      });
+    } else if (typeName === '2') {
+      var _typeMap$type14;
+      // 切换到非原单，清空列表
+      newValue[(_typeMap$type14 = typeMap$2[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key] = [];
+    }
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var handleModeChange = function handleModeChange(mode) {
+    var _value$typeMap$type$t, _typeMap$type15, _typeMap$type16;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0]) === '1';
+    setIsStrict(mode);
+    if (!isOriginalOrder) return;
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type16 = typeMap$2[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key, getGoodDetails({
+      mode: mode
+    }))));
+  };
+  var getGoodDetails = function getGoodDetails(_ref3) {
+    var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19;
+    var mode = _ref3.mode,
+      sysOrderNo = _ref3.sysOrderNo;
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo];
+    var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
+      return order[typeMap$2[type].oIdKey] === systemOrderNo;
+    });
+    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((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$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], true) : []);
+    var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
+    return mode ? goodDetails.filter(function (goodItem) {
+      return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
+    }) : goodDetails;
+  };
+  var changeGoodHandle = function changeGoodHandle(val) {
+    var _typeMap$type20;
+    var newValue = _objectSpread2({}, value);
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = val || [];
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
+    var _typeMap$type21, _typeMap$type22, _value$typeMap$type$t2, _typeMap$type27, _value$typeMap$type$t3, _typeMap$type29;
+    var newValue = _objectSpread2({}, value);
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderBillType) {
+      var _value$typeMap$type$s5, _typeMap$type23, _typeMap$type25, _typeMap$type26;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orders) || [];
+      var targetOrder = val && orders.find(function (oItem) {
+        var _typeMap$type24;
+        return oItem[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.oIdKey] === val;
+      });
+      newValue[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type28;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[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)] = getGoodDetails({
+        mode: isStrict,
+        sysOrderNo: val
+      });
+    }
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  //显示选择商品按钮
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo]);
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _typeMap$type32, _typeMap$type33, _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getGoodDetails({
+      mode: isStrict
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".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)]) || [];
+    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)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.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$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)], isStrict]);
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+    gutter: 8,
+    wrap: true,
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key) || "".concat(Date.now())
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+    className: "gutter-row",
+    xs: {
+      span: 11
+    },
+    sm: {
+      span: 6
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    style: {
+      marginBottom: '8px'
+    },
+    disabled: disabled,
+    allowClear: false,
+    value: 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.systemOrderNo)],
+    onChange: function onChange(val) {
+      return changeSystemOrderHandle(val);
+    },
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.showOrderInfo) || []).map(function (item) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+      key: item[typeMap$2[type].oIdKey],
+      value: item[typeMap$2[type].oIdKey],
+      label: item[typeMap$2[type].oIdKey]
+    }, item[typeMap$2[type].oIdKey]);
+  }))), /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+    className: "gutter-row",
+    xs: {
+      span: 11
+    },
+    sm: {
+      span: 6
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
+    style: {
+      marginBottom: '8px'
+    },
+    disabled: 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$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.typeName)],
+    onChange: function onChange(val) {
+      return changeTypeHandle(val);
+    }
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderBillType) && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+    className: "gutter-row",
+    xs: {
+      span: 11
+    },
+    sm: {
+      span: 6
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderBillType)],
+    disabled: disabled,
+    readOnly: true
+  }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
+    key: 'reissueGoods'
+  }, other), {}, {
+    type: type,
+    disabled: disabled,
+    canUpdateNumber: showChangeBtn,
+    showChangeBtn: showChangeBtn,
+    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.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$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key)],
+    onChange: function onChange(val) {
+      return changeGoodHandle(val);
+    },
+    onModeChange: handleModeChange,
+    showModeBtn: false,
+    isStrict: isStrict,
+    tradeGoods: {
+      originDataSource: getGoodDetails({
+        mode: isStrict
+      }),
+      selectedGoodsChange: selectedGoodsChange
+    }
+  })));
+};
+
 var css_248z$a = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$a);
 
@@ -17110,12 +18433,12 @@ var Goods$1 = function Goods(props, ref) {
 };
 var index$2 = /*#__PURE__*/React.forwardRef(Goods$1);
 
-var _excluded$i = ["onChange", "value", "failValue"];
+var _excluded$j = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
   var onChange = props.onChange,
     value = props.value,
     failValue = props.failValue,
-    other = _objectWithoutProperties(props, _excluded$i);
+    other = _objectWithoutProperties(props, _excluded$j);
   var changeHandle = function changeHandle(val) {
     onChange === null || onChange === void 0 ? void 0 : onChange({
       status: val,
@@ -17155,10 +18478,15 @@ var typeInitValueMap$1 = {
     initValue: [{
       billNo: ''
     }]
+  },
+  5: {
+    initValue: [{
+      billNo: ''
+    }]
   }
 };
 var CommonSystemOrder = function CommonSystemOrder(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -17180,7 +18508,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, [1, 2, 3, 4].includes(type) ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
+    }, [1, 2, 3, 4, 5].includes(type) ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
@@ -17237,10 +18565,17 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
       return changeInputHandle(e.target.value, 'billNo');
     },
     value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.billNo
+  })) : null, type === 5 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u552E\u540E\u5355id",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'billNo');
+    },
+    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.billNo
   })) : null) : null);
 };
 
-var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
 var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -17250,7 +18585,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     failValue = props.failValue,
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
-    other = _objectWithoutProperties(props, _excluded$j);
+    other = _objectWithoutProperties(props, _excluded$k);
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -17316,7 +18651,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null));
 };
 
-var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$l = ["value", "onChange", "disabled", "failValue", "type"];
 var MsgStatus = function MsgStatus(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -17326,7 +18661,7 @@ var MsgStatus = function MsgStatus(props) {
     failValue = props.failValue,
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
-    other = _objectWithoutProperties(props, _excluded$k);
+    other = _objectWithoutProperties(props, _excluded$l);
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -17395,8 +18730,8 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"];
-var typeMap$2 = {
+var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"];
+var typeMap$3 = {
   BS_E3_REISSUE_GOODS: {
     key: 'bsE3ReissueGoods',
     typeName: 'bsE3ReissueType',
@@ -17413,7 +18748,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$l);
+    other = _objectWithoutProperties(props, _excluded$m);
   var getOrderFlag = React.useRef(false);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -17422,10 +18757,10 @@ var bsE3Reissue = function bsE3Reissue(props) {
   // TODO: 在修改场景下手动获取一次订单详情中数据
   React.useEffect(function () {
     var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
-    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$2[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$2[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$3[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$3[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
       var _value$typeMap$type$s4, _typeMap$type3;
       getOrderFlag.current = true;
-      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$2[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$3[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
     }
     return;
   }, [value]);
@@ -17449,7 +18784,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            (_typeMap$type4 = typeMap$2[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
+            (_typeMap$type4 = typeMap$3[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
               var _typeMap$type5, _typeMap$type6;
               var orders = (data === null || data === void 0 ? void 0 : data.orderList) || [];
               var showOrderInfo = orders.map(function (_ref2) {
@@ -17458,7 +18793,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
                   billNo: orderSn
                 };
               });
-              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$2[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -17479,25 +18814,25 @@ var bsE3Reissue = function bsE3Reissue(props) {
     // if (typeName === value?.[typeMap[type]?.typeName]?.[0]) return
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type7 = typeMap$2[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName] = val;
+    newValue[(_typeMap$type7 = typeMap$3[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName] = val;
     if (typeName === '1') {
       var _typeMap$type8;
-      newValue[(_typeMap$type8 = typeMap$2[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.key] = getGoodDetails({
+      newValue[(_typeMap$type8 = typeMap$3[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
       var _typeMap$type9;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type9 = typeMap$2[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = [];
+      newValue[(_typeMap$type9 = typeMap$3[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
     var _value$typeMap$type$t, _typeMap$type10, _typeMap$type11;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0]) === '1';
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type10 = typeMap$3[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type11 = typeMap$3[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key, getGoodDetails({
       mode: mode
     }))));
   };
@@ -17505,8 +18840,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     var _typeMap$type12, _typeMap$type13, _order$orderDetailGet;
     var mode = _ref3.mode,
       sysOrderNo = _ref3.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type12 = typeMap$2[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$2[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type12 = typeMap$3[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
@@ -17519,19 +18854,19 @@ var bsE3Reissue = function bsE3Reissue(props) {
   var changeGoodHandle = function changeGoodHandle(val) {
     var _typeMap$type14;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type14 = typeMap$2[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = val || [];
+    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
     var _typeMap$type15, _value$typeMap$type$t2, _typeMap$type16, _value$typeMap$type$t3, _typeMap$type18;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type16 = typeMap$2[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type15 = typeMap$3[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type16 = typeMap$3[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
       var _typeMap$type17;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type17 = typeMap$3[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type18 = typeMap$3[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
       var _typeMap$type19;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)] = getGoodDetails({
+      newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type19 = typeMap$3[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -17541,8 +18876,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
     var _typeMap$type20;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo]]);
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$3[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$3[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo]]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
     var _typeMap$type22, _typeMap$type23, _uniqBy;
     var newValue = _objectSpread2({}, value);
@@ -17551,12 +18886,12 @@ var bsE3Reissue = function bsE3Reissue(props) {
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".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)]) || [];
-    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)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type22 = typeMap$3[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)]) || [];
+    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type23 = typeMap$3[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.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$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type24 = typeMap$3[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
@@ -17575,12 +18910,12 @@ var bsE3Reissue = function bsE3Reissue(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$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type25 = typeMap$3[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$3[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -17601,7 +18936,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     disabled: 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$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type27 = typeMap$3[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -17613,7 +18948,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     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$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type28 = typeMap$3[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -17629,9 +18964,9 @@ var bsE3Reissue = function bsE3Reissue(props) {
   })));
 };
 
-var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"],
+var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"],
   _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
-var typeMap$3 = {
+var typeMap$4 = {
   GY_REISSUE_GOODS: {
     key: 'gyReissueGoods',
     name: '管易',
@@ -17658,7 +18993,7 @@ var GyReissue = function GyReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$m);
+    other = _objectWithoutProperties(props, _excluded$n);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
     var _order$platformCode;
     return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(';');
@@ -17670,10 +19005,10 @@ var GyReissue = function GyReissue(props) {
     setIsStrict = _useState2[1];
   React.useEffect(function () {
     var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
-    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$3[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$3[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$4[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$4[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
       var _value$typeMap$type$s4, _typeMap$type3;
       getOrderFlag.current = true;
-      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$3[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$4[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
     }
     return;
   }, [value]);
@@ -17683,7 +19018,7 @@ var GyReissue = function GyReissue(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            (_typeMap$type4 = typeMap$3[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
+            (_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
               var _typeMap$type5, _typeMap$type6;
               var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
               var showOrderInfo = orders.map(function (_ref2) {
@@ -17706,7 +19041,7 @@ var GyReissue = function GyReissue(props) {
                   shopCode: shopCode
                 });
               });
-              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -17724,28 +19059,28 @@ var GyReissue = function GyReissue(props) {
   var changeTypeHandle = function changeTypeHandle(val) {
     var _value$typeMap$type$t, _typeMap$type7, _typeMap$type8;
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type7 = typeMap$3[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
+    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type8 = typeMap$3[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName] = val;
+    newValue[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName] = val;
     if (typeName === '1') {
       var _typeMap$type9;
-      newValue[(_typeMap$type9 = typeMap$3[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = getGoodDetails({
+      newValue[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
       var _typeMap$type10;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type10 = typeMap$3[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key] = [];
+      newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
     var _value$typeMap$type$t2, _typeMap$type11, _typeMap$type12;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type11 = typeMap$3[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type12 = typeMap$3[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key, getGoodDetails({
       mode: mode
     }))));
   };
@@ -17753,8 +19088,8 @@ var GyReissue = function GyReissue(props) {
     var _typeMap$type13, _typeMap$type14, _order$details;
     var mode = _ref3.mode,
       sysOrderNo = _ref3.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
@@ -17767,10 +19102,10 @@ var GyReissue = function GyReissue(props) {
   var changeGoodHandle = function changeGoodHandle(val) {
     var _typeMap$type15;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type15 = typeMap$3[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
       var _typeMap$type16, _typeMap$type17;
-      item["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type16 = typeMap$3[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type17 = typeMap$3[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -17778,13 +19113,13 @@ var GyReissue = function GyReissue(props) {
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
     var _typeMap$type18, _value$typeMap$type$t3, _typeMap$type19, _value$typeMap$type$t4, _typeMap$type21;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type18 = typeMap$3[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type19 = typeMap$3[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
       var _typeMap$type20;
-      newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type20 = typeMap$3[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type21 = typeMap$3[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
       var _typeMap$type22;
-      newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type22 = typeMap$3[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -17799,18 +19134,18 @@ var GyReissue = function GyReissue(props) {
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type23 = typeMap$3[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
-    newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type24 = typeMap$3[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type25 = typeMap$3[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
+    console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type26 = typeMap$3[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
     var _typeMap$type27;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$3[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$3[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
@@ -17828,12 +19163,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type29 = typeMap$3[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$3[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -17854,7 +19189,7 @@ var GyReissue = function GyReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type31 = typeMap$3[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -17866,7 +19201,7 @@ var GyReissue = function GyReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type32 = typeMap$3[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -17932,6 +19267,7 @@ exports.LogisticsTrajectory = LogisticsTrajectory;
 exports.MsgStatus = MsgStatus;
 exports.ParseLogistics = ParseLogistics;
 exports.Payment = Payment;
+exports.PublicReissue = PublicReissue;
 exports.Remark = RemarkInput;
 exports.ReturnLogistics = ExpressLogistics;
 exports.ShopName = ShopNameSelect;
@@ -17945,3 +19281,4 @@ exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
+exports.getJstColumns = getColumns$5;