@kmkf-fe-packages/basic-components 2.7.6 → 2.7.7-beta.10

package/dist/index.esm.js

@@ -8594,6 +8594,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
         status: 'erpAfterSaleStatusValue',
         reason: 'erpAfterSaleStatusReason'
       },
+      ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
+        status: 'erpAfterSalesOrderReviewStatusValue',
+        reason: 'erpAfterSalesOrderReviewStatusReason'
+      },
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
         status: 'returnExchangeGoodsReviewStatusValue',
         reason: 'returnExchangeGoodsReviewStatusReason'
@@ -8622,7 +8626,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
-      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
+      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -9457,6 +9462,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       AGREE_REFUND_STATUS: processCallBackStatus,
       REJECT_REFUND_STATUS: processCallBackStatus,
       ERP_AFTER_SALE_STATUS: processCallBackStatus,
+      ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
       AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
       REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
@@ -9467,6 +9473,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
@@ -11648,7 +11655,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search, {
-    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接，标题' : '商品ID' : '宝贝标题',
+    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -13163,7 +13170,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     platform = _props$platform === void 0 ? '' : _props$platform,
     onJumpPage = props.onJumpPage,
     _props$showReason = props.showReason,
-    showReason = _props$showReason === void 0 ? false : _props$showReason;
+    showReason = _props$showReason === void 0 ? false : _props$showReason,
+    _props$preCreateAndNo = props.preCreateAndNotModified,
+    preCreateAndNotModified = _props$preCreateAndNo === void 0 ? false : _props$preCreateAndNo;
   var _useState = useState(function () {
       return (value === null || value === void 0 ? void 0 : value.interceptCompany) || undefined;
     }),
@@ -13264,6 +13273,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
+  var canEditPreCreateBaseFields = preCreateAndNotModified;
+  var baseFieldDisabled = disabled || isEdit && !canEditPreCreateBaseFields;
   //退回地址列表
   var logisticsAddressOptions = useMemo(function () {
     return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
@@ -13298,13 +13309,26 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
+      var _props$interceptTypeD, _defaultInterceptType;
       var interceptCompany = expressInterceptData.find(function (item) {
         return item.value === val;
       });
-      var _returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        var _item$config4;
-        return item === null || item === void 0 ? void 0 : (_item$config4 = item.config) === null || _item$config4 === void 0 ? void 0 : _item$config4.isDefault;
-      });
+      // 优先使用配置的默认值
+      var defaultInterceptType;
+      var configuredDefault = (_props$interceptTypeD = props.interceptTypeDefaults) === null || _props$interceptTypeD === void 0 ? void 0 : _props$interceptTypeD[val];
+      if (configuredDefault) {
+        // 使用配置的默认值
+        defaultInterceptType = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
+          return item.value === configuredDefault;
+        });
+      }
+      // 如果没有配置默认值，使用原有的 isDefault 逻辑
+      if (!defaultInterceptType) {
+        defaultInterceptType = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
+          var _item$config4;
+          return item === null || item === void 0 ? void 0 : (_item$config4 = item.config) === null || _item$config4 === void 0 ? void 0 : _item$config4.isDefault;
+        });
+      }
       // const demoList = [
       //   {
       //     city: 330100,
@@ -13328,7 +13352,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       });
       newValue = _objectSpread2(_objectSpread2({}, newValue), {}, {
         interceptCompany: val,
-        interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value,
+        interceptType: (_defaultInterceptType = defaultInterceptType) === null || _defaultInterceptType === void 0 ? void 0 : _defaultInterceptType.value,
         interceptSenderMobile: undefined,
         interceptAddress: [],
         interceptDetail: undefined,
@@ -13400,7 +13424,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(ApaasLogistics, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -13414,7 +13438,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       var _e$target$value;
@@ -13439,7 +13463,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     key: 'interceptLogisticsUserKCode',
     hidden: !showKcode
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u9009\u62E9K\u7801",
     showSearch: true,
     style: {
@@ -13473,7 +13497,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     style: {
       width: '200px'
     },
@@ -13626,7 +13650,8 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
     disabled = props.disabled,
     onChange = props.onChange,
     isEditing = props.isEditing,
-    effects = props.effects;
+    effects = props.effects,
+    interceptTypeDefaults = props.interceptTypeDefaults;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -13672,7 +13697,8 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
       onJumpPage: effects === null || effects === void 0 ? void 0 : effects.onJumpPage,
       onChange: function onChange(val) {
         return handleChange(val, index);
-      }
+      },
+      interceptTypeDefaults: interceptTypeDefaults
     }) : null;
   }) : null);
 };
@@ -14115,9 +14141,9 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
   var expressDateInstance = ExpressData.getInstance(platformType);
-  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
+  var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -14235,8 +14261,7 @@ var jstGoods = function jstGoods(props) {
       return option.label.includes(input);
     },
     style: {
-      minWidth: '100px',
-      maxWidth: '180px'
+      width: '180px'
     },
     platformType: platformType
   })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
@@ -15718,6 +15743,122 @@ var jkyColumns = [{
   }
 }];
 
