@kmkf-fe-packages/basic-components 2.2.13-beta.86 → 2.2.13-beta.91

package/dist/index.esm.js

@@ -8810,9 +8810,6 @@ var processBsExchangeGoods = function processBsExchangeGoods(getValue) {
     var bsExchangeType = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : []);
     var bsExchangeReturnGoods = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeReturnGoods")), []);
     var bsExchangeSwapOutGoods = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeSwapOutGoods")), []);
-    console.log('bsExchangeType', bsExchangeType);
-    console.log('bsExchangeReturnGoods', bsExchangeReturnGoods);
-    console.log('bsExchangeSwapOutGoods', bsExchangeSwapOutGoods);
     //补发组装数据
     if ((bsExchangeType === null || bsExchangeType === void 0 ? void 0 : bsExchangeType.length) && ['2', '4'].includes(bsExchangeType[0])) {
       var maxLen = maxBy(bsExchangeReturnGoods, function (t) {
@@ -21824,7 +21821,12 @@ var systemOrderNoMap = {
   JST_GOODS: 'oId',
   WLN_GOODS: 'tradeNo',
   JY_GOODS: 'tradeNo',
-  JY_REISSUE_GOODS: 'tradeNo'
+  JY_REISSUE_GOODS: 'tradeNo',
+  KM_REISSUE_GOODS: 'sid',
+  JST_REISSUE_GOODS: 'oId',
+  GY_REISSUE_GOODS: 'code',
+  BS_E3_REISSUE_GOODS: 'orderSn',
+  WDT_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -21834,14 +21836,19 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     onChangeSelectedKeys = _ref.onChangeSelectedKeys,
     _ref$uniqueKey = _ref.uniqueKey,
     uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
-    _ref$isGoods = _ref.isGoods,
-    isGoods = _ref$isGoods === void 0 ? false : _ref$isGoods,
+    _ref$isShowSelect = _ref.isShowSelect,
+    isShowSelect = _ref$isShowSelect === void 0 ? false : _ref$isShowSelect,
     _ref$systemOrders = _ref.systemOrders,
     systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
     _ref$selectedSystemOr = _ref.selectedSystemOrders,
+    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
+    _ref$validSystemOrder = _ref.validSystemOrder,
+    validSystemOrder = _ref$validSystemOrder === void 0 ? false : _ref$validSystemOrder,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? '' : _ref$type,
-    width = _ref.width;
+    width = _ref.width,
+    _ref$isReissueType = _ref.isReissueType,
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -21851,6 +21858,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
   var openModal = function openModal() {
+    if (validSystemOrder) {
+      message.warning('请选择补发系统单');
+      return;
+    }
     if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       getDataSourceAsync().then(function () {
         setTradeGoodsVisible(true);
@@ -21858,15 +21869,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     } else {
       setTradeGoodsVisible(true);
     }
-    // 暂时先去掉带入系统自订单组件所选值作为默认筛选项
-    // if (isGoods) {
-    //   const codeList: string[] = selectedSystemOrders?.map(
-    //     (item) => item?.[systemOrderNoMap?.[type]],
-    //   );
-    //   setSelectSystemNo(codeList || []);
-    // }
+    // 补发直接传入的是systemNo
+    if (isShowSelect && isReissueType) {
+      setSelectSystemNo(selectedSystemOrders || []);
+    }
   };
-
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -21882,10 +21889,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
-    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item[uniqueKey];
-    }));
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -21910,7 +21913,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     style: {
       maxWidth: '1000px'
     }
-  }, isGoods && /*#__PURE__*/React.createElement(Row, {
+  }, isShowSelect && /*#__PURE__*/React.createElement(Row, {
     style: {
       marginBottom: '12px'
     }
@@ -22014,13 +22017,16 @@ var GoodItem$1 = function GoodItem(props) {
     systemOrders = props.systemOrders,
     selectedSystemOrders = props.selectedSystemOrders,
     _props$templateDetail = props.templateDetail,
-    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
+    _props$hasSelectedSys = props.hasSelectedSystemOrder,
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
   var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
-  // 判断是否为商品信息组件
-  var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_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', 'GY_REISSUE_GOODS', 'KM_REISSUE_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'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -22296,6 +22302,9 @@ var GoodItem$1 = function GoodItem(props) {
     return params;
   }, [tableSelect, selectedRowKeys, value]);
   var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
+  var validSystemOrder = useMemo(function () {
+    return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
+  }, [type, hasSelectedSystemOrder]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
     style: {
       float: 'right'
@@ -22304,7 +22313,8 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React.createElement(SelectTradeGoods, {
-    isGoods: isGoods,
+    validSystemOrder: validSystemOrder,
+    isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
     type: type,
     columns: orderModalColumns,
@@ -22314,7 +22324,8 @@ var GoodItem$1 = function GoodItem(props) {
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
     systemOrders: systemOrders,
     selectedSystemOrders: selectedSystemOrders,
-    width: width || 850
+    width: width || 850,
+    isReissueType: isReissueType
   }), showErpGoodsBtn && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -25436,11 +25447,12 @@ var typeMap$1 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: wdtUtils.getWdtOrderListSingleton
+    getOrderList: wdtUtils.getWdtOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s7, _typeMap$type32, _typeMap$type33, _typeMap$type34;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -25469,36 +25481,6 @@ var wdtReissue = function wdtReissue(props) {
     }
     return;
   }, [value]);
-  // useEffect(() => {
-  //   const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
-  //   if (systemOrderNo) {
-  //     if (['1'].includes(value?.[typeMap[type]?.typeName]?.[0])) {
-  //       onChange?.({
-  //         ...value,
-  //         [typeMap[type]?.key]: getGoodDetails({
-  //           mode: isStrict
-  //         })
-  //       })
-  //     }
-  //   }
-  //   return;
-  // }, [value?.[typeMap[type]?.systemOrderNo]]);
-  // const getWdtOrderList = async (orderNo: string) => {
-  //   wdtUtils.getWdtOrderListSingleton(orderNo).then(data => {
-  //     const orders = data?.trades || [];
-  //     const showOrderInfo = orders.map(({ billNo, billType, billTag }: any) => {
-  //       return { billNo, billType, billTag }
-  //     });
-  //     onChange({
-  //       ...value,
-  //       [typeMap[type]?.systemOrder]: {
-  //         ...value[typeMap[type]?.systemOrder],
-  //         showOrderInfo,
-  //         orders,
-  //       },
-  //     });
-  //   })
-  // };
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _typeMap$type5;
@@ -25558,17 +25540,24 @@ var wdtReissue = function wdtReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref3) {
-    var _typeMap$type14, _typeMap$type15, _order$goodDetails;
+    var _typeMap$type14, _typeMap$type15;
     var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+      sysOrderNo = _ref3.sysOrderNo,
+      _ref3$isAllOrders = _ref3.isAllOrders,
+      isAllOrders = _ref3$isAllOrders === void 0 ? false : _ref3$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length) ? updateWdtGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$goodDetails;
+      return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
+    });
+    var goodDetails = hasGoodDetails ? updateWdtGoodsHandle([order]) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.srcTid === orderNo;
     }) : goodDetails;
   };
