@kmkf-fe-packages/basic-components 2.0.78 → 2.0.79-beta.10

package/README.md

@@ -19,4 +19,4 @@ yarn start
 - config 公共方法
 - assets 静态资源
 
-111111
+1111111

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject, isEmpty, intersection } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -13607,6 +13607,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -15808,7 +15809,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16084,7 +16085,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16193,7 +16194,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -17003,6 +17004,14 @@ var GoodsModalMap = {
   KM_REISSUE_GOODS: KmGoodsModal,
   OTHER_GOODS: GoodsModal$2
 };
+var systemOrderNoMap = {
+  GY_GOODS: 'code',
+  KM_GOODS: 'sid',
+  WDT_GOODS: 'tradeNo',
+  BS_E3_GOODS: 'orderSn',
+  JST_GOODS: 'oId',
+  WLN_GOODS: 'tradeNo'
+};
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -17010,35 +17019,59 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     selectedRowKeys = _ref.selectedRowKeys,
     onChangeSelectedKeys = _ref.onChangeSelectedKeys,
     _ref$uniqueKey = _ref.uniqueKey,
-    uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey;
-  var _useState = useState(false),
+    uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
+    _ref$isGoods = _ref.isGoods,
+    isGoods = _ref$isGoods === void 0 ? false : _ref$isGoods,
+    _ref$systemOrders = _ref.systemOrders,
+    systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
+    _ref$selectedSystemOr = _ref.selectedSystemOrders,
+    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? '' : _ref$type,
+    width = _ref.width;
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
-    tradeGoodsVisible = _useState2[0],
-    setTradeGoodsVisible = _useState2[1];
+    selectSystemNo = _useState2[0],
+    setSelectSystemNo = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tradeGoodsVisible = _useState4[0],
+    setTradeGoodsVisible = _useState4[1];
   var openModal = function openModal() {
-    if (getDataSourceAsync) {
+    if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       getDataSourceAsync().then(function () {
         setTradeGoodsVisible(true);
       });
     } else {
       setTradeGoodsVisible(true);
     }
+    if (isGoods) {
+      var codeList = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : selectedSystemOrders.map(function (item) {
+        return item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]];
+      });
+      setSelectSystemNo(codeList || []);
+    }
   };
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
-  var currentTradeOriginGoods = intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+  var filterDataSource = useMemo(function () {
+    return (selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.length) ? dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
+      return selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.includes(item.systemOrderNo);
+    }) : dataSource;
+  }, [dataSource, selectSystemNo]);
+  var currentTradeOriginGoods = intersection(filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }), selectedRowKeys);
-  var unCurrentTradeOriginGoods = difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+  var unCurrentTradeOriginGoods = difference(selectedRowKeys, filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    // console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
+    fixed: true,
     onChange: handleChangeSelectedKeys
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
@@ -17048,18 +17081,41 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     title: "\u8BA2\u5355\u5546\u54C1",
     visible: tradeGoodsVisible,
     footer: null,
-    onCancel: closeModal
-  }, /*#__PURE__*/React.createElement(Table, {
+    onCancel: closeModal,
+    width: width || 850
+  }, isGoods && /*#__PURE__*/React.createElement(Row, {
+    style: {
+      marginBottom: '20px'
+    }
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, /*#__PURE__*/React.createElement(Select, {
+    placeholder: "\u7B5B\u9009\u7CFB\u7EDF\u8BA2\u5355\u5546\u54C1",
+    style: {
+      width: '100%'
+    },
+    mode: "multiple",
+    value: selectSystemNo,
+    onChange: function onChange(val) {
+      return setSelectSystemNo(val);
+    },
+    options: systemOrders === null || systemOrders === void 0 ? void 0 : systemOrders.map(function (item) {
+      return {
+        label: item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]],
+        value: item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]]
+      };
+    })
+  }))), /*#__PURE__*/React.createElement(Table, {
     rowKey: uniqueKey,
     rowSelection: rowSelection,
     columns: columns,
-    dataSource: dataSource,
+    dataSource: filterDataSource,
     pagination: false,
     scroll: {
       x: 500,
       y: 500
     }
-  }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+  }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -17069,7 +17125,7 @@ var getButtonText = function getButtonText() {
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
     return '选择百胜ERP商品';
   }