+var getYesOrNo$3 = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var wlnColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodBarcode',
+  title: '商品条码',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specNo',
+  title: "SKU\u7F16\u7801",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
+  title: "SKU \u56FE\u7247",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 30,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'specBarcode',
+  title: '规格条码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'unitName',
+  title: '基本单位',
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$3(val === 'combine'));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
@@ -15726,7 +15867,8 @@ var getColumnsMap = function getColumnsMap() {
     bse3: bse3Columns,
     km: kmColumns,
     jy: jyColumns,
-    jky: jkyColumns
+    jky: jkyColumns,
+    wln: wlnColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -16158,30 +16300,33 @@ var GoodList = function GoodList(props, ref) {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== uniqueKey;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
-        }))));
+        var changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
-        })));
+        var _changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds(difference(selectIds, _changeKeys));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
         });
         setSelect(list);
       }
@@ -16189,11 +16334,12 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== uniqueKey;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
       }));
     };
     var showColumns = [{
@@ -16217,7 +16363,9 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: function rowKey(record) {
+        return "".concat(record.goodNo, "-").concat(record.specNo);
+      },
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16247,7 +16395,9 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: function rowKey(record) {
+      return "".concat(record.goodNo, "-").concat(record.specNo);
+    },
     columns: columns,
     scroll: {
       x: '100%',
@@ -17797,6 +17947,27 @@ var componentMap$1 = {
       onChange: props.handleChange
     }));
   },
