@kmkf-fe-packages/basic-components 2.0.12-beta.25 → 2.0.12-beta.26

package/dist/index.esm.js

@@ -14376,6 +14376,12 @@ var getColumns$4 = function getColumns(_ref) {
   };
 };
 
+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,
@@ -14629,7 +14635,218 @@ var getColumns$5 = function getColumns() {
           }
         }) : /*#__PURE__*/React.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.createElement(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.createElement(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.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.createElement(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.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: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240
+    }].map(fillAttrs),
+    JST_EXCHANGE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称'
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码'
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码'
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(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.createElement(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.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.createElement(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.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return (record.qty || 0) * (+record.salePrice || 0);
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val);
+      }
+    }].map(fillAttrs)
   };
 };
 
@@ -14877,39 +15094,49 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
 };
 
 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,
-  'OTHER_GOODS': GoodsModal$2
+  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 MAIN_FIELD = 'uuid';
 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 = 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 = 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 = 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);
@@ -14928,7 +15155,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     footer: null,
     onCancel: closeModal
   }, /*#__PURE__*/React.createElement(Table, {
-    rowKey: MAIN_FIELD,
+    rowKey: uniqueKey,
     rowSelection: rowSelection,
     columns: columns,
     dataSource: dataSource,
@@ -14950,7 +15177,7 @@ var getButtonText = function getButtonText() {
   if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
     return '选择管易ERP商品';
   }
-  if (['JST_GOODS', 'JST_REISSUE_GOODS'].includes(type)) {
+  if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
     return '选择聚水潭ERP商品';
   }
   return '选择商品';
@@ -14972,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,
@@ -14991,6 +15220,7 @@ var GoodItem$1 = function GoodItem(props) {
     onDelete = props.onDelete,
     onModeChange = props.onModeChange,
     tradeGoods = props.tradeGoods;
+  var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -15010,7 +15240,7 @@ var GoodItem$1 = function GoodItem(props) {
   // TODO: 商品订单中以选中商品
   var selectedGoods = 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) {
@@ -15065,6 +15295,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_GOODS':
         case 'JST_GOODS':
         case 'JST_REISSUE_GOODS':
+        case 'JST_EXCHANGE_GOODS':
+        case 'JST_RETURN_GOODS':
         case 'GY_REISSUE_GOODS':
           {
             columns = getColumnsMap({
@@ -15246,7 +15478,7 @@ var GoodItem$1 = function GoodItem(props) {
           originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
         });
       });
-    } else if (['JST_GOODS', 'JST_REISSUE_GOODS'].includes(type)) {
+    } else if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
         return {
           name: item.goodName,
@@ -15294,7 +15526,7 @@ 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() {
@@ -15326,17 +15558,19 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) && /*#__PURE__*/React.createElement(SelectTradeGoods, {
+    uniqueKey: uniqueKey,
     columns: orderColumns,
     dataSource: tradeGoods.originDataSource,
+    getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange
-  }), /*#__PURE__*/React.createElement(Button, {
+  }), showErpGoodsBtn && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
   }, getButtonText(type)), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
-    rowKey: 'uuid',
+    rowKey: uniqueKey,
     size: "small",
     pagination: false,
     scroll: {
@@ -16988,27 +17222,57 @@ 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',
+    valueKey: 'jstExchangeGoods',
+    returnTypeKey: 'jstExchangeType',
+    systemOrder: 'jstSystemOrder',
+    systemOrderNo: 'jstSystemOrderNo',
+    oIdKey: 'oId',
+    goodDetailsKey: 'items',
+    skuIdKey: 'skuId',
+    outerOiIdKey: '',
+    name: '聚水潭',
+    updateGoodsHandle: 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 = useRef({});
+  // PS: 目前选择订单商品，只有聚水潭换出商品，而且聚水潭不用考虑合并单，所以这个值一直是 false
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isStrict = _useState2[0],
+    setIsStrict = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    originDataSource = _useState4[0],
+    setOriginDataSource = _useState4[1];
   useEffect(function () {
-    var subscription = pubsub.subscribe(componentMap$3[compType].eventNameMap.exchangeBackCopyGood, function (_, data) {
+    var subscription = componentMap$3[compType].eventNameMap.exchangeBackCopyGood && pubsub.subscribe(componentMap$3[compType].eventNameMap.exchangeBackCopyGood, function (_, data) {
       if (disabled) return;
       var newValue = {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
@@ -17030,26 +17294,11 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     });
     return function () {
-      pubsub.unsubscribe(subscription);
+      subscription && pubsub.unsubscribe(subscription);
     };
-  });
+  }, []);
   useEffect(function () {
     valueRef.current = value;
-    pubsub.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.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);
@@ -17064,13 +17313,53 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   };
   var copyGoods = function copyGoods() {
     var copyHandle = function copyHandle() {
-      pubsub.publish(componentMap$3[compType].eventNameMap.exchangeCopyGood, 'WDT_EXCHANGE_GOODS');
+      pubsub.publish(componentMap$3[compType].eventNameMap.exchangeCopyGood, compType);
     };
     return /*#__PURE__*/React.createElement(Button, {
       type: "link",
       onClick: copyHandle
     }, "\u590D\u5236\u9000\u56DE\u5546\u54C1");
   };
+  var selectedGoodsChange = 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 = 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 = 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.subscribeOnce(componentMap$3[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
+        resolve(data);
+        setOriginDataSource(getGoodDetails({
+          returnGoodsValue: data,
+          mode: isStrict
+        }));
+      });
+      pubsub.publish(componentMap$3[compType].eventNameMap.returnGoodsSysorder, compType);
+    });
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$3[compType].type
   }, props), {}, {
@@ -17080,6 +17369,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: {
+      uniqueKey: uniqueKey,
+      originDataSource: originDataSource,
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    },
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     }
@@ -17361,6 +17656,7 @@ 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',
@@ -17370,12 +17666,34 @@ var typeMap$2 = {
     updateGoodsHandle: updateJstGoodsHandle,
     orderTypeKey: 'orderType',
     oIdKey: 'oId',
-    outerOiIdKey: 'outerOiId',
+    outerOiIdKey: '',
     goodDetailsKey: 'items'
+  },
+  JST_RETURN_GOODS: {
+    compType: '退货',
+    key: 'jstReturnGoods',
+    typeName: 'jstReturnType',
+    systemOrder: 'jstSystemOrder',
+    systemOrderNo: 'jstSystemOrderNo',
+    systemOrderBillType: 'jstSystemOrderBillType',
+    getOrderList: jstUtils.getJstOrderListSingleton,
+    updateGoodsHandle: 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$type32, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42;
+  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,
@@ -17398,6 +17716,30 @@ var PublicReissue = function PublicReissue(props) {
     }
     return;
   }, [value]);
