@kmkf-fe-packages/basic-components 2.0.12-beta.3 → 2.0.12-beta.30

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -12516,7 +12516,6 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
-    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -12674,17 +12673,6 @@ var GoodList$2 = function GoodList(props, ref) {
     layout: "inline",
     form: form
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodShortName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "goodNo",
     style: {
       marginBottom: '12px'
@@ -14376,8 +14364,15 @@ var getColumns$4 = function getColumns(_ref) {
   };
 };
 
-var getColumns$5 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
+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 {
@@ -14441,7 +14436,7 @@ var getColumns$5 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'salePrice');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
@@ -14460,7 +14455,7 @@ var getColumns$5 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -14489,7 +14484,7 @@ var getColumns$5 = function getColumns(_ref) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
@@ -14567,7 +14562,7 @@ var getColumns$5 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'salePrice');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
@@ -14586,7 +14581,7 @@ var getColumns$5 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -14600,7 +14595,7 @@ var getColumns$5 = function getColumns(_ref) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
@@ -14624,11 +14619,222 @@ var getColumns$5 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(e) {
-            return updateHandle(e.target.value, index, 'remark');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
           }
         }) : /*#__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)
   };
 };
 
@@ -14876,39 +15082,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);
@@ -14927,7 +15143,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,
@@ -14949,7 +15165,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 '选择商品';
@@ -14971,6 +15187,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,
@@ -14989,7 +15207,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 = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
+  var isShowSelectTradeGoods = jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -15009,7 +15232,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) {
@@ -15064,6 +15287,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({
@@ -15245,7 +15470,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,
@@ -15293,7 +15518,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() {
@@ -15324,18 +15549,20 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React.createElement(Checkbox, {
     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, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__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: {
@@ -16066,8 +16293,6 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 billTag: item.tagName,
                 tradeTagName: item.tradeTagName,
                 deliveryState: item.deliveryState,
-                vipCode: item.vipCode,
-                shopCode: item.shopCode,
                 deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
@@ -16170,7 +16395,6 @@ var kmUtils = {
   getOrderListSingleton: getOrderListSingleton
 };
 
-var _excluded$g = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -16439,20 +16663,15 @@ var index$1 = (function (props) {
                     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), {}, {
+                    deliveryState = _ref10.deliveryState;
+                  return {
                     billNo: billNo,
                     billType: billType,
                     billTag: billTag,
                     tradeTagName: tradeTagName,
                     deliveryState: deliveryState,
-                    deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
-                    vipCode: vipCode,
-                    shopCode: shopCode
-                  });
+                    deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState]
+                  };
                 })
               }));
             });
@@ -16987,27 +17206,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: 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
@@ -17029,26 +17279,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);
@@ -17063,13 +17298,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), {}, {
@@ -17079,13 +17354,19 @@ 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);
     }
   })));
 };
 
-var _excluded$h = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$g = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$1 = {
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
@@ -17113,7 +17394,7 @@ var wdtReissue = function wdtReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$h);
+    other = _objectWithoutProperties(props, _excluded$g);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$wdtSystemOrder = value.wdtSystemOrder) === null || _value$wdtSystemOrder === void 0 ? void 0 : _value$wdtSystemOrder.orders) || []).some(function (order) {
     var _order$srcTid;
     return order === null || order === void 0 ? void 0 : (_order$srcTid = order.srcTid) === null || _order$srcTid === void 0 ? void 0 : _order$srcTid.includes(',');
@@ -17357,9 +17638,10 @@ var wdtReissue = function wdtReissue(props) {
   })));
 };
 
-var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$h = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$2 = {
   JST_REISSUE_GOODS: {
+    compType: '补发',
     key: 'jstReissueGoods',
     typeName: 'jstReissueType',
     systemOrder: 'jstSystemOrder',
@@ -17369,19 +17651,41 @@ 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,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$i);
+    other = _objectWithoutProperties(props, _excluded$h);
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -17397,6 +17701,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;
@@ -17471,7 +17799,7 @@ var PublicReissue = function PublicReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[typeMap$2[type].oIdKey] === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? (_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], true) : [];
+    var goodDetails = 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;
@@ -17508,29 +17836,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: {
@@ -17545,11 +17870,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],
@@ -17594,8 +17919,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);
     },
@@ -18087,12 +18413,12 @@ var Goods$1 = function Goods(props, ref) {
 };
 var index$2 = /*#__PURE__*/forwardRef(Goods$1);
 
-var _excluded$j = ["onChange", "value", "failValue"];
+var _excluded$i = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
   var onChange = props.onChange,
     value = props.value,
     failValue = props.failValue,
-    other = _objectWithoutProperties(props, _excluded$j);
+    other = _objectWithoutProperties(props, _excluded$i);
   var changeHandle = function changeHandle(val) {
     onChange === null || onChange === void 0 ? void 0 : onChange({
       status: val,
@@ -18229,7 +18555,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
   })) : null) : null);
 };
 
-var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$j = ["value", "onChange", "disabled", "failValue", "type"];
 var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -18239,7 +18565,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$k);
+    other = _objectWithoutProperties(props, _excluded$j);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -18305,7 +18631,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$l = ["value", "onChange", "disabled", "failValue", "type"];
+var _excluded$k = ["value", "onChange", "disabled", "failValue", "type"];
 var MsgStatus = function MsgStatus(props) {
   var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
@@ -18315,7 +18641,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$l);
+    other = _objectWithoutProperties(props, _excluded$k);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -18346,7 +18672,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key] || key, item.ruleName);
+    }, msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -18384,7 +18710,7 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$l = ["value", "onChange", "reasonList", "disabled", "type"];
 var typeMap$3 = {
   BS_E3_REISSUE_GOODS: {
     key: 'bsE3ReissueGoods',
@@ -18402,7 +18728,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$m);
+    other = _objectWithoutProperties(props, _excluded$l);
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -18618,8 +18944,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
   })));
 };
 
-var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"],
-  _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+var _excluded$m = ["value", "onChange", "reasonList", "disabled", "type"],
+  _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState"];
 var typeMap$4 = {
   GY_REISSUE_GOODS: {
     key: 'gyReissueGoods',
@@ -18647,7 +18973,7 @@ var GyReissue = function GyReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$n);
+    other = _objectWithoutProperties(props, _excluded$m);
   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(';');
@@ -18681,8 +19007,6 @@ var GyReissue = function GyReissue(props) {
                   billTag = _ref2.billTag,
                   tradeTagName = _ref2.tradeTagName,
                   deliveryState = _ref2.deliveryState,
-                  vipCode = _ref2.vipCode,
-                  shopCode = _ref2.shopCode,
                   rest = _objectWithoutProperties(_ref2, _excluded2);
                 return _objectSpread2(_objectSpread2({}, rest), {}, {
                   billNo: billNo,
@@ -18690,9 +19014,7 @@ var GyReissue = function GyReissue(props) {
                   billTag: billTag,
                   tradeTagName: tradeTagName,
                   deliveryState: deliveryState,
-                  deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
-                  vipCode: vipCode,
-                  shopCode: shopCode
+                  deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState]
                 });
               });
               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]), {}, {
@@ -18871,4 +19193,4 @@ var GyReissue = function GyReissue(props) {
   })));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, GyReissue, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, GyReissue, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, getColumns$5 as getJstColumns };