@@ -25671,7 +25660,8 @@ var wdtReissue = function wdtReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
     onChange: function onChange(val) {
@@ -25680,9 +25670,13 @@ var wdtReissue = function wdtReissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type33 = typeMap$1[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type34 = typeMap$1[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -25706,7 +25700,8 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'items',
     mergeIdenticalGoods: jstMergeIdenticalGoods,
-    uniqueKey: 'uuid'
+    uniqueKey: 'uuid',
+    isShowSelectTradeGoods: true
   },
   JST_RETURN_GOODS: {
     compType: '退货',
@@ -25745,7 +25740,8 @@ var typeMap$2 = {
     oIdKey: 'billNo',
     outerOiIdKey: '',
     goodDetailsKey: 'subOrders',
-    uniqueKey: 'id'
+    uniqueKey: 'id',
+    isShowSelectTradeGoods: true
   },
   JY_REISSUE_GOODS: {
     compType: '补发',
@@ -25764,7 +25760,7 @@ var typeMap$2 = {
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55;
+  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26033,25 +26029,27 @@ var PublicReissue = function PublicReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn || (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.isShowSelectTradeGoods),
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.showErpGoodsBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
+    // showErpGoodsBtn={typeMap?.[type]?.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$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
+    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.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.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$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -26839,11 +26837,12 @@ var typeMap$3 = {
     typeName: 'bsE3ReissueType',
     systemOrder: 'bsE3SystemOrder',
     systemOrderNo: 'bsE3SystemOrderNo',
-    getOrderList: bsE3Utils.getBsE3OrderListSingleton
+    getOrderList: bsE3Utils.getBsE3OrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var bsE3Reissue = function bsE3Reissue(props) {
-  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29;
+  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29, _typeMap$type30, _value$typeMap$type$s7, _typeMap$type31, _typeMap$type32, _typeMap$type33;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26945,17 +26944,24 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type13, _typeMap$type14, _order$orderDetailGet;
+    var _typeMap$type13, _typeMap$type14;
     var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo;
+      sysOrderNo = _ref4.sysOrderNo,
+      _ref4$isAllOrders = _ref4.isAllOrders,
+      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length) ? updateBsE3GoodsHandle([order], 'sharePrice') : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$orderDetailGet;
+      return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
+    });
+    var goodDetails = hasGoodDetails ? updateBsE3GoodsHandle([order], 'sharePrice') : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.originalOrderSn === orderNo;
     }) : goodDetails;
   };
@@ -27056,7 +27062,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type29 = typeMap$3[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
     onChange: function onChange(val) {
@@ -27065,9 +27072,13 @@ var bsE3Reissue = function bsE3Reissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type30 = typeMap$3[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type31 = typeMap$3[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type32 = typeMap$3[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type33 = typeMap$3[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -27096,11 +27107,12 @@ var typeMap$4 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: gyUtils.getGyOrderListSingleton
+    getOrderList: gyUtils.getGyOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _typeMap$type31, _typeMap$type32, _typeMap$type33, _systemOrder$orders, _typeMap$type34, _value$typeMap$type$s9, _typeMap$type35, _typeMap$type36, _typeMap$type37;
+  var _typeMap$type32, _typeMap$type33, _typeMap$type34, _systemOrder$orders, _typeMap$type35, _value$typeMap$type$s9, _typeMap$type36, _typeMap$type37, _typeMap$type38, _typeMap$type39, _value$typeMap$type$s10, _typeMap$type40, _typeMap$type41, _typeMap$type42;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27246,17 +27258,24 @@ var GyReissue = function GyReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref7) {
-    var _ref8, _typeMap$type19, _ref9, _typeMap$type20, _order$details;
+    var _ref8, _typeMap$type19, _ref9, _typeMap$type20;
     var mode = _ref7.mode,
-      sysOrderNo = _ref7.sysOrderNo;
+      sysOrderNo = _ref7.sysOrderNo,
+      _ref7$isAllOrders = _ref7.isAllOrders,
+      isAllOrders = _ref7$isAllOrders === void 0 ? false : _ref7$isAllOrders;
     var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? updateGyGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$details;
+      return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;
+    });
+    var goodDetails = hasGoodDetails ? updateGyGoodsHandle(orders) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || (orderNo || '').includes(goodItem.oid);
     }) : goodDetails;
   };
@@ -27293,25 +27312,26 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _ref12, _typeMap$type29, _typeMap$type30, _uniqBy;
+    var _typeMap$type29, _ref12, _typeMap$type30, _typeMap$type31, _uniqBy;
     pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)]) || [];
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
     // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder];
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrder];
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
   var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