-  if (['WDT_REISSUE_GOODS'].includes(type)) {
+  if (['WDT_GOODS', 'WDT_REISSUE_GOODS'].includes(type)) {
     return '选择旺店通商品';
   }
   if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
@@ -17120,11 +17176,15 @@ var GoodItem$1 = function GoodItem(props) {
     onDelete = props.onDelete,
     onModeChange = props.onModeChange,
     tradeGoods = props.tradeGoods,
-    form = props.form;
+    form = props.form,
+    systemOrders = props.systemOrders,
+    selectedSystemOrders = props.selectedSystemOrders;
   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'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -17134,14 +17194,14 @@ var GoodItem$1 = function GoodItem(props) {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(newList));
   };
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectedRowKeys = _useState4[0],
-    setSelectedRowKeys = _useState4[1];
-  var _useState5 = useState(null),
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    hoveredRowIndex = _useState6[0],
-    setHoveredRowIndex = _useState6[1];
+    selectedRowKeys = _useState6[0],
+    setSelectedRowKeys = _useState6[1];
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    hoveredRowIndex = _useState8[0],
+    setHoveredRowIndex = _useState8[1];
   useEffect(function () {
     setSelectedRowKeys([]);
   }, [tableSelect, selectType]);
@@ -17370,12 +17430,17 @@ 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,
     uniqueKey: uniqueKey,
+    type: type,
     columns: orderColumns,
     dataSource: tradeGoods.originDataSource,
     getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
-    onChangeSelectedKeys: tradeGoods.selectedGoodsChange
+    onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
+    systemOrders: systemOrders,
+    selectedSystemOrders: selectedSystemOrders,
+    width: width
   }), showErpGoodsBtn && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -18226,7 +18291,7 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/order/wlnOrderList', {
         method: 'post',
         data: {
-          billNo: orderNo
+          billCode: orderNo
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
@@ -18658,6 +18723,85 @@ var index$3 = (function (props) {
   }));
 });
 
+var isErpType$1 = {
+  isWdt: function isWdt(type) {
+    return ['WDT_GOODS'].includes(type);
+  },
+  isBsE3: function isBsE3(type) {
+    return ['BS_E3_GOODS'].includes(type);
+  },
+  isGy: function isGy(type) {
+    return ['GY_GOODS'].includes(type);
+  },
+  isWln: function isWln(type) {
+    return ['WLN_GOODS'].includes(type);
+  }
+};
+var processAllOrders = function processAllOrders(_ref) {
+  var data = _ref.data,
+    orderNo = _ref.orderNo,
+    type = _ref.type;
+  var newList = [];
+  // 根据商品类型处理数据
+  if (isErpType$1.isWdt(type)) {
+    newList = processWdtOrders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isBsE3(type)) {
+    newList = processBsE3Orders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isGy(type)) {
+    newList = processGyOrders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isWln(type)) {
+    newList = processWlnOrders({
+      data: data
+    });
+  } else {
+    newList = processDefaultOrders({
+      data: data
+    });
+  }
+  return newList;
+};
+var processWdtOrders = function processWdtOrders(_ref2) {
+  var data = _ref2.data,
+    orderNo = _ref2.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return (item.srcTid || '').split(',').includes(orderNo);
+  });
+  return trades;
+};
+var processBsE3Orders = function processBsE3Orders(_ref3) {
+  var data = _ref3.data,
+    orderNo = _ref3.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.orderList) || []).filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.dealCode) === orderNo;
+  });
+  return trades;
+};
+var processGyOrders = function processGyOrders(_ref4) {
+  var data = _ref4.data,
+    orderNo = _ref4.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  });
+  return trades;
+};
+var processWlnOrders = function processWlnOrders(_ref5) {
+  var data = _ref5.data;
+  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref6) {
+  var data = _ref6.data;
+  return data || [];
+};
+
 var WlnGoods = function WlnGoods(props) {
   var value = props.value,
     disabled = props.disabled,
@@ -18667,15 +18811,53 @@ var WlnGoods = function WlnGoods(props) {
       wlnGoods: list
     }));
   };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