+  TagsSelect: function TagsSelect(props) {
+    return "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name).length > 10 ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name)
+    }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }))) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }));
+  },
   Date: function Date(props) {
     return /*#__PURE__*/React.createElement(RangePicker, _objectSpread2(_objectSpread2({
       placeholder: ["".concat(props.name, "\u5F00\u59CB\u65F6\u95F4"), "".concat(props.name, "\u7ED3\u675F\u65F6\u95F4")],
@@ -18739,7 +18910,7 @@ var getTableData$5 = function getTableData(_ref, formData) {
     data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP',
+      platform: 'WLN_ERP',
       conditionList: conditionList
     }
   }).then(function (res) {
@@ -18758,13 +18929,11 @@ var getTableData$5 = function getTableData(_ref, formData) {
   });
 };
 var searchFormData$4 = [{
-  label: '规格名称',
-  name: 'skuName',
-  dataIndex: 'specName'
+  label: '规格值',
+  name: 'propertiesValue'
 }, {
-  label: '规格编码',
-  name: 'skuCode',
-  dataIndex: 'specNo',
+  label: 'SKU编码',
+  name: 'specNo',
   type: 'optionalInput'
 }, {
   label: '商品名称',
@@ -18773,6 +18942,23 @@ var searchFormData$4 = [{
   label: '商品编码',
   name: 'goodNo',
   type: 'optionalInput'
+}, {
+  label: '是否组合装',
+  name: 'skuType',
+  type: 'select',
+  formItemProps: {
+    mode: 'multiple',
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    },
+    options: [{
+      label: '普通商品',
+      value: 'normal'
+    }, {
+      label: '组合装商品',
+      value: 'combine'
+    }]
+  }
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18783,7 +18969,7 @@ var GoodList$5 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('jy'),
+  var _useGetColumns = useGetColumns('wln'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -18842,8 +19028,8 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.id || row.specId;
-        }).includes(record.id || record.specId),
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
         name: record.id
       };
       return options;
@@ -18927,9 +19113,9 @@ var GoodList$5 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
+var WlnGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
 
-var JyGoodsModal = function JyGoodsModal(props, ref) {
+var WlnGoodsModal = function WlnGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -18949,13 +19135,13 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedRows = _useState4[0],
     setSelectedRows = _useState4[1];
-  var jyGoodsListRef = useRef(null);
+  var jkyGoodsListRef = useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _jyGoodsListRef$curre;
-    var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
+    var _jkyGoodsListRef$curr;
+    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -18970,12 +19156,12 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(JyGoodsList, {
-    ref: jyGoodsListRef,
+  }, /*#__PURE__*/React.createElement(WlnGoodsList, {
+    ref: jkyGoodsListRef,
     selectedRows: selectedRows
   })));
 };
-var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
+var WlnGoodsModal$1 = /*#__PURE__*/forwardRef(WlnGoodsModal);
 
 var getTableData$6 = function getTableData(_ref, formData) {
   var current = _ref.current,
@@ -18986,7 +19172,7 @@ var getTableData$6 = function getTableData(_ref, formData) {
     data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JKY_ERP',
+      platform: 'JY_ERP',
       conditionList: conditionList
     }
   }).then(function (res) {
@@ -19014,10 +19200,10 @@ var searchFormData$5 = [{
   dataIndex: 'specNo',
   type: 'optionalInput'
 }, {
-  label: '货品名称',
+  label: '商品名称',
   name: 'goodName'
 }, {
-  label: '货品编码',
+  label: '商品编码',
   name: 'goodNo',
   type: 'optionalInput'
 }];
@@ -19030,7 +19216,7 @@ var GoodList$6 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('jky'),
+  var _useGetColumns = useGetColumns('jy'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -19089,8 +19275,8 @@ var GoodList$6 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.specId || record.id;
-        }).includes(record.specId || record.id),
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
         name: record.id
       };
       return options;
@@ -19174,9 +19360,9 @@ var GoodList$6 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
+var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
 
-var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+var JyGoodsModal = function JyGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -19196,13 +19382,13 @@ var JkyGoodsModal = function JkyGoodsModal(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedRows = _useState4[0],
     setSelectedRows = _useState4[1];
-  var jkyGoodsListRef = useRef(null);
+  var jyGoodsListRef = useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _jkyGoodsListRef$curr;
-    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
+    var _jyGoodsListRef$curre;
+    var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -19217,37 +19403,284 @@ var JkyGoodsModal = function JkyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(JkyGoodsList, {
-    ref: jkyGoodsListRef,
+  }, /*#__PURE__*/React.createElement(JyGoodsList, {
+    ref: jyGoodsListRef,
     selectedRows: selectedRows
   })));
 };
-var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
+var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
 
-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,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
+var getTableData$7 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: {
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JKY_ERP',
+      conditionList: conditionList
+    }
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$6 = [{
+  label: '规格名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: '规格编码',
+  name: 'skuCode',
+  dataIndex: 'specNo',
+  type: 'optionalInput'
+}, {
+  label: '货品名称',
+  name: 'goodName'
+}, {
+  label: '货品编码',
+  name: 'goodNo',
+  type: 'optionalInput'
+}];
+var GoodList$7 = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jky'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$7, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
+        name: record.id
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$6,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    className: "GoodModalColumns",
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    },
+    size: "small"
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$7);
+
+var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open(shopCode) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        setVisible(true);
+        setSelectedRows(options.value || []);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var jkyGoodsListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _jkyGoodsListRef$curr;
+    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(JkyGoodsList, {
+    ref: jkyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
+
+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,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
@@ -20481,70 +20914,319 @@ var getColumns$2 = function getColumns(_ref) {
       ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'refundAmount',
-      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
-      width: 150,
+      dataIndex: 'refundAmount',
+      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'num',
+      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u4EF7\u683C",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'originalPrice',
+      title: "\u539F\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'giftTypeDesc',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+var getYesOrNo$4 = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
+function toNum$1(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$3 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //万里牛商品信息
+    WLN_GOODS: [{
+      dataIndex: 'wlnItemName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'wlnSkuName',
+      title: "sku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "sku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7EBF\u4E0Asku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'olnSkuCode',
+      title: "\u7EBF\u4E0Asku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sku',
+      title: "\u7EBF\u4E0Asku id",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'name',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: "\u7EBF\u4E0A\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'olnItemCode',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u7EBF\u4E0A\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'barCode',
+      title: "\u5546\u54C1\u6761\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'number',
+      title: "".concat(text, "\u6570\u91CF"),
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'number');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'share',
+      title: "\u5E94\u6536\u6B3E",
+      align: 'center',
+      ellipsis: true,
+      width: 70,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'discountedUnitPrice',
+      title: "\u6298\u540E\u5355\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'price');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'receivable',
+      title: "\u9500\u552E\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'receivable');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'type');
+          },
+          options: [{
+            label: '赠品',
+            value: 1
+          }, {
+            label: '非赠品',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
+    }, {
+      dataIndex: 'isPackage',
+      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      width: 200,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isPackage');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
     }, {
-      dataIndex: 'num',
-      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
-      width: 150,
+      dataIndex: 'hasRefund',
+      title: "\u662F\u5426\u9000\u6B3E",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      width: 100,
+      render: function render(val) {
+        return getYesOrNo$4(val);
+      }
     }, {
-      dataIndex: 'price',
-      title: "\u4EF7\u683C",
-      width: 150,
+      dataIndex: 'unit',
+      title: "\u5355\u4F4D",
       align: 'center',
       ellipsis: true,
+      width: 100,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'originalPrice',
-      title: "\u539F\u4EF7",
-      width: 150,
+      dataIndex: 'pkgGoodsName',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'giftTypeDesc',
-      title: "\u8D60\u54C1\u7C7B\u578B",
-      width: 150,
+      dataIndex: 'pkgGoodsCode',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'unitName',
-      title: "\u57FA\u672C\u5355\u4F4D",
-      ellipsis: true,
-      width: 150,
+      dataIndex: 'pkgGoodsId',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1id",
       align: 'center',
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'auxUnitName',
-      title: "\u8F85\u52A9\u5355\u4F4D",
       ellipsis: true,
-      width: 150,
-      align: 'center',
+      width: 200,
       render: renderTextEllipsis
-    }]
-  };
-};
-
-var getYesOrNo$3 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
-var getColumns$3 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? '' : _ref$text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //万里牛商品信息
-    WLN_GOODS: [{
+    }],
+    WLN_REISSUE_GOODS: [{
       dataIndex: 'wlnItemName',
       title: "\u5546\u54C1\u540D\u79F0",
       align: 'center',
@@ -20552,8 +21234,8 @@ var getColumns$3 = function getColumns(_ref) {
       width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsCode',
-      title: "\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'wlnSkuName',
+      title: "sku\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250,
@@ -20606,7 +21288,7 @@ var getColumns$3 = function getColumns(_ref) {
         });
       }
     }, {
-      dataIndex: 'olnItemCOde',
+      dataIndex: 'olnItemCode',
       title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
@@ -20627,20 +21309,46 @@ var getColumns$3 = function getColumns(_ref) {
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'money',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 100,
-      render: renderTextEllipsis
+      width: 250,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateHandle(num, index, 'price');
+            if ((num || num === 0) && (record.number || record.number === 0)) updateHandle(num * (record.number || 0), index, 'money');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
       dataIndex: 'number',
       title: "".concat(text, "\u6570\u91CF"),
       align: 'center',
       ellipsis: true,
       width: 100,
+      validator: function validator(_rule, value) {
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.wlnReissueGoods) || []).some(function (goods) {
+          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.number);
+          var res = typeof qty === 'number' ? qty < 1 : true;
+          if (res) {
+            productName = (goods === null || goods === void 0 ? void 0 : goods.wlnItemName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.wlnItemName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
-        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20648,34 +21356,60 @@ var getColumns$3 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'number');
+            updateHandle(num, index, 'number');
+            if ((num || num === 0) && (record.price || record.price === 0)) updateHandle(num * (record.price || 0), index, 'money');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'share',
-      title: "\u5E94\u6536\u6B3E",
-      align: 'center',
-      ellipsis: true,
-      width: 70,
-      render: renderTextEllipsis
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'money');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
     }, {
       dataIndex: 'type',
       title: "\u8D60\u54C1\u7C7B\u578B",
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderTextEllipsis
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'type');
+          },
+          options: [{
+            label: '赠品',
+            value: 1
+          }, {
+            label: '非赠品',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
     }, {
       dataIndex: 'isPackage',
       title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
       ellipsis: true,
+      width: 200,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle(value, index, 'isPackage');
           },
           options: [{
             label: '是',
@@ -20684,9 +21418,36 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
-      },
-      width: 100
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
+    }, {
+      dataIndex: 'unit',
+      title: "\u5355\u4F4D",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsName',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsCode',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsId',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
     }]
   };
 };