@@ -27331,12 +27351,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       className: styles$6.systemNoDisabled,
       key: item.billNo,
@@ -27360,7 +27380,7 @@ var GyReissue = function GyReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -27370,19 +27390,24 @@ var GyReissue = function GyReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
-    showErpGoodsBtn: showErpGoodsBtn,
-    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
+    // showChangeBtn={showChangeBtn}
+    // showErpGoodsBtn={showErpGoodsBtn}
+    alwaysShowChooseErpGoodsBtn: true,
+    hasSelectedSystemOrder: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type38 = typeMap$4[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type39 = typeMap$4[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s10 = value[(_typeMap$type40 = typeMap$4[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrder]) === null || _value$typeMap$type$s10 === void 0 ? void 0 : _value$typeMap$type$s10.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type41 = typeMap$4[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type42 = typeMap$4[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }

package/dist/index.js

@@ -8825,9 +8825,6 @@ var processBsExchangeGoods = function processBsExchangeGoods(getValue) {
     var bsExchangeType = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeType")), !kmkfUtils.isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : []);
     var bsExchangeReturnGoods = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeReturnGoods")), []);
     var bsExchangeSwapOutGoods = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsExchangeSwapOutGoods")), []);
-    console.log('bsExchangeType', bsExchangeType);
-    console.log('bsExchangeReturnGoods', bsExchangeReturnGoods);
-    console.log('bsExchangeSwapOutGoods', bsExchangeSwapOutGoods);
     //补发组装数据
     if ((bsExchangeType === null || bsExchangeType === void 0 ? void 0 : bsExchangeType.length) && ['2', '4'].includes(bsExchangeType[0])) {
       var maxLen = maxBy__default['default'](bsExchangeReturnGoods, function (t) {
@@ -21839,7 +21836,12 @@ var systemOrderNoMap = {
   JST_GOODS: 'oId',
   WLN_GOODS: 'tradeNo',
   JY_GOODS: 'tradeNo',
-  JY_REISSUE_GOODS: 'tradeNo'
+  JY_REISSUE_GOODS: 'tradeNo',
+  KM_REISSUE_GOODS: 'sid',
+  JST_REISSUE_GOODS: 'oId',
+  GY_REISSUE_GOODS: 'code',
+  BS_E3_REISSUE_GOODS: 'orderSn',
+  WDT_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -21849,14 +21851,19 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     onChangeSelectedKeys = _ref.onChangeSelectedKeys,
     _ref$uniqueKey = _ref.uniqueKey,
     uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
-    _ref$isGoods = _ref.isGoods,
-    isGoods = _ref$isGoods === void 0 ? false : _ref$isGoods,
+    _ref$isShowSelect = _ref.isShowSelect,
+    isShowSelect = _ref$isShowSelect === void 0 ? false : _ref$isShowSelect,
     _ref$systemOrders = _ref.systemOrders,
     systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
     _ref$selectedSystemOr = _ref.selectedSystemOrders,
+    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
+    _ref$validSystemOrder = _ref.validSystemOrder,
+    validSystemOrder = _ref$validSystemOrder === void 0 ? false : _ref$validSystemOrder,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? '' : _ref$type,
-    width = _ref.width;
+    width = _ref.width,
+    _ref$isReissueType = _ref.isReissueType,
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -21866,6 +21873,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
   var openModal = function openModal() {
+    if (validSystemOrder) {
+      antd.message.warning('请选择补发系统单');
+      return;
+    }
     if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       getDataSourceAsync().then(function () {
         setTradeGoodsVisible(true);
@@ -21873,15 +21884,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     } else {
       setTradeGoodsVisible(true);
     }
-    // 暂时先去掉带入系统自订单组件所选值作为默认筛选项
-    // if (isGoods) {
-    //   const codeList: string[] = selectedSystemOrders?.map(
-    //     (item) => item?.[systemOrderNoMap?.[type]],
-    //   );
-    //   setSelectSystemNo(codeList || []);
-    // }
+    // 补发直接传入的是systemNo
+    if (isShowSelect && isReissueType) {
+      setSelectSystemNo(selectedSystemOrders || []);
+    }
   };
-
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -21897,10 +21904,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
-    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item[uniqueKey];
-    }));
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -21925,7 +21928,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     style: {
       maxWidth: '1000px'
     }
-  }, isGoods && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+  }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     style: {
       marginBottom: '12px'
     }
@@ -22029,13 +22032,16 @@ var GoodItem$1 = function GoodItem(props) {
     systemOrders = props.systemOrders,
     selectedSystemOrders = props.selectedSystemOrders,
     _props$templateDetail = props.templateDetail,
-    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
+    _props$hasSelectedSys = props.hasSelectedSystemOrder,
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
   var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
-  // 判断是否为商品信息组件
-  var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_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', 'GY_REISSUE_GOODS', 'KM_REISSUE_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'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -22311,6 +22317,9 @@ var GoodItem$1 = function GoodItem(props) {
     return params;
   }, [tableSelect, selectedRowKeys, value]);
   var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
+  var validSystemOrder = React.useMemo(function () {
+    return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
+  }, [type, hasSelectedSystemOrder]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       float: 'right'
@@ -22319,7 +22328,8 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
-    isGoods: isGoods,
+    validSystemOrder: validSystemOrder,
+    isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
     type: type,
     columns: orderModalColumns,
@@ -22329,7 +22339,8 @@ var GoodItem$1 = function GoodItem(props) {
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
     systemOrders: systemOrders,
     selectedSystemOrders: selectedSystemOrders,
-    width: width || 850
+    width: width || 850,
+    isReissueType: isReissueType
   }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -25451,11 +25462,12 @@ var typeMap$1 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: wdtUtils.getWdtOrderListSingleton
+    getOrderList: wdtUtils.getWdtOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s7, _typeMap$type32, _typeMap$type33, _typeMap$type34;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -25484,36 +25496,6 @@ var wdtReissue = function wdtReissue(props) {
     }
     return;
   }, [value]);
-  // useEffect(() => {
-  //   const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
-  //   if (systemOrderNo) {
-  //     if (['1'].includes(value?.[typeMap[type]?.typeName]?.[0])) {
-  //       onChange?.({
-  //         ...value,
-  //         [typeMap[type]?.key]: getGoodDetails({
-  //           mode: isStrict
-  //         })
-  //       })
-  //     }
-  //   }
-  //   return;
-  // }, [value?.[typeMap[type]?.systemOrderNo]]);
-  // const getWdtOrderList = async (orderNo: string) => {
-  //   wdtUtils.getWdtOrderListSingleton(orderNo).then(data => {
-  //     const orders = data?.trades || [];
-  //     const showOrderInfo = orders.map(({ billNo, billType, billTag }: any) => {
-  //       return { billNo, billType, billTag }
-  //     });
-  //     onChange({
-  //       ...value,
-  //       [typeMap[type]?.systemOrder]: {
-  //         ...value[typeMap[type]?.systemOrder],
-  //         showOrderInfo,
-  //         orders,
-  //       },
-  //     });
-  //   })
-  // };
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _typeMap$type5;
@@ -25573,17 +25555,24 @@ var wdtReissue = function wdtReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref3) {
-    var _typeMap$type14, _typeMap$type15, _order$goodDetails;
+    var _typeMap$type14, _typeMap$type15;
     var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+      sysOrderNo = _ref3.sysOrderNo,
+      _ref3$isAllOrders = _ref3.isAllOrders,
+      isAllOrders = _ref3$isAllOrders === void 0 ? false : _ref3$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length) ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$goodDetails;
+      return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.srcTid === orderNo;
     }) : goodDetails;
   };