+    var goodDetails = updateWlnGoodsHandle((value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    return goodDetails;
+  };
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? wlnUtils === null || wlnUtils === void 0 ? void 0 : wlnUtils.getOrderListSingleton(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,
+        type: 'WLN_GOODS'
+      });
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allOrders: list || []
+      }));
+    }) : Promise.resolve();
+  };
+  var selectedGoodsChange = useCallback(function (skuList) {
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails() || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value.wlnGoods) || [];
+    newValue['wlnGoods'] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.uuid);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value.wlnGoods]);
   return /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: 'wlnGoods'
   }, props), {}, {
     disabled: disabled,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.wlnGoods,
-    showChangeBtn: false,
+    showChangeBtn: true,
+    showErpGoodsBtn: false,
     onChange: function onChange(val) {
       return changeHandle(val);
+    },
+    systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
+    selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
+    tradeGoods: {
+      originDataSource: getAllTradeGoodsDetails(),
+      selectedGoodsChange: selectedGoodsChange,
+      getDataSourceAsync: getDataSourceAsync
     }
   }));
 };
@@ -18704,7 +18886,8 @@ var componentMap$1 = {
       deleteGood: 'wdtDeleteGood',
       returnDeleteGood: 'wdtReturnDeleteGood',
       exchangeDeleteGood: 'wdtExchangeDeleteGood'
-    }
+    },
+    getOrderList: wdtUtils.getWdtOrderListSingleton
   },
   BS_E3_GOODS: {
     type: 'e3',
@@ -18729,7 +18912,8 @@ var componentMap$1 = {
       deleteGood: 'bsE3DeleteGood',
       returnDeleteGood: 'bsE3ReturnDeleteGood',
       exchangeDeleteGood: 'bsE3ExchangeDeleteGood'
-    }
+    },
+    getOrderList: bsE3Utils.getBsE3OrderListSingleton
   },
   GY_GOODS: {
     type: 'gy',
@@ -18754,7 +18938,8 @@ var componentMap$1 = {
       deleteGood: 'gyDeleteGood',
       returnDeleteGood: 'gyReturnDeleteGood',
       exchangeDeleteGood: 'gyExchangeDeleteGood'
-    }
+    },
+    getOrderList: gyUtils.getGyOrderListSingleton
   },
   JST_GOODS: {
     type: 'jst',
@@ -18779,7 +18964,8 @@ var componentMap$1 = {
       deleteGood: 'jstDeleteGood',
       returnDeleteGood: 'jstReturnDeleteGood',
       exchangeDeleteGood: 'jstExchangeDeleteGood'
-    }
+    },
+    getOrderList: jstUtils.getJstOrderListSingleton
   },
   KM_GOODS: {
     type: 'km',
@@ -18804,11 +18990,12 @@ var componentMap$1 = {
       deleteGood: 'kmDeleteGood',
       returnDeleteGood: 'kmReturnDeleteGood',
       exchangeDeleteGood: 'kmExchangeDeleteGood'
-    }
+    },
+    getOrderList: kmUtils.getOrderListSingleton
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _withInfo$current3, _withInfo$current4;
+  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -18910,7 +19097,6 @@ var CommonGoods = function CommonGoods(props) {
         });
       }
     }), pubsub.subscribeOnce(componentMap$1[compType].eventNameMap.changeShopCode, function (type, data) {
-      // console.log(data);
       onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
         shopCode: data.shopCode
       }));