@@ -20696,11 +21457,11 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
+var getYesOrNo$5 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
-function toNum$1(value) {
+function toNum$2(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -20811,7 +21572,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -20830,7 +21591,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -20880,7 +21641,7 @@ var getColumns$4 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -20956,7 +21717,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21001,7 +21762,7 @@ var getColumns$4 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -21085,7 +21846,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21102,7 +21863,7 @@ var fillAttrs = function fillAttrs(item) {
   if (!item.align) item.align = 'center';
   return item;
 };
-function toNum$2(value) {
+function toNum$3(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -21342,7 +22103,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -21443,7 +22204,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
+          var v = toNum$3(goods === null || goods === void 0 ? void 0 : goods.salePrice);
           var res = typeof v === 'number' ? v < 0 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -21473,7 +22234,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -21818,7 +22579,7 @@ var getColumns$5 = function getColumns() {
   };
 };
 
-function toNum$3(value) {
+function toNum$4(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -22036,7 +22797,7 @@ var getColumns$6 = function getColumns() {
         if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var realNum = toNum$4(goods === null || goods === void 0 ? void 0 : goods.realNum);
           var res = typeof realNum === 'number' ? realNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -22066,7 +22827,7 @@ var getColumns$6 = function getColumns() {
       validator: function validator(_rule, value) {
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var desiredNum = toNum$4(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
           var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -22227,7 +22988,7 @@ var getColumns$6 = function getColumns() {
       validator: function validator(_rule, value) {
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReturnGoods) || []).some(function (goods) {
-          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var desiredNum = toNum$4(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
           var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -22394,7 +23155,7 @@ var getColumns$6 = function getColumns() {
         if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
-          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var realNum = toNum$4(goods === null || goods === void 0 ? void 0 : goods.realNum);
           var res = typeof realNum === 'number' ? realNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -22427,7 +23188,7 @@ var getColumns$6 = function getColumns() {
       validator: function validator(_rule, value) {
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
-          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var desiredNum = toNum$4(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
           var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -22488,7 +23249,7 @@ var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-function toNum$4(value) {
+function toNum$5(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -22823,7 +23584,7 @@ var getColumns$7 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var productName = '';
         if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var qty = toNum$5(goods === null || goods === void 0 ? void 0 : goods.sellCount);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
@@ -22981,7 +23742,7 @@ var isNumberOrNumberString$4 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-function toNum$5(value) {
+function toNum$6(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -23369,7 +24130,7 @@ var getColumns$9 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jkyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$5(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var qty = toNum$6(goods === null || goods === void 0 ? void 0 : goods.sellCount);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodsName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodsName, "]") : '';
@@ -23805,6 +24566,9 @@ var isErpType = {
   },
   isJky: function isJky(type) {
     return ['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type);
+  },
+  isWln: function isWln(type) {
+    return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -23864,6 +24628,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isWln(type)) {
+    newList = processWlnGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -23946,11 +24717,63 @@ var processJkyGoods$1 = function processJkyGoods(_ref3) {
     });
   });
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref4) {
+var processWlnGoods$1 = function processWlnGoods(_ref4) {
   var list = _ref4.list,
-    type = _ref4.type,
     canUpdateNumber = _ref4.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      goodBarcode = item.goodBarcode,
+      propertiesValue = item.propertiesValue,
+      specNo = item.specNo,
+      specId = item.specId,
+      specImgUrl = item.specImgUrl,
+      specBarcode = item.specBarcode,
+      brandName = item.brandName,
+      retailPrice = item.retailPrice,
+      marketPrice = item.marketPrice,
+      unitName = item.unitName,
+      skuType = item.skuType;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      wlnItemName: goodName,
+      goodsCode: goodNo,
+      wlnSkuName: propertiesValue,
+      skuCode: specNo,
+      // skuName: '', // "线上sku名称",
+      // olnSkuCode: '', // "线上sku编码",
+      // sku: '', // "线上sku id",
+      // name: '', // "线上商品名称",
+      // pic: '', // "线上图片",
+      // olnItemCOde: '', // "线上商品编码",
+      // code: '', // "线上商品id",
+      barCode: goodBarcode,
+      // money: '', // "实付金额",
+      number: 1,
+      share: '',
+      // discountedUnitPrice: '', // "折后单价",
+      originPrice: marketPrice,
+      price: retailPrice,
+      receivable: +((marketPrice || 0) * (retailPrice || 0)).toFixed(2),
+      // type: '', // "赠品类型",
+      isPackage: skuType === 'combine',
+      // hasRefund: '', // 是否退款,
+      unit: unitName,
+      // pkgGoodsName: '', // "原组合商品名称",
+      // pkgGoodsCode: '', // "原组合商品编码",
+      // pkgGoodsId: '', // "原组合商品id",
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref5) {
+  var list = _ref5.list,
+    type = _ref5.type,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
@@ -23968,9 +24791,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref4) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
-  var list = _ref5.list,
-    canUpdateNumber = _ref5.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
+  var list = _ref6.list,
+    canUpdateNumber = _ref6.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -24005,9 +24828,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref6) {
-  var list = _ref6.list,
-    source = _ref6.source;
+var processGyGoods$1 = function processGyGoods(_ref7) {
+  var list = _ref7.list,
+    source = _ref7.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -24034,8 +24857,8 @@ var processGyGoods$1 = function processGyGoods(_ref6) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref7) {
-  var list = _ref7.list;
+var processJstGoods$1 = function processJstGoods(_ref8) {
+  var list = _ref8.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -24053,9 +24876,9 @@ var processJstGoods$1 = function processJstGoods(_ref7) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref8) {
-  var list = _ref8.list,
-    type = _ref8.type;
+var processKmGoods$1 = function processKmGoods(_ref9) {
+  var list = _ref9.list,
+    type = _ref9.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -24094,9 +24917,9 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref9) {
-  var list = _ref9.list,
-    canUpdateNumber = _ref9.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref10) {
+  var list = _ref10.list,
+    canUpdateNumber = _ref10.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -24145,6 +24968,8 @@ var GoodsModalMap = {
   JY_REISSUE_GOODS: JyGoodsModal$1,
   JKY_GOODS: JkyGoodsModal$1,
   JKY_REISSUE_GOODS: JkyGoodsModal$1,
+  WLN_REISSUE_GOODS: WlnGoodsModal$1,
+  WLN_GOODS: WlnGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -24159,6 +24984,7 @@ var systemOrderNoMap = {
   JY_REISSUE_GOODS: 'tradeNo',
   JKY_GOODS: 'tradeNo',
   JKY_REISSUE_GOODS: 'tradeNo',
+  WLN_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   KM_RETURN_GOODS: 'sid',
   KM_EXCHANGE_GOODS: 'sid',
@@ -24416,6 +25242,9 @@ var getButtonText = function getButtonText() {
   if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
     return '选择吉客云ERP商品';
   }
+  if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
+    return '选择万里牛ERP商品';
+  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -24475,8 +25304,8 @@ var GoodItem$1 = function GoodItem(props) {
   var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   // 判断是否为是否展示系统单筛选项
-  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
-  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -24571,6 +25400,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JY_REISSUE_GOODS':
         case 'JKY_GOODS':
         case 'JKY_REISSUE_GOODS':
+        case 'WLN_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -24830,6 +25660,7 @@ var GoodItem$1 = function GoodItem(props) {
     templateDetail: templateDetail
   }));
 };
+GoodItem$1.displayName = 'GoodItem';
 
 var BsGoods = function BsGoods(props) {
   var _withInfo$current3, _withInfo$current4;
@@ -25667,6 +26498,7 @@ var jstUtils = {
 
 var singletonMap$4 = new Map();
 var getOrderListSingleton = function getOrderListSingleton(orderNo) {
+  var isSplit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!singletonMap$4.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
@@ -25677,10 +26509,15 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/order/wlnOrderList', {
         method: 'post',
         data: {
-          billCode: orderNo
+          billCode: orderNo,
+          isSplit: isSplit
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data;
+          if ((_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.tradeNo) {
+            data.data.tradeNo = orderNo;
+          }
           resolve(data.data);
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
@@ -27666,6 +28503,38 @@ var componentMap$2 = {
     },
     getOrderList: jkyUtils.getJkyOrderListSingleton
   },
+  WLN_GOODS: {
+    type: 'jky',
+    key: 'wlnGoods',
+    name: '吉客云',
+    orderNo: 'tradeNo',
+    goodDetailOrderNo: 'tpTid',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'wlnType',
+      updateGoodsHandle: updateWlnGoodsHandle,
+      selectListReturn: 'wlnSelectListReturn',
+      selectList: 'wlnSelectList',
+      reissueSelectList: 'wlnReissueSelectList',
+      reissueSelectListReturn: 'wlnReissueSelectListReturn',
+      reissueDeleteGood: 'wlnReissueDeleteGood',
+      changeShopCode: 'wlnChangeShopCode',
+      reissueType: 'wlnReissueType',
+      returnType: 'wlnReturnType',
+      returnSelectListReturn: 'wlnReturnSelectListReturn',
+      returnSelectList: 'wlnReturnSelectList',
+      deleteGood: 'wlnDeleteGood',
+      returnDeleteGood: 'wlnReturnDeleteGood',
+      exchangeDeleteGood: 'wlnExchangeDeleteGood'
+    },
+    getOrderList: wlnUtils.getOrderListSingleton,
+    checkShowModeBtn: function checkShowModeBtn(value) {
+      var _value$allOrders;
+      return value === null || value === void 0 ? void 0 : (_value$allOrders = value.allOrders) === null || _value$allOrders === void 0 ? void 0 : _value$allOrders.some(function (order) {
+        return order === null || order === void 0 ? void 0 : order.tpTid.includes('|');
+      });
+    }
+  },
   WDT_AFTERSALE_GOODS: {
     type: 'wdtAftersale',
     key: 'wdtAftersaleGoods',
@@ -27697,14 +28566,14 @@ var componentMap$2 = {
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _withInfo$current3, _withInfo$current4, _componentMap$compTyp6;
+  var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
   // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
-  var showModeBtn = !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
+  var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
     return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$2[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
   });
@@ -27948,8 +28817,8 @@ var CommonGoods = function CommonGoods(props) {
     });
     var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
-      var _componentMap$compTyp;
-      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
+      var _componentMap$compTyp2;
+      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
     }) : goodDetails;
   };
   // 找到该订单号下所有商品
@@ -27974,8 +28843,8 @@ var CommonGoods = function CommonGoods(props) {
             //   await getKmSupplier(goodDetails);
             // }
             return _context3.abrupt("return", mode ? goodDetails.filter(function (goodItem) {
-              var _componentMap$compTyp2;
-              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+              var _componentMap$compTyp3;
+              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.goodDetailOrderNo]) === orderNo;
             }) : goodDetails);
           case 7:
           case "end":
@@ -28016,7 +28885,7 @@ var CommonGoods = function CommonGoods(props) {
   }, [value === null || value === void 0 ? void 0 : value.allOrders, value === null || value === void 0 ? void 0 : value.isStrict, value === null || value === void 0 ? void 0 : value.orderNo, compType]);
   var selectedGoodsChange = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(skuList) {
-      var _valueRef$current9, _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+      var _valueRef$current9, _componentMap$compTyp4, _componentMap$compTyp5, _uniqBy;
       var newValue, isStrict, originTradeGoodList, currentSelectGoodList;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -28037,8 +28906,8 @@ var CommonGoods = function CommonGoods(props) {
           case 7:
             originTradeGoodList = _context5.t0;
             // 当前选中的所有商品【包含了原订单+商品库】
-            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
-            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)]) || [];
+            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.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);
@@ -28054,8 +28923,8 @@ var CommonGoods = function CommonGoods(props) {
   }();
   // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _componentMap$compTyp5;
-    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
+    var _componentMap$compTyp6;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
       var list = processAllOrders({
         data: data,
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
@@ -28088,7 +28957,7 @@ var CommonGoods = function CommonGoods(props) {
     isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
     systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
-    showChangeBtn: (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.showChangeBtn,
+    showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     tradeGoods: {
       originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,
@@ -28850,10 +29719,32 @@ var typeMap$2 = {
     goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
+  },
+  WLN_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'wlnReissueGoods',
+    typeName: 'wlnReissueType',
+    systemOrder: 'wlnSystemOrder',
+    systemOrderNo: 'wlnSystemOrderNo',
+    getOrderList: wlnUtils.getOrderListSingleton,
+    updateGoodsHandle: updateWlnGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'tradeNo',
+    outerOiIdKey: 'tpTid',
+    goodDetailsKey: 'items',
+    isShowSelectTradeGoods: true,
+    checkShowModeBtn: function checkShowModeBtn(value) {
+      var _value$wlnSystemOrder, _value$wlnSystemOrder2;
+      var selectOrder = (value === null || value === void 0 ? void 0 : value.wlnSystemOrderNo) && (value === null || value === void 0 ? void 0 : (_value$wlnSystemOrder = value.wlnSystemOrder) === null || _value$wlnSystemOrder === void 0 ? void 0 : (_value$wlnSystemOrder2 = _value$wlnSystemOrder.orders) === null || _value$wlnSystemOrder2 === void 0 ? void 0 : _value$wlnSystemOrder2.find(function (order) {
+        return (value === null || value === void 0 ? void 0 : value.wlnSystemOrderNo) === (order === null || order === void 0 ? void 0 : order.billNo);
+      }));
+      return (selectOrder === null || selectOrder === void 0 ? void 0 : selectOrder.tpTid.includes('|')) || (selectOrder === null || selectOrder === void 0 ? void 0 : selectOrder.tid.includes('|'));
+    }
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type18, _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54, _value$typeMap$type$s9, _typeMap$type55, _typeMap$type56, _typeMap$type57, _typeMap$type58;
+  var _typeMap$type, _typeMap$type2, _typeMap$type20, _typeMap$type38, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _value$typeMap$type$s8, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54, _typeMap$type55, _value$typeMap$type$s9, _typeMap$type56, _typeMap$type57, _typeMap$type58, _typeMap$type59;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -28862,6 +29753,7 @@ var PublicReissue = function PublicReissue(props) {
     type = props.type,
     isSettingConfig = props.isSettingConfig,
     other = _objectWithoutProperties(props, _excluded$m);
+  var showModeBtn = ((_typeMap$type = typeMap$2[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.checkShowModeBtn) ? typeMap$2[type].checkShowModeBtn(value) : !!((_typeMap$type2 = typeMap$2[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.showModeBtn) || false;
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -28869,11 +29761,11 @@ var PublicReissue = function PublicReissue(props) {
     setIsStrict = _useState2[1];
   // TODO: 在修改场景下手动获取一次订单详情中数据
   useEffect(function () {
-    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2, _value$typeMap$type$s4, _typeMap$type3;
-    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) && !(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.isRequest)) {
-      var _value$typeMap$type$s5, _typeMap$type4;
+    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type3, _value$typeMap$type$s3, _typeMap$type4, _value$typeMap$type$s4, _typeMap$type5;
+    if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type3 = typeMap$2[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.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$type4 = typeMap$2[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo) && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.isRequest)) {
+      var _value$typeMap$type$s5, _typeMap$type6;
       getOrderFlag.current = true;
-      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type4 = typeMap$2[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orderNo);
+      getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type6 = typeMap$2[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orderNo, type === 'WLN_REISSUE_GOODS' ? props.orderBackGoodsLevel !== '2' : void 0);
     }
     return;
   }, [value]);
@@ -28903,27 +29795,30 @@ var PublicReissue = function PublicReissue(props) {
   }, []);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      var _typeMap$type5;
+      var _typeMap$type7;
+      var isSplit,
+        _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            (_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
-              var _valueRef$current3, _typeMap$type6, _typeMap$type7, _typeMap$type11, _ref3, _typeMap$type12;
-              var orders = data || [];
+            isSplit = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
+            (_typeMap$type7 = typeMap$2[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.getOrderList(orderNo, isSplit).then(function (data) {
+              var _valueRef$current3, _typeMap$type8, _typeMap$type9, _typeMap$type13, _ref3, _typeMap$type14;
+              var orders = (type === 'WLN_REISSUE_GOODS' ? data === null || data === void 0 ? void 0 : data.orders : data) || [];
               var showOrderInfo = orders === null || orders === void 0 ? void 0 : orders.map(function (orderItem) {
                 return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
               });
               var typeObj = {};
-              var systemOrderNo = valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : _valueRef$current3[(_typeMap$type6 = typeMap$2[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrderNo];
-              if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type7 = typeMap$2[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrderBillType) {
-                var _typeMap$type9, _typeMap$type10;
+              var systemOrderNo = valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : _valueRef$current3[(_typeMap$type8 = typeMap$2[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrderNo];
+              if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type9 = typeMap$2[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.systemOrderBillType) {
+                var _typeMap$type11, _typeMap$type12;
                 var targetOrder = orders.find(function (oItem) {
-                  var _typeMap$type8;
-                  return oItem[(_typeMap$type8 = typeMap$2[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.oIdKey] === systemOrderNo;
+                  var _typeMap$type10;
+                  return oItem[(_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.oIdKey] === systemOrderNo;
                 });
-                typeObj[(_typeMap$type9 = typeMap$2[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type10 = typeMap$2[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.orderTypeKey];
+                typeObj[(_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type12 = typeMap$2[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.orderTypeKey];
               }
-              var newValue = _objectSpread2(_objectSpread2(_objectSpread2({}, valueRef.current || {}), typeObj), {}, _defineProperty({}, (_typeMap$type11 = typeMap$2[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type12 = typeMap$2[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.systemOrder]) || {}), {}, {
+              var newValue = _objectSpread2(_objectSpread2(_objectSpread2({}, valueRef.current || {}), typeObj), {}, _defineProperty({}, (_typeMap$type13 = typeMap$2[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type14 = typeMap$2[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder]) || {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               })));
@@ -28931,7 +29826,7 @@ var PublicReissue = function PublicReissue(props) {
                 onChange(newValue);
               }
             });
-          case 1:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -28942,30 +29837,30 @@ var PublicReissue = function PublicReissue(props) {
     };
   }();
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _typeMap$type13;
+    var _typeMap$type15;
     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$type13 = typeMap$2[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName] = val;
+    newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type14;
-      newValue[(_typeMap$type14 = typeMap$2[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key] = getGoodDetails({
+      var _typeMap$type16;
+      newValue[(_typeMap$type16 = typeMap$2[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type15;
+      var _typeMap$type17;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key] = [];
+      newValue[(_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _value$typeMap$type$t, _typeMap$type16, _typeMap$type17;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type16 = typeMap$2[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0]) === '1';
+    var _value$typeMap$type$t, _typeMap$type18, _typeMap$type19;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.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$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key, getGoodDetails({
       mode: mode
     }))));
   };
@@ -28982,7 +29877,7 @@ var PublicReissue = function PublicReissue(props) {
       });
     }
     return map;
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key]]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key]]);
   // 用于跟踪已经处理过的 sysItemId，避免重复处理
   var processedSysItemIdsRef = useRef(new Set());
   useEffect(function () {
@@ -29054,13 +29949,13 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, [sysItemIdMap]);
   var getGoodDetails = function getGoodDetails(_ref5) {
-    var _typeMap$type19, _typeMap$type20, _value$typeMap$type$s6, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
+    var _typeMap$type21, _typeMap$type22, _value$typeMap$type$s6, _typeMap$type23, _typeMap$type24, _typeMap$type25, _typeMap$type26;
     var mode = _ref5.mode,
       sysOrderNo = _ref5.sysOrderNo,
       _ref5$isAllOrders = _ref5.isAllOrders,
       isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[typeMap$2[type].oIdKey] === systemOrderNo;
     });
@@ -29082,13 +29977,17 @@ var PublicReissue = function PublicReissue(props) {
       orderRest = {
         canEdit: true
       };
+    } else if (['WLN_REISSUE_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
-    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
+    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
     });
-    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest, type) : [];
+    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.updateGoodsHandle(orders, orderRest, type) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -29096,30 +29995,30 @@ var PublicReissue = function PublicReissue(props) {
     return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type25;
+    var _typeMap$type27;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
+    var _typeMap$type28, _typeMap$type29, _value$typeMap$type$t2, _typeMap$type34, _value$typeMap$type$t3, _typeMap$type36;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
-      var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
+    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.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderBillType) {
+      var _value$typeMap$type$s7, _typeMap$type30, _typeMap$type32, _typeMap$type33;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type29;
-        return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
+        var _typeMap$type31;
+        return oItem[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.oIdKey] === val;
       });
-      newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
+      newValue[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.orderTypeKey];
     }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type33;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
       var _typeMap$type35;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type37;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -29127,27 +30026,27 @@ var PublicReissue = function PublicReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.systemOrderNo]);
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
+    var _typeMap$type39, _typeMap$type40, _typeMap$type41, _uniqBy, _typeMap$type42;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict,
-      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
+      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      var _typeMap$type41;
-      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type43;
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.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$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.key) || "".concat(Date.now())
   }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
@@ -29163,12 +30062,12 @@ var PublicReissue = function PublicReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -29190,11 +30089,11 @@ var PublicReissue = function PublicReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -29203,7 +30102,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React.createElement(Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -29214,25 +30113,25 @@ var PublicReissue = function PublicReissue(props) {
     canUpdateNumber: showChangeBtn,
     hasSelectedSystemOrder: showChangeBtn,
     // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.alwaysShowChooseErpGoodsBtn,
+    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.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$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
-    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.showModeBtn),
+    showModeBtn: showModeBtn,
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
-    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.systemOrderNo)]] : [],
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type58 = typeMap$2[type]) === null || _typeMap$type58 === void 0 ? void 0 : _typeMap$type58.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type58 = typeMap$2[type]) === null || _typeMap$type58 === void 0 ? void 0 : _typeMap$type58.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type59 = typeMap$2[type]) === null || _typeMap$type59 === void 0 ? void 0 : _typeMap$type59.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -29600,7 +30499,7 @@ var GoodsModal$5 = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search$1, {
-    placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
+    placeholder: "\u5B9D\u8D1D\u6807\u9898",
     allowClear: true,
     enterButton: "\u641C\u7D22",
     style: {