@@ -25686,7 +25675,8 @@ var wdtReissue = function wdtReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
     onChange: function onChange(val) {
@@ -25695,9 +25685,13 @@ var wdtReissue = function wdtReissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type33 = typeMap$1[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type34 = typeMap$1[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -25721,7 +25715,8 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'items',
     mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
-    uniqueKey: 'uuid'
+    uniqueKey: 'uuid',
+    isShowSelectTradeGoods: true
   },
   JST_RETURN_GOODS: {
     compType: '退货',
@@ -25760,7 +25755,8 @@ var typeMap$2 = {
     oIdKey: 'billNo',
     outerOiIdKey: '',
     goodDetailsKey: 'subOrders',
-    uniqueKey: 'id'
+    uniqueKey: 'id',
+    isShowSelectTradeGoods: true
   },
   JY_REISSUE_GOODS: {
     compType: '补发',
@@ -25779,7 +25775,7 @@ var typeMap$2 = {
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55;
+  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26048,25 +26044,27 @@ var PublicReissue = function PublicReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn || (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.isShowSelectTradeGoods),
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.showErpGoodsBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
+    // showErpGoodsBtn={typeMap?.[type]?.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$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
+    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.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.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$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -26854,11 +26852,12 @@ var typeMap$3 = {
     typeName: 'bsE3ReissueType',
     systemOrder: 'bsE3SystemOrder',
     systemOrderNo: 'bsE3SystemOrderNo',
-    getOrderList: bsE3Utils.getBsE3OrderListSingleton
+    getOrderList: bsE3Utils.getBsE3OrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var bsE3Reissue = function bsE3Reissue(props) {
-  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29;
+  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29, _typeMap$type30, _value$typeMap$type$s7, _typeMap$type31, _typeMap$type32, _typeMap$type33;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26960,17 +26959,24 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type13, _typeMap$type14, _order$orderDetailGet;
+    var _typeMap$type13, _typeMap$type14;
     var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo;
+      sysOrderNo = _ref4.sysOrderNo,
+      _ref4$isAllOrders = _ref4.isAllOrders,
+      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length) ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$orderDetailGet;
+      return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.originalOrderSn === orderNo;
     }) : goodDetails;
   };
@@ -27071,7 +27077,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type29 = typeMap$3[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
     onChange: function onChange(val) {
@@ -27080,9 +27087,13 @@ var bsE3Reissue = function bsE3Reissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type30 = typeMap$3[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type31 = typeMap$3[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type32 = typeMap$3[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type33 = typeMap$3[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -27111,11 +27122,12 @@ var typeMap$4 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: gyUtils.getGyOrderListSingleton
+    getOrderList: gyUtils.getGyOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _typeMap$type31, _typeMap$type32, _typeMap$type33, _systemOrder$orders, _typeMap$type34, _value$typeMap$type$s9, _typeMap$type35, _typeMap$type36, _typeMap$type37;
+  var _typeMap$type32, _typeMap$type33, _typeMap$type34, _systemOrder$orders, _typeMap$type35, _value$typeMap$type$s9, _typeMap$type36, _typeMap$type37, _typeMap$type38, _typeMap$type39, _value$typeMap$type$s10, _typeMap$type40, _typeMap$type41, _typeMap$type42;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27261,17 +27273,24 @@ var GyReissue = function GyReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref7) {
-    var _ref8, _typeMap$type19, _ref9, _typeMap$type20, _order$details;
+    var _ref8, _typeMap$type19, _ref9, _typeMap$type20;
     var mode = _ref7.mode,
-      sysOrderNo = _ref7.sysOrderNo;
+      sysOrderNo = _ref7.sysOrderNo,
+      _ref7$isAllOrders = _ref7.isAllOrders,
+      isAllOrders = _ref7$isAllOrders === void 0 ? false : _ref7$isAllOrders;
     var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? kmkfUtils.updateGyGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$details;
+      return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateGyGoodsHandle(orders) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || (orderNo || '').includes(goodItem.oid);
     }) : goodDetails;
   };
@@ -27308,25 +27327,26 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _ref12, _typeMap$type29, _typeMap$type30, _uniqBy;
+    var _typeMap$type29, _ref12, _typeMap$type30, _typeMap$type31, _uniqBy;
     kmkfUtils.pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)]) || [];
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
     // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder];
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrder];
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
   var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
@@ -27346,12 +27366,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       className: styles$6.systemNoDisabled,
       key: item.billNo,
@@ -27375,7 +27395,7 @@ var GyReissue = function GyReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -27385,19 +27405,24 @@ var GyReissue = function GyReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
-    showErpGoodsBtn: showErpGoodsBtn,
-    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
+    // showChangeBtn={showChangeBtn}
+    // showErpGoodsBtn={showErpGoodsBtn}
+    alwaysShowChooseErpGoodsBtn: true,
+    hasSelectedSystemOrder: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type38 = typeMap$4[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type39 = typeMap$4[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s10 = value[(_typeMap$type40 = typeMap$4[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrder]) === null || _value$typeMap$type$s10 === void 0 ? void 0 : _value$typeMap$type$s10.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type41 = typeMap$4[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type42 = typeMap$4[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -19,6 +19,7 @@ interface BsGoodsProps {
     shopId: string | number;
     maxLength: number;
     showChangeBtn: boolean;
+    hasSelectedSystemOrder: boolean;
     showErpGoodsBtn: boolean;
     showModeBtn: boolean;
     alwaysShowChooseErpGoodsBtn?: boolean;
@@ -56,12 +57,14 @@ type SelectTradeGoodsProps = {
     uniqueKey?: string;
     selectedRowKeys: Array<React.Key>;
     onChangeSelectedKeys: (p: React.Key[]) => void;
-    isGoods?: boolean;
+    isShowSelect?: boolean;
     systemOrders?: any[];
     selectedSystemOrders?: any[];
     type?: string;
     width?: number;
+    validSystemOrder?: boolean;
+    isReissueType?: boolean;
 };
-export declare const SelectTradeGoods: ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isGoods, systemOrders, selectedSystemOrders, type, width, }: SelectTradeGoodsProps) => React.JSX.Element;
+export declare const SelectTradeGoods: ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, }: SelectTradeGoodsProps) => React.JSX.Element;
 declare const GoodItem: (props: MakeRequired<Partial<BsGoodsProps>, 'useGoodsSourceFormat'>) => React.JSX.Element;
 export default GoodItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.86",
+  "version": "2.2.13-beta.91",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.86",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.87",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "435d3fcd1e904b78057e2b697529e547aace331c"
+  "gitHead": "fafcb503a0efccb5d5f8219bea798faf6f392879"
 }