@@ -18966,15 +19152,58 @@ var CommonGoods = function CommonGoods(props) {
   var getGoodDetails = function getGoodDetails(_ref2) {
     var mode = _ref2.mode;
     var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
-    var goodDetails = updateHandle(value.orders || [], {
+    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
       orderBackGoodsLevel: props.orderBackGoodsLevel
     });
-    var orderNo = value.orderNo;
+    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$1[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
     }) : goodDetails;
   };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails(_ref3) {
+    var mode = _ref3.mode;
+    var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
+    console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
+      orderBackGoodsLevel: props.orderBackGoodsLevel
+    });
+    var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
+    return mode ? goodDetails.filter(function (goodItem) {
+      var _componentMap$compTyp2;
+      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$1[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+    }) : goodDetails;
+  };
+  var selectedGoodsChange = useCallback(function (skuList) {
+    var _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    var isStrict = value.isStrict;
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails({
+      mode: isStrict
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$1[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
+    newValue["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$1[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) {
+      return skuList.includes(item.uuid);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$1[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.key)], value === null || value === void 0 ? void 0 : value.isStrict]);
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    var _componentMap$compTyp6;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$1[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,
+        type: compType
+      });
+      onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+        allOrders: list || []
+      }));
+    }) : Promise.resolve();
+  };
   return /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$1[compType].key
   }, props), {}, {
@@ -18994,7 +19223,16 @@ var CommonGoods = function CommonGoods(props) {
     },
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
-    isStrict: value === null || value === void 0 ? void 0 : value.isStrict
+    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,
+    tradeGoods: {
+      originDataSource: getAllTradeGoodsDetails({
+        mode: value === null || value === void 0 ? void 0 : value.isStrict
+      }),
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    }
   }));
 };
 
@@ -20664,7 +20902,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -21209,6 +21447,7 @@ var GyReissue = function GyReissue(props) {
         sysOrderNo: val
       });
     }
+    valueRef.current = newValue;
     pushGyLog('afterChangeSystemOrder', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
@@ -21270,7 +21509,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
@@ -21565,7 +21804,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {

package/dist/index.js

@@ -13619,6 +13619,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -15820,7 +15821,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16096,7 +16097,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -16205,7 +16206,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -17015,6 +17016,14 @@ var GoodsModalMap = {
   KM_REISSUE_GOODS: KmGoodsModal,
   OTHER_GOODS: GoodsModal$2
 };
+var systemOrderNoMap = {
+  GY_GOODS: 'code',
+  KM_GOODS: 'sid',
+  WDT_GOODS: 'tradeNo',
+  BS_E3_GOODS: 'orderSn',
+  JST_GOODS: 'oId',
+  WLN_GOODS: 'tradeNo'
+};
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -17022,35 +17031,59 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     selectedRowKeys = _ref.selectedRowKeys,
     onChangeSelectedKeys = _ref.onChangeSelectedKeys,
     _ref$uniqueKey = _ref.uniqueKey,
-    uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey;
-  var _useState = React.useState(false),
+    uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
+    _ref$isGoods = _ref.isGoods,
+    isGoods = _ref$isGoods === void 0 ? false : _ref$isGoods,
+    _ref$systemOrders = _ref.systemOrders,
+    systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
+    _ref$selectedSystemOr = _ref.selectedSystemOrders,
+    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? '' : _ref$type,
+    width = _ref.width;
+  var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
-    tradeGoodsVisible = _useState2[0],
-    setTradeGoodsVisible = _useState2[1];
+    selectSystemNo = _useState2[0],
+    setSelectSystemNo = _useState2[1];
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tradeGoodsVisible = _useState4[0],
+    setTradeGoodsVisible = _useState4[1];
   var openModal = function openModal() {
-    if (getDataSourceAsync) {
+    if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       getDataSourceAsync().then(function () {
         setTradeGoodsVisible(true);
       });
     } else {
       setTradeGoodsVisible(true);
     }
+    if (isGoods) {
+      var codeList = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : selectedSystemOrders.map(function (item) {
+        return item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]];
+      });
+      setSelectSystemNo(codeList || []);
+    }
   };
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
-  var currentTradeOriginGoods = lodash.intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+  var filterDataSource = React.useMemo(function () {
+    return (selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.length) ? dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
+      return selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.includes(item.systemOrderNo);
+    }) : dataSource;
+  }, [dataSource, selectSystemNo]);
+  var currentTradeOriginGoods = lodash.intersection(filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }), selectedRowKeys);
-  var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+  var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    // console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
+    fixed: true,
     onChange: handleChangeSelectedKeys
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -17060,18 +17093,41 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     title: "\u8BA2\u5355\u5546\u54C1",
     visible: tradeGoodsVisible,
     footer: null,