+  var valueRef = useRef({});
+  useEffect(function () {
+    valueRef.current = value;
+  }, [value]);
+  useEffect(function () {
+    var subscription;
+    var subscription2;
+    if (typeMap$2[type].eventNameMap) {
+      subscription = pubsub.subscribe(typeMap$2[type].eventNameMap.exchangeCopyGood, function () {
+        var _valueRef$current, _valueRef$current2;
+        pubsub.publish(typeMap$2[type].eventNameMap.exchangeBackCopyGood, {
+          list: 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.subscribe(typeMap$2[type].eventNameMap.returnGoodsSysorder, function () {
+        pubsub.publish(typeMap$2[type].eventNameMap.returnGoodsSysorderBack, cloneDeep(valueRef.current));
+      });
+    }
+    return function () {
+      subscription && pubsub.unsubscribe(subscription);
+      subscription2 && pubsub.unsubscribe(subscription2);
+    };
+  }, []);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _typeMap$type4;
@@ -17509,29 +17851,26 @@ var PublicReissue = function PublicReissue(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
-  //显示选择商品按钮 原单换不显示选择商品
-  var showChangeBtn = useMemo(function () {
-    var _typeMap$type31;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo]]);
+  //显示选择商品按钮
+  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 = useCallback(function (skuList) {
-    var _typeMap$type33, _typeMap$type34, _uniqBy;
+    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$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = (_uniqBy = 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$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 = 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$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)], isStrict]);
+  }, [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.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key) || "".concat(Date.now())
+    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.createElement(Col, {
     className: "gutter-row",
     xs: {
@@ -17546,11 +17885,11 @@ var PublicReissue = function PublicReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.systemOrderNo)],
+    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\u8865\u53D1\u7CFB\u7EDF\u5355"
+    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.createElement(Select.Option, {
       key: item[typeMap$2[type].oIdKey],
@@ -17595,8 +17934,9 @@ var PublicReissue = function PublicReissue(props) {
     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$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)],
+    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);
     },