-    onCancel: closeModal
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+    onCancel: closeModal,
+    width: width || 850
+  }, isGoods && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+    style: {
+      marginBottom: '20px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+    span: 12
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    placeholder: "\u7B5B\u9009\u7CFB\u7EDF\u8BA2\u5355\u5546\u54C1",
+    style: {
+      width: '100%'
+    },
+    mode: "multiple",
+    value: selectSystemNo,
+    onChange: function onChange(val) {
+      return setSelectSystemNo(val);
+    },
+    options: systemOrders === null || systemOrders === void 0 ? void 0 : systemOrders.map(function (item) {
+      return {
+        label: item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]],
+        value: item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]]
+      };
+    })
+  }))), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowKey: uniqueKey,
     rowSelection: rowSelection,
     columns: columns,
-    dataSource: dataSource,
+    dataSource: filterDataSource,
     pagination: false,
     scroll: {
       x: 500,
       y: 500
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -17081,7 +17137,7 @@ var getButtonText = function getButtonText() {
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
     return '选择百胜ERP商品';
   }
-  if (['WDT_REISSUE_GOODS'].includes(type)) {
+  if (['WDT_GOODS', 'WDT_REISSUE_GOODS'].includes(type)) {
     return '选择旺店通商品';
   }
   if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
@@ -17132,11 +17188,15 @@ var GoodItem$1 = function GoodItem(props) {
     onDelete = props.onDelete,
     onModeChange = props.onModeChange,
     tradeGoods = props.tradeGoods,
-    form = props.form;
+    form = props.form,
+    systemOrders = props.systemOrders,
+    selectedSystemOrders = props.selectedSystemOrders;
   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'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -17146,14 +17206,14 @@ var GoodItem$1 = function GoodItem(props) {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(newList));
   };
-  var _useState3 = React.useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectedRowKeys = _useState4[0],
-    setSelectedRowKeys = _useState4[1];
-  var _useState5 = React.useState(null),
+  var _useState5 = React.useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    hoveredRowIndex = _useState6[0],
-    setHoveredRowIndex = _useState6[1];
+    selectedRowKeys = _useState6[0],
+    setSelectedRowKeys = _useState6[1];
+  var _useState7 = React.useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    hoveredRowIndex = _useState8[0],
+    setHoveredRowIndex = _useState8[1];
   React.useEffect(function () {
     setSelectedRowKeys([]);
   }, [tableSelect, selectType]);
@@ -17382,12 +17442,17 @@ 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,
     uniqueKey: uniqueKey,
+    type: type,
     columns: orderColumns,
     dataSource: tradeGoods.originDataSource,
     getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
-    onChangeSelectedKeys: tradeGoods.selectedGoodsChange
+    onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
+    systemOrders: systemOrders,
+    selectedSystemOrders: selectedSystemOrders,
+    width: width
   }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -18238,7 +18303,7 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/order/wlnOrderList', {
         method: 'post',
         data: {
-          billNo: orderNo
+          billCode: orderNo
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
@@ -18670,6 +18735,85 @@ var index$3 = (function (props) {
   }));
 });
 
+var isErpType$1 = {
+  isWdt: function isWdt(type) {
+    return ['WDT_GOODS'].includes(type);
+  },
+  isBsE3: function isBsE3(type) {
+    return ['BS_E3_GOODS'].includes(type);
+  },
+  isGy: function isGy(type) {
+    return ['GY_GOODS'].includes(type);
+  },
+  isWln: function isWln(type) {
+    return ['WLN_GOODS'].includes(type);
+  }
+};
+var processAllOrders = function processAllOrders(_ref) {
+  var data = _ref.data,
+    orderNo = _ref.orderNo,
+    type = _ref.type;
+  var newList = [];
+  // 根据商品类型处理数据
+  if (isErpType$1.isWdt(type)) {
+    newList = processWdtOrders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isBsE3(type)) {
+    newList = processBsE3Orders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isGy(type)) {
+    newList = processGyOrders({
+      data: data,
+      orderNo: orderNo
+    });
+  } else if (isErpType$1.isWln(type)) {
+    newList = processWlnOrders({
+      data: data
+    });
+  } else {
+    newList = processDefaultOrders({
+      data: data
+    });
+  }
+  return newList;
+};
+var processWdtOrders = function processWdtOrders(_ref2) {
+  var data = _ref2.data,
+    orderNo = _ref2.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return (item.srcTid || '').split(',').includes(orderNo);
+  });
+  return trades;
+};
+var processBsE3Orders = function processBsE3Orders(_ref3) {
+  var data = _ref3.data,
+    orderNo = _ref3.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.orderList) || []).filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.dealCode) === orderNo;
+  });
+  return trades;
+};
+var processGyOrders = function processGyOrders(_ref4) {
+  var data = _ref4.data,
+    orderNo = _ref4.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  });
+  return trades;
+};
+var processWlnOrders = function processWlnOrders(_ref5) {
+  var data = _ref5.data;
+  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref6) {
+  var data = _ref6.data;
+  return data || [];
+};
+
 var WlnGoods = function WlnGoods(props) {
   var value = props.value,
     disabled = props.disabled,
@@ -18679,15 +18823,53 @@ var WlnGoods = function WlnGoods(props) {
       wlnGoods: list
     }));
   };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
+    var goodDetails = kmkfUtils.updateWlnGoodsHandle((value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    return goodDetails;
+  };
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? wlnUtils === null || wlnUtils === void 0 ? void 0 : wlnUtils.getOrderListSingleton(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,
+        type: 'WLN_GOODS'
+      });
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allOrders: list || []
+      }));
+    }) : Promise.resolve();
+  };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails() || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value.wlnGoods) || [];
+    newValue['wlnGoods'] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.uuid);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value.wlnGoods]);
   return /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: 'wlnGoods'
   }, props), {}, {
     disabled: disabled,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.wlnGoods,
-    showChangeBtn: false,
+    showChangeBtn: true,
+    showErpGoodsBtn: false,
     onChange: function onChange(val) {
       return changeHandle(val);
+    },
+    systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
+    selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
+    tradeGoods: {
+      originDataSource: getAllTradeGoodsDetails(),
+      selectedGoodsChange: selectedGoodsChange,
+      getDataSourceAsync: getDataSourceAsync
     }
   }));
 };
@@ -18716,7 +18898,8 @@ var componentMap$1 = {
       deleteGood: 'wdtDeleteGood',
       returnDeleteGood: 'wdtReturnDeleteGood',
       exchangeDeleteGood: 'wdtExchangeDeleteGood'
-    }
+    },
+    getOrderList: wdtUtils.getWdtOrderListSingleton
   },
   BS_E3_GOODS: {
     type: 'e3',
@@ -18741,7 +18924,8 @@ var componentMap$1 = {
       deleteGood: 'bsE3DeleteGood',
       returnDeleteGood: 'bsE3ReturnDeleteGood',
       exchangeDeleteGood: 'bsE3ExchangeDeleteGood'
-    }
+    },
+    getOrderList: bsE3Utils.getBsE3OrderListSingleton
   },
   GY_GOODS: {
     type: 'gy',
@@ -18766,7 +18950,8 @@ var componentMap$1 = {
       deleteGood: 'gyDeleteGood',
       returnDeleteGood: 'gyReturnDeleteGood',
       exchangeDeleteGood: 'gyExchangeDeleteGood'
-    }
+    },
+    getOrderList: gyUtils.getGyOrderListSingleton
   },
   JST_GOODS: {
     type: 'jst',
@@ -18791,7 +18976,8 @@ var componentMap$1 = {
       deleteGood: 'jstDeleteGood',
       returnDeleteGood: 'jstReturnDeleteGood',
       exchangeDeleteGood: 'jstExchangeDeleteGood'
-    }
+    },
+    getOrderList: jstUtils.getJstOrderListSingleton
   },
   KM_GOODS: {
     type: 'km',
@@ -18816,11 +19002,12 @@ var componentMap$1 = {
       deleteGood: 'kmDeleteGood',
       returnDeleteGood: 'kmReturnDeleteGood',
       exchangeDeleteGood: 'kmExchangeDeleteGood'
-    }
+    },
+    getOrderList: kmUtils.getOrderListSingleton
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _withInfo$current3, _withInfo$current4;
+  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -18922,7 +19109,6 @@ var CommonGoods = function CommonGoods(props) {
         });
       }
     }), pubsub__default['default'].subscribeOnce(componentMap$1[compType].eventNameMap.changeShopCode, function (type, data) {
-      // console.log(data);
       onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
         shopCode: data.shopCode
       }));
@@ -18978,15 +19164,58 @@ var CommonGoods = function CommonGoods(props) {
   var getGoodDetails = function getGoodDetails(_ref2) {
     var mode = _ref2.mode;
     var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
-    var goodDetails = updateHandle(value.orders || [], {
+    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
       orderBackGoodsLevel: props.orderBackGoodsLevel
     });
-    var orderNo = value.orderNo;
+    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$1[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
     }) : goodDetails;
   };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails(_ref3) {
+    var mode = _ref3.mode;
+    var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
+    console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
+      orderBackGoodsLevel: props.orderBackGoodsLevel
+    });
+    var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
+    return mode ? goodDetails.filter(function (goodItem) {
+      var _componentMap$compTyp2;
+      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$1[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+    }) : goodDetails;
+  };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    var isStrict = value.isStrict;
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails({
+      mode: isStrict
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$1[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
+    newValue["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$1[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.uuid);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(componentMap$1 === null || componentMap$1 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$1[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.key)], value === null || value === void 0 ? void 0 : value.isStrict]);
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    var _componentMap$compTyp6;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$1[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,
+        type: compType
+      });
+      onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+        allOrders: list || []
+      }));
+    }) : Promise.resolve();
+  };
   return /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$1[compType].key
   }, props), {}, {
@@ -19006,7 +19235,16 @@ var CommonGoods = function CommonGoods(props) {
     },
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
-    isStrict: value === null || value === void 0 ? void 0 : value.isStrict
+    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,
+    tradeGoods: {
+      originDataSource: getAllTradeGoodsDetails({
+        mode: value === null || value === void 0 ? void 0 : value.isStrict
+      }),
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    }
   }));
 };
 
@@ -20676,7 +20914,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key], item.ruleName);
+    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -21221,6 +21459,7 @@ var GyReissue = function GyReissue(props) {
         sysOrderNo: val
       });
     }
+    valueRef.current = newValue;
     kmkfUtils.pushGyLog('afterChangeSystemOrder', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
@@ -21282,7 +21521,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -21577,7 +21816,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {

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

@@ -36,6 +36,8 @@ interface BsGoodsProps {
         getDataSourceAsync?: () => Promise<any>;
         selectedGoodsChange: (p: React.Key[]) => void;
     };
+    systemOrders?: any[];
+    selectedSystemOrders?: any[];
 }
 declare const GoodItem: (props: Partial<BsGoodsProps>) => React.JSX.Element;
 export default GoodItem;

package/dist/src/common/CommonGoods/constants/index.d.ts

@@ -0,0 +1,5 @@
+export declare const processAllOrders: ({ data, orderNo, type, }: {
+    data: any;
+    orderNo: string;
+    type: string;
+}) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.78",
+  "version": "2.0.79-beta.10",
   "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.0.78",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.10",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "029c929112eda38ed0d433cdc122bcf9f687bdf3"
+  "gitHead": "980a2ddae0f585d26e66c541a14b6b2bccd34e5e"
 }