@kmkf-fe-packages/basic-components 2.2.44-beta.9 → 2.2.44-beta.94

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, 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, JstAddressData, JkyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, 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, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, 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, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, BS_E3_ORDER_STATUS_MAP, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -7758,9 +7758,10 @@ var Province = function Province(props) {
     wdt: WdtAddressData.getInstance(),
     gy: GyAddressData.getInstance(),
     km: AddressData.getInstance(),
-    jst: JstAddressData.getInstance(),
-    jky: JkyAddressData.getInstance()
+    jst: JstAddressData.getInstance()
+    // jky: JkyAddressData.getInstance(),
   };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
     style: {
@@ -7935,7 +7936,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
     placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
     allowClear: true,
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverName');
+      var _e$target$value;
+      return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'receiverName');
     }
   }), /*#__PURE__*/React.createElement(Input, {
     value: value.receiverMobile,
@@ -7943,7 +7945,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
     allowClear: true,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'receiverMobile');
+      var _e$target$value2;
+      return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'receiverMobile');
     }
   })), /*#__PURE__*/React.createElement(Space, {
     wrap: true
@@ -7960,7 +7963,8 @@ var IdentifyAddress = function IdentifyAddress(props) {
     placeholder: "\u8BE6\u7EC6\u5730\u5740",
     allowClear: true,
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'detail');
+      var _e$target$value3;
+      return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'detail');
     }
   })));
 };
@@ -7996,13 +8000,14 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$b = ["value", "onChange", "platformType", "type"];
+var _excluded$b = ["value", "onChange", "platformType", "type", "placement"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
     platformType = props.platformType,
     _props$type = props.type,
     type = _props$type === void 0 ? 'select' : _props$type,
+    placement = props.placement,
     other = _objectWithoutProperties(props, _excluded$b);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -8040,12 +8045,13 @@ function ApaasLogistics(props) {
   return type === 'input' ? /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: handleInputChange
-  })) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
+  })) : /*#__PURE__*/React.createElement(Select, _objectSpread2({
     value: value,
     onChange: onChange,
     options: option,
-    virtual: true
-  }));
+    virtual: true,
+    placement: placement
+  }, other));
 }
 
 var _excluded$c = ["label", "name", "extra", "required", "rules", "initialValue"];
@@ -8129,6 +8135,11 @@ var systemOrderMap = {
     ids: 'wdtSystemSelectIds',
     order: 'wdtSystemShowOrder'
   },
+  JKY_SYSTEM_ORDER: {
+    no: 'jkySystemOrderNo',
+    ids: 'jkySystemSelectIds',
+    order: 'jkySystemShowOrder'
+  },
   BS_E3_SYSTEM_ORDER: {
     no: 'bsE3SystemOrderNo',
     ids: 'bsE3SystemSelectIds',
@@ -8606,7 +8617,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WAREHOUSING_STATUS: 'inStockStatusItemList',
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
-      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
+      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -8674,6 +8686,21 @@ var processErpSendGood = function processErpSendGood(getValue) {
     return _defineProperty({}, nex.uniqueKey, (itemList === null || itemList === void 0 ? void 0 : itemList.length) ? itemList : initValue);
   };
 };
+var processErpReturnWarehouse = function processErpReturnWarehouse(getValue) {
+  return function (nex, config) {
+    var kmReturnWarehouseMap = {
+      KM_RETURN_WAREHOUSE: {
+        list: 'kmReturnWarehouse'
+      }
+    };
+    var initValue = [{
+      kmReturnWarehouseName: '',
+      kmReturnWarehouseId: ''
+    }];
+    var itemList = jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(kmReturnWarehouseMap[nex.workOrderComponentType].list)), initValue);
+    return _defineProperty({}, nex.uniqueKey, (itemList === null || itemList === void 0 ? void 0 : itemList.length) ? itemList : initValue);
+  };
+};
 var processBsPosting = function processBsPosting(getValue) {
   return function (nex, config) {
     var bsAddress = [transTextToNumber(getValue("".concat(nex.uniqueKey, "_bsPostingProvince"))), transTextToNumber(getValue("".concat(nex.uniqueKey, "_bsPostingCity")))];
@@ -8700,6 +8727,33 @@ var processBsGoods = function processBsGoods(getValue) {
     return _defineProperty({}, nex.uniqueKey, _values);
   };
 };
+var processJkyGoods = function processJkyGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var _values = {
+        jkyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var selectIds = [];
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      var jkySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'JKY_SYSTEM_ORDER';
+      });
+      if (jkySystemOrder) {
+        selectIds = jsonParseSecurity(getValue("".concat(jkySystemOrder.uniqueKey, "_").concat(systemOrderMap[jkySystemOrder.workOrderComponentType].ids)), []);
+      }
+      _values.selectIds = selectIds;
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
 var processWdtGoods = function processWdtGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -8946,6 +9000,14 @@ var processWdtExchangeGoods = function processWdtExchangeGoods(getValue) {
     });
   };
 };
+var processKmExchangeGoods = function processKmExchangeGoods(getValue) {
+  return function (nex, config) {
+    return _defineProperty({}, nex.uniqueKey, {
+      kmExchangeGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmExchangeGoods")), []),
+      shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+    });
+  };
+};
 var processJstExchangeGoods = function processJstExchangeGoods(getValue) {
   return function (nex, config) {
     return _defineProperty({}, nex.uniqueKey, {
@@ -8991,6 +9053,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         ids: 'wdtSystemSelectIds',
         order: 'wdtSystemShowOrder'
       },
+      JKY_SYSTEM_ORDER: {
+        no: 'jkySystemOrderNo',
+        ids: 'jkySystemSelectIds',
+        order: 'jkySystemShowOrder'
+      },
       BS_E3_SYSTEM_ORDER: {
         no: 'bsE3SystemOrderNo',
         ids: 'bsE3SystemSelectIds',
@@ -9157,6 +9224,28 @@ var processKmReissueGoods = function processKmReissueGoods(templateColumns) {
     };
   };
 };
+var processKmReturnGoods = function processKmReturnGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        kmSystemOrder: {
+          orderNo: orderNo
+        },
+        kmReturnType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReturnType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
+        kmReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReturnGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        kmSystemOrderNo: getValue("".concat(nex.uniqueKey, "_kmSystemOrderNo"))
+      });
+    };
+  };
+};
 var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -9250,14 +9339,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref73;
-    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
+    var _ref77;
+    return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref77;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
+    var _ref78;
+    return _ref78 = {}, _defineProperty(_ref78, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref78, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref78;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9361,6 +9450,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
@@ -9373,19 +9463,23 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_SEND_GOOD: processErpSendGood,
       KM_SEND_GOOD: processErpSendGood,
       GY_SEND_GOOD: processErpSendGood,
+      KM_RETURN_WAREHOUSE: processErpReturnWarehouse,
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       WDT_GOODS: processWdtGoods(templateColumns),
+      JKY_GOODS: processJkyGoods(templateColumns),
       WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
       JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
       BS_E3_GOODS: processBsE3Goods(templateColumns),
       GY_GOODS: processGyGoods(templateColumns),
       KM_GOODS: processKmGoods(templateColumns),
       KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
+      KM_RETURN_GOODS: processKmReturnGoods(templateColumns),
       JST_GOODS: processJstGoods(templateColumns),
       BS_REISSUE_GOODS: processBsReissueGoods,
       BS_EXCHANGE_GOODS: processBsExchangeGoods,
       WDT_EXCHANGE_GOODS: processWdtExchangeGoods,
+      KM_EXCHANGE_GOODS: processKmExchangeGoods,
       JST_EXCHANGE_GOODS: processJstExchangeGoods,
       BS_RETURN_GOODS: processBsReturnGoods,
       WDT_RETURN_GOODS: processWdtReturnGoods(),
@@ -9394,6 +9488,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       KM_SYSTEM_ORDER: processErpSystemOrder,
       WLN_SYSTEM_ORDER: processErpSystemOrder,
       WDT_SYSTEM_ORDER: processErpSystemOrder,
+      JKY_SYSTEM_ORDER: processErpSystemOrder,
       WDT_RETURN_BILL_NO: processErpSystemOrder,
       BS_E3_SYSTEM_ORDER: processErpSystemOrder,
       JST_SYSTEM_ORDER: processErpSystemOrder,
@@ -9990,12 +10085,21 @@ var EditSplitRenderMap = {
       updateHandle = _ref17.updateHandle,
       disabled = _ref17.disabled;
     return /*#__PURE__*/React.createElement(ApaasLogistics, {
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('subform');
+      },
       value: val,
       allowClear: true,
+      showSearch: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: t.isEdit || disabled
+      disabled: t.isEdit || disabled,
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      placement: "topLeft",
+      listHeight: 120
     });
   },
   //退货物流-物流公司
@@ -10006,12 +10110,21 @@ var EditSplitRenderMap = {
       updateHandle = _ref18.updateHandle,
       disabled = _ref18.disabled;
     return /*#__PURE__*/React.createElement(ApaasLogistics, {
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('subform');
+      },
       value: val,
       allowClear: true,
+      showSearch: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: t.isEdit || disabled
+      disabled: t.isEdit || disabled,
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      placement: "topLeft",
+      listHeight: 120
     });
   }
 };
@@ -10480,7 +10593,11 @@ var SubForm = function SubForm(props) {
     });
   }, [inputValue]);
   var handleOpenChange = function handleOpenChange(newOpen) {
-    setOpen(newOpen);
+    if (!['jbCFrJV4m7_trajectoryCompany', '0qFEv9GEyd_returnLogisticsCompany'].includes(selectKey)) {
+      setOpen(newOpen);
+    } else {
+      setOpen(false);
+    }
   };
   var onChangeInput = useCallback(debounce(function (val) {
     setInputValue(val);
@@ -10568,6 +10685,9 @@ var SubForm = function SubForm(props) {
     visible: open,
     onVisibleChange: handleOpenChange
   }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React.createElement(ApaasLogistics, {
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('subform');
+    },
     value: undefined,
     onChange: function onChange(val) {
       onChangeInput(val);
@@ -10580,7 +10700,9 @@ var SubForm = function SubForm(props) {
     },
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
+    },
+    placement: "topLeft",
+    listHeight: 120
   }) : /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
     allowClear: true,
@@ -10657,7 +10779,8 @@ var BuyerNick = function BuyerNick(props) {
     disabled = props.disabled,
     _onBlur = props.onBlur;
   var changeValue = function changeValue(e, type) {
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
+    var _e$target$value;
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim())));
   };
   // useEffect(() => {
   //   //淘宝平台和抖音平台需要展示买家id
@@ -10682,7 +10805,8 @@ var BuyerNick = function BuyerNick(props) {
       changeValue(e, 'buyerNick');
     },
     onBlur: function onBlur(e) {
-      _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'buyerNick');
+      var _e$target$value2;
+      _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'buyerNick');
     }
   });
 };
@@ -10804,8 +10928,9 @@ var RemarkInput = function RemarkInput(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeRemark = function changeRemark(e) {
+    var _e$target$value;
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
-      remark: e.target.value
+      remark: (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim()
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
@@ -10848,7 +10973,7 @@ var Logistics = function Logistics(props) {
   var handleInputChange = function handleInputChange(e) {
     var val = e.target.value;
     typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-      order: val
+      order: val === null || val === void 0 ? void 0 : val.trim()
     }));
   };
   var handelSelectChange = function handelSelectChange(val) {
@@ -10912,7 +11037,8 @@ var AliPay = function AliPay(props) {
     disabled = props.disabled,
     _onBlur = props.onBlur;
   var changeValue = function changeValue(e, type) {
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value)));
+    var _e$target$value;
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim())));
   };
   return /*#__PURE__*/React.createElement("div", null, !isSingle ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -12099,7 +12225,7 @@ var ChooseBaby = function ChooseBaby(props) {
   }));
 };
 
-var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n";
+var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n.goods-uploaded-state {\n  display: flex;\n}\n.goods-uploaded-state .clear-all {\n  float: right;\n  color: #1966ff;\n  cursor: pointer;\n  margin-left: 12px;\n}\n";
 styleInject(css_248z$7);
 
 var GoodItem = function GoodItem(props) {
@@ -12428,13 +12554,22 @@ var GoodItem = function GoodItem(props) {
   var hasAttr = useMemo(function () {
     return hasPic ? headerList.length > 1 : headerList.length > 0;
   }, [hasPic, headerList]);
+  var clearAll = function clearAll() {
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      shopId: shopId,
+      imgList: []
+    });
+  };
   return /*#__PURE__*/React.createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React.createElement("p", {
     className: "goods-title"
   }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React.createElement("p", {
     className: "goods-uploaded-state"
   }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React.createElement("span", {
     className: "goods-uploaded-count"
-  }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React.createElement("div", {
+  }, imgList.length), "/", maxLength, /*#__PURE__*/React.createElement("span", {
+    className: 'clear-all',
+    onClick: clearAll
+  }, "\u6E05\u7A7A")), /*#__PURE__*/React.createElement("div", {
     ref: boxRef,
     id: "goods-wrap",
     className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
@@ -12574,7 +12709,8 @@ var Invoice = function Invoice(props) {
     }),
     current = _useRef.current;
   var handleInputChange = function handleInputChange(e) {
-    var ordinaryTaitou = e.target.value;
+    var _e$target$value;
+    var ordinaryTaitou = (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim();
     setVisible(false);
     setList([]);
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
@@ -12597,8 +12733,9 @@ var Invoice = function Invoice(props) {
     handleChange(ordinaryTaitou);
   };
   var handleValueClick = function handleValueClick(e) {
+    var _e$target$value2;
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
-      ordinarySerial: e.target.value
+      ordinarySerial: (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim()
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
   };
@@ -12909,7 +13046,8 @@ var Payment = function Payment(props) {
   //   }
   // }, [shopId, shopList]);
   var changeValue = function changeValue(e, type) {
-    var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, e.target.value));
+    var _e$target$value;
+    var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim()));
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     type === 'enterprisePaymentTid' && (onSearch === null || onSearch === void 0 ? void 0 : onSearch(e));
   };
@@ -12970,7 +13108,8 @@ var Payment = function Payment(props) {
         return changeValue(e, item.name);
       },
       onBlur: function onBlur(e) {
-        return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, item.name);
+        var _e$target$value2;
+        return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), item.name);
       }
     }), (replaceValueCh === null || replaceValueCh === void 0 ? void 0 : replaceValueCh[item.name]) && /*#__PURE__*/React.createElement("p", {
       style: {
@@ -13263,7 +13402,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled: disabled || isEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptCode');
+      var _e$target$value;
+      return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'interceptCode');
     },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
   }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
@@ -13338,7 +13478,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled: disabled || isEdit,
     placeholder: senderMobileLabel,
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptSenderMobile');
+      var _e$target$value2;
+      return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptSenderMobile');
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '退回地址',
@@ -13397,7 +13538,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
+      var _e$target$value3;
+      return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptLogisticsStatusOther');
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '拦截状态',
@@ -13451,7 +13593,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled: true,
     placeholder: "\u63A5\u53E3\u72B6\u6001\u539F\u56E0",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptLogisticsApiStatusReason');
+      var _e$target$value4;
+      return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsApiStatusReason');
     }
   })));
 };
@@ -13527,7 +13670,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     trajectoryApiStatus = _props$trajectoryApiS === void 0 ? false : _props$trajectoryApiS;
   var handleInputChange = function handleInputChange(e, type) {
     var val = e.target.value;
-    typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
+    typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val === null || val === void 0 ? void 0 : val.trim())));
   };
   var handelSelectChange = function handelSelectChange(val) {
     typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
@@ -13927,10 +14070,14 @@ var typeInitValueMap = {
   }],
   4: [{
     deliveryNo: null
+  }],
+  5: [{
+    returnWarehouseName: null,
+    returnWarehouseId: null
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13, _value$changeIndex14, _value$changeIndex15, _value$changeIndex16, _value$changeIndex17;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -14003,13 +14150,28 @@ var jstGoods = function jstGoods(props) {
     newList[changeIndex] = changeOrderInfo;
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
+  var handleSelectedReturn = function handleSelectedReturn(val, type, option, onlyShowFieldSelect) {
+    var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
+    changeOrderInfo[type] = val;
+    if (!onlyShowFieldSelect) {
+      changeOrderInfo['returnWarehouseId'] = option.value;
+    }
+    if (isSelectName && type === 'returnWarehouseName') {
+      // 如果发货仓名称存的是name，将id存入快照，同时把id替换成名称
+      changeOrderInfo['sendSnapshotId'] = option.value;
+      changeOrderInfo['returnWarehouseName'] = option.label;
+    }
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
   var filterOption = function filterOption(input, option) {
     var _option$label;
     return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').includes(input);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
-    changeOrderInfo[type] = val;
+    changeOrderInfo[type] = val === null || val === void 0 ? void 0 : val.trim();
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
@@ -14117,7 +14279,35 @@ var jstGoods = function jstGoods(props) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
     value: (_value$changeIndex13 = value[changeIndex]) === null || _value$changeIndex13 === void 0 ? void 0 : _value$changeIndex13.sendName
-  })) : null) : null);
+  })) : null, type === 5 ? /*#__PURE__*/React.createElement(Space, null, ['returnWarehouseId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u4ED3\u7F16\u7801",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'returnWarehouseId');
+    },
+    value: (_value$changeIndex14 = value[changeIndex]) === null || _value$changeIndex14 === void 0 ? void 0 : _value$changeIndex14.returnWarehouseId
+  }), ['returnWarehouseName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
+    style: {
+      minWidth: '100px',
+      maxWidth: '180px'
+    },
+    disabled: disabled,
+    placeholder: "\u9000\u8D27\u4ED3\u540D\u79F0",
+    showSearch: true,
+    options: sendOptions,
+    filterOption: filterOption,
+    value: ((_value$changeIndex15 = value[changeIndex]) === null || _value$changeIndex15 === void 0 ? void 0 : _value$changeIndex15.sendSnapshotId) || ((_value$changeIndex16 = value[changeIndex]) === null || _value$changeIndex16 === void 0 ? void 0 : _value$changeIndex16.returnWarehouseName) || null,
+    onChange: function onChange(value, option) {
+      return handleSelectedReturn(value, 'returnWarehouseName', option, onlyShowFieldSelect);
+    }
+  }) : /*#__PURE__*/React.createElement(Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u4ED3\u540D\u79F0",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'returnWarehouseName');
+    },
+    value: (_value$changeIndex17 = value[changeIndex]) === null || _value$changeIndex17 === void 0 ? void 0 : _value$changeIndex17.returnWarehouseName
+  }))) : null) : null);
 };
 
 var css_248z$a = ".jstGoodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.jstGoodsBox .goodBox-Img {\n  width: 80px;\n  margin: 0 10px 10px 0;\n}\n.jstGoodsBox .right-context {\n  font-size: 12px;\n}\n.jstGoodsBox .right-context .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n.jstGoodsBox .right-context .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n.jstGoodsBox.goodsBox-item-horizontal--box {\n  flex-direction: row;\n  width: auto;\n}\n.jstimgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n  background-color: #f2f3f5;\n  display: flex;\n  justify-items: center;\n  align-items: center;\n}\n.jstimgBox .add-btn {\n  color: #86909c;\n}\n.jstimgBox .text {\n  color: #86909c;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4e5969;\n}\n.searchBox {\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n  margin-bottom: 10px;\n}\n.searchBox .search {\n  width: 150px;\n  margin-left: 6px;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodsMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 400px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodsMain .goodItem {\n  width: 142px;\n  height: 184px;\n  padding: 7px;\n  margin: 0 16px 16px 0;\n  border-radius: 4px;\n  background: #ffffff;\n  box-sizing: border-box;\n  /* 主题色/常规 */\n  border: 1px solid #c9cdd4;\n}\n.goodsMain .goodItem .goodImg {\n  width: 128px;\n  height: 128px;\n  border-radius: 4px;\n  overflow: hidden;\n}\n.goodsMain .goodItem .goodImg img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goodsMain .goodItem .goodText {\n  text-align: center;\n  font-size: 12px;\n  color: #4e5969;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodsMain .goodItem .goodPrice {\n  text-align: center;\n  font-size: 14px;\n  color: #1d2129;\n}\n.goodsMain .goodItem.active {\n  border: 1px solid #1b5bf3;\n}\n@media screen and (max-width: 500px) {\n  .goodsMain {\n    display: grid;\n    grid-template-columns: repeat(3, 1fr);\n    grid-gap: 8px;\n    height: 300px;\n  }\n  .goodsMain .goodItem {\n    height: 126px;\n    width: 83px;\n    padding: 4px;\n    margin: 0;\n    border-radius: 4px;\n    background: #FFFFFF;\n    box-sizing: border-box;\n    border: 1px solid rgba(0, 0, 0, 0.15);\n  }\n  .goodsMain .goodItem .goodImg {\n    width: 98%;\n    height: 77px;\n  }\n  .goodsMain .goodItem .goodText {\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .goodsMain .goodItem.active {\n    border: 1px solid #3089dc;\n  }\n  .searchBox {\n    display: flex;\n    flex-wrap: wrap;\n    justify-content: initial;\n  }\n  .searchBox .classify {\n    width: 120px;\n  }\n  .goodModal .ant-modal-body {\n    padding: 8px;\n  }\n}\n.goods-uploaded-count {\n  color: #ff3638;\n}\n.footer {\n  display: flex;\n  justify-content: flex-end;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n.right-context .info-row {\n  width: 80px;\n  display: flex;\n  align-items: center;\n  padding: 0px 8px;\n  border-radius: 2px;\n  cursor: pointer;\n  background: #f2f3f5;\n  margin-bottom: 4px;\n}\n.right-context .info-row > div {\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n  word-break: break-all;\n}\n.sphPagination {\n  display: flex;\n  align-items: center;\n}\n.sphPagination .shpBtn {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  padding: 0 8px;\n  height: 32px;\n  border: 1px solid #d9d9d9;\n  border-radius: 2px;\n  cursor: pointer;\n  margin: 0 8px;\n}\n.sphPagination .shpBtn.unCursor {\n  color: #eee;\n  cursor: not-allowed;\n}\n";
@@ -14931,6 +15121,13 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: '是否组合装',
+  width: 150,
+  render: function render(type) {
+    return type === 'suite' ? '组合装' : '非组合装';
+  }
 }];
 
 var bse3Columns = [{
@@ -15321,34 +15518,75 @@ var jyColumns = [{
   }
 }];
 
+var getYesOrNo$2 = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
 var jkyColumns = [{
-  dataIndex: 'goodsNo',
-  title: "\u8D27\u54C1\u7F16\u53F7",
+  dataIndex: 'goodName',
+  title: "\u8D27\u54C1\u540D\u79F0",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsName',
-  title: "\u8D27\u54C1\u540D\u79F0",
+  dataIndex: 'goodNo',
+  title: "\u8D27\u54C1\u7F16\u53F7",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsId',
+  dataIndex: 'goodId',
   title: "\u8D27\u54C1ID",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'goodPicUrl',
+  title: "\u8D27\u54C1\u4E3B\u56FE",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u8D27\u54C1\u522B\u540D",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specBarcode',
   title: "\u8D27\u54C1\u6761\u7801",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'categoryName',
+  title: "\u8D27\u54C1\u7C7B\u522B",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C",
+  align: 'center',
+  ellipsis: true,
+  width: 200,
+  render: renderTextEllipsis
 }, {
   dataIndex: 'specName',
   title: "\u89C4\u683C\u540D\u79F0",
@@ -15364,7 +15602,14 @@ var jkyColumns = [{
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'skuImgUrl',
+  dataIndex: 'specNo',
+  title: "\u89C4\u683C\u7F16\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
   title: "\u89C4\u683C\u56FE\u7247",
   align: 'center',
   ellipsis: true,
@@ -15380,162 +15625,78 @@ var jkyColumns = [{
     });
   }
 }, {
-  dataIndex: 'sellCount',
-  title: "\u6570\u91CF",
-  width: 100,
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, val);
-  }
-}, {
-  dataIndex: 'actualSendCount',
-  title: "\u5B9E\u53D1\u6570\u91CF",
+  dataIndex: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
+  align: 'center',
+  ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'sellPrice',
-  title: "\u5355\u4EF7",
-  width: 150,
-  render: function render(val) {
-    return val || val === 0 ? Number(val).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'sellTotal',
-  title: "\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'discountTotal',
-  title: "\u62B5\u6263\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableFee',
-  title: "\u5206\u644A\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableAfterFee',
-  title: "\u5206\u644A\u540E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'customerPrice',
-  title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
-  width: 150
-}, {
-  dataIndex: 'customerTotal',
-  title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'divideSellTotal',
-  title: "\u5B9E\u4ED8\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'isGift',
-  title: "\u662F\u5426\u8D60\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isFit',
-  title: "\u662F\u5426\u7EC4\u5408\u88C5",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isPresell',
-  title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'brandName',
-  title: "\u54C1\u724C",
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
   align: 'center',
   ellipsis: true,
-  width: 200,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'cateName',
-  title: "\u8D27\u54C1\u7C7B\u522B",
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsTags',
-  title: "\u8D27\u54C1\u6807\u7B7E",
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
   align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsMemo',
-  title: "\u8D27\u54C1\u5907\u6CE8",
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
   align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'tradeGoodsNo',
-  title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
   align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'tradeGoodsName',
-  title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
+  dataIndex: 'memberPrice',
+  title: "\u4F1A\u5458\u4EF7",
+  align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'tradeGoodsSpec',
-  title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'sourceSubtradeNo',
-  title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
+  dataIndex: 'isVirtual',
+  title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
+  align: 'center',
   ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val));
+  }
 }, {
-  dataIndex: 'platGoodsId',
-  title: "\u5E73\u53F0\u5546\u54C1ID",
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'subTradeId',
-  title: "\u5546\u54C1\u660E\u7EC6ID",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'batchNo',
-  title: "\u6279\u6B21\u53F7",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sendCount',
-  title: "\u6279\u6B21\u6570\u91CF",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'productDate',
-  title: "\u751F\u4EA7\u65E5\u671F",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'expireDate',
-  title: "\u5230\u671F\u65E5\u671F",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val === 'combine'));
+  }
 }];
 
 var getColumnsMap = function getColumnsMap() {
@@ -15809,7 +15970,7 @@ var transformFormData = function transformFormData(formData) {
     if (formData[key]) {
       var _formData$key, _formData$key2, _formData$key3, _formData$key4;
       var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
       conditionList.push({
         leftValue: key,
         compareSymbol: compareSymbol,
@@ -15955,6 +16116,24 @@ var GoodList = function GoodList(props, ref) {
         };
       })
     }
+  }, {
+    label: '是否组合装',
+    name: 'skuType',
+    dataIndex: 'skuType',
+    type: 'select',
+    formItemProps: {
+      mode: 'multiple',
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      options: [{
+        label: '组合装',
+        value: 'suite'
+      }, {
+        label: '非组合装',
+        value: ''
+      }]
+    }
   }];
   var rowSelection = {
     selectedRowKeys: selectIds,
@@ -18778,13 +18957,15 @@ var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
 var getTableData$6 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JKY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18807,13 +18988,15 @@ var searchFormData$5 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
-  label: '商品名称',
+  label: '货品名称',
   name: 'goodName'
 }, {
-  label: '商品编码',
-  name: 'goodNo'
+  label: '货品编码',
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$6 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18883,8 +19066,8 @@ var GoodList$6 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.id || row.specId;
-        }).includes(record.id || record.specId),
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
         name: record.id
       };
       return options;
@@ -20331,7 +20514,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$2 = function getYesOrNo(val) {
+var getYesOrNo$3 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20482,7 +20665,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
       },
       width: 100
     }]
@@ -20494,7 +20677,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$3 = function getYesOrNo(val) {
+var getYesOrNo$4 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20609,7 +20792,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -20628,7 +20811,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -20754,7 +20937,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20883,7 +21066,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21622,16 +21805,28 @@ function toNum$3(value) {
   }
   return void 0;
 }
-var getColumns$6 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
+var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+var getColumns$6 = function getColumns() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$text = _ref.text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return {
     KM_GOODS: [{
       dataIndex: 'skuPropertiesName',
       title: "\u89C4\u683C\u540D\u79F0",
       width: 250,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysSkuPropertiesName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysTitle',
       title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
@@ -21739,6 +21934,11 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u4F9B\u5E94\u5546\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u5907\u6CE8",
+      width: 200,
+      render: renderTextEllipsis
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
@@ -21750,6 +21950,11 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u89C4\u683C\u540D\u79F0",
       width: 250,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysSkuPropertiesName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysTitle',
       title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
@@ -21794,7 +21999,9 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'realNum',
       title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
+      validator: function validator(_rule, value, extraParams) {
+        console.log('实际补发数量-extraParams', extraParams);
+        if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
           var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
@@ -21822,8 +22029,21 @@ var getColumns$6 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'desiredNum',
-      title: "\u5E94\u8865\u53D1\u6570\u91CF",
+      title: "\u7533\u8BF7\u8865\u53D1\u6570\u91CF",
       width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
+          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u7533\u8BF7\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -21892,136 +22112,60 @@ var getColumns$6 = function getColumns(_ref) {
         align: 'center',
         ellipsis: true
       });
-    })
-  };
-};
-
-var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
-  if (typeof value === 'number') return true;
-  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
-  return false;
-};
-function toNum$4(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
-var getColumns$7 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
-  return {
-    //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
+    }),
+    KM_RETURN_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
+      dataIndex: 'sysSkuPropertiesName',
       title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
-    },
-    // {
-    //   dataIndex: 'specName',
-    //   title: `规格名称`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 200,
-    // },
-    // {
-    //   dataIndex: 'specCode',
-    //   title: `规格编号`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 150,
-    // },
-    {
-      dataIndex: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sellCount',
-      title: "\u6570\u91CF",
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u9000\u8D27\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
@@ -22033,48 +22177,449 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              realNum: num,
+              refundMoney: num && isNumberOrNumberString$2(record.price) ? num * record.price : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'sellPrice',
-      title: "\u5355\u4EF7",
-      width: 150,
+      dataIndex: 'desiredNum',
+      title: "\u7533\u8BF7\u9000\u8D27\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReturnGoods) || []).some(function (goods) {
+          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u7533\u8BF7\u9000\u8D27\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
-            width: 130
+            width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            updateDataHandle({
-              sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'mallSellingPrice',
-      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
-      width: 150
-    }, {
-      dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'settlementPrice',
-      title: "\u7ED3\u7B97\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'divideOrderFee',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
+      dataIndex: 'goodNum',
+      title: "\u826F\u54C1\u6570",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'goodNum');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'defectiveNum',
+      title: "\u6B21\u54C1\u6570",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'defectiveNum');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'refundMoney',
+      title: "\u5B9E\u9000\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'refundMoney');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      headerComponentType: 'pic',
+      render: function render(val) {
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: imgUrl
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_EXCHANGE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysSkuPropertiesName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u6362\u51FA\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value, extraParams) {
+        if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
+          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var res = typeof realNum === 'number' ? realNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5B9E\u9645\u6362\u51FA\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              realNum: num,
+              refundMoney: num && isNumberOrNumberString$2(record.price) ? num * record.price : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'desiredNum',
+      title: "\u5E94\u6362\u51FA\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmExchangeGoods) || []).some(function (goods) {
+          var desiredNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.desiredNum);
+          var res = typeof desiredNum === 'number' ? desiredNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5E94\u6362\u51FA\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      headerComponentType: 'pic',
+      render: function render(val) {
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: imgUrl
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$4(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
+      dataIndex: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'settlementPrice',
+      title: "\u7ED3\u7B97\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'divideOrderFee',
+      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      width: 150
     }, {
       dataIndex: 'bfit',
       title: "\u662F\u5426\u7EC4\u5408\u88C5",
@@ -22257,7 +22802,7 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22277,7 +22822,7 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22401,7 +22946,7 @@ var getColumns$8 = function getColumns(_ref) {
   };
 };
 
-var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
+var isNumberOrNumberString$4 = function isNumberOrNumberString(value) {
   if (typeof value === 'number') return true;
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
@@ -22491,7 +23036,7 @@ var getColumns$9 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$4(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22516,14 +23061,14 @@ var getColumns$9 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$4(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
       dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
+      title: "\u603B\u91D1\u989D",
       width: 150
     }, {
       dataIndex: 'discountTotal',
@@ -22548,7 +23093,22 @@ var getColumns$9 = function getColumns(_ref) {
     }, {
       dataIndex: 'divideSellTotal',
       title: "\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              divideSellTotal: num
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
       dataIndex: 'isGift',
       title: "\u662F\u5426\u8D60\u54C1",
@@ -22567,12 +23127,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val == 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22592,12 +23152,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val == 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isPresell',
@@ -22622,7 +23182,7 @@ var getColumns$9 = function getColumns(_ref) {
             label: '否',
             value: '0'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val == '1' ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -22800,7 +23360,7 @@ var getColumns$9 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$4(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22820,7 +23380,7 @@ var getColumns$9 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$4(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -22841,8 +23401,8 @@ var getColumns$9 = function getColumns(_ref) {
       width: 250,
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(ApaasInput, {
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'reason');
+          onChange: function onChange(e) {
+            updateHandle(e.target.value, index, 'reason');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -22858,12 +23418,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22877,12 +23437,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: 1
           }, {
             label: '否',
-            value: 'False'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -23048,7 +23608,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   })), getColumns$6({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), getColumns$7({
     text: text,
     disabled: disabled,
@@ -23072,7 +23633,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   });
 };
 var erpColumnsMap = getColumnsMap$1();
-var erpFormValidator = function erpFormValidator(_rule, value, type) {
+var erpFormValidator = function erpFormValidator(_rule, value, type, extraParams) {
   var validatorFnList = (erpColumnsMap[type] || erpColumnsMap['default']).map(function (column) {
     return column.validator;
   }).filter(Boolean);
@@ -23082,7 +23643,7 @@ var erpFormValidator = function erpFormValidator(_rule, value, type) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var validatorFn = _step.value;
-      var validatorResult = validatorFn(_rule, value, type);
+      var validatorResult = validatorFn(_rule, value, extraParams);
       if (validatorResult) {
         res = validatorResult;
         break;
@@ -23207,7 +23768,7 @@ var isErpType = {
     return ['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type);
   },
   isKm: function isKm(type) {
-    return ['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type);
+    return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'KM_EXCHANGE_GOODS'].includes(type);
   },
   isJy: function isJy(type) {
     return ['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type);
@@ -23266,6 +23827,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJky(type)) {
+    newList = processJkyGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -23314,11 +23882,45 @@ var processJyGoods = function processJyGoods(_ref2) {
     });
   });
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref3) {
+var processJkyGoods$1 = function processJkyGoods(_ref3) {
   var list = _ref3.list,
-    type = _ref3.type,
     canUpdateNumber = _ref3.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType,
+      specImgUrl = item.specImgUrl,
+      categoryName = item.categoryName;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      cateName: categoryName,
+      goodsName: goodName,
+      goodsNo: goodNo,
+      goodsId: goodId,
+      barcode: specBarcode,
+      skuImgUrl: specImgUrl,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      isGift: isGift ? 1 : 0,
+      isFit: skuType === 'combine' ? 1 : 0,
+      uuid: uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: retailPrice,
+      sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref4) {
+  var list = _ref4.list,
+    type = _ref4.type,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
@@ -23336,9 +23938,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref3) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
-  var list = _ref4.list,
-    canUpdateNumber = _ref4.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
+  var list = _ref5.list,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -23373,9 +23975,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref5) {
-  var list = _ref5.list,
-    source = _ref5.source;
+var processGyGoods$1 = function processGyGoods(_ref6) {
+  var list = _ref6.list,
+    source = _ref6.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -23402,8 +24004,8 @@ var processGyGoods$1 = function processGyGoods(_ref5) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref6) {
-  var list = _ref6.list;
+var processJstGoods$1 = function processJstGoods(_ref7) {
+  var list = _ref7.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -23421,9 +24023,9 @@ var processJstGoods$1 = function processJstGoods(_ref6) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref7) {
-  var list = _ref7.list,
-    type = _ref7.type;
+var processKmGoods$1 = function processKmGoods(_ref8) {
+  var list = _ref8.list,
+    type = _ref8.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -23431,18 +24033,26 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
     KM_REISSUE_GOODS: {
       realNum: 1,
       desiredNum: 1
+    },
+    KM_RETURN_GOODS: {},
+    KM_EXCHANGE_GOODS: {
+      realNum: 1,
+      desiredNum: 1
     }
   };
   return list.map(function (item) {
     return _objectSpread2(_objectSpread2({}, item), {}, {
       skuPropertiesName: item.specName,
+      sysSkuPropertiesName: item.specId,
       sysTitle: item.goodName,
       title: null,
       shortTitle: item.goodShortName,
       sysOuterId: item.goodNo,
       outerId: item.goodNo,
       skuSysId: item.specId,
+      sysSkuId: item.specId,
       itemSysId: item.goodId,
+      sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
       payment: null,
       price: item.retailPrice,
@@ -23453,9 +24063,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref8) {
-  var list = _ref8.list,
-    canUpdateNumber = _ref8.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref9) {
+  var list = _ref9.list,
+    canUpdateNumber = _ref9.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -23498,6 +24108,8 @@ var GoodsModalMap = {
   JST_EXCHANGE_GOODS: JstGoodsModal,
   KM_GOODS: KmGoodsModal,
   KM_REISSUE_GOODS: KmGoodsModal,
+  KM_RETURN_GOODS: KmGoodsModal,
+  KM_EXCHANGE_GOODS: KmGoodsModal,
   JY_GOODS: JyGoodsModal$1,
   JY_REISSUE_GOODS: JyGoodsModal$1,
   JKY_GOODS: JkyGoodsModal$1,
@@ -23517,6 +24129,8 @@ var systemOrderNoMap = {
   JKY_GOODS: 'tradeNo',
   JKY_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
+  KM_RETURN_GOODS: 'sid',
+  KM_EXCHANGE_GOODS: 'sid',
   JST_REISSUE_GOODS: 'oId',
   GY_REISSUE_GOODS: 'code',
   BS_E3_REISSUE_GOODS: 'orderSn',
@@ -23542,7 +24156,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     type = _ref$type === void 0 ? '' : _ref$type,
     width = _ref.width,
     _ref$isReissueType = _ref.isReissueType,
-    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType,
+    _ref$isReloadSelectTa = _ref.isReloadSelectTable,
+    isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
+    validSystemOrderFn = _ref.validSystemOrderFn;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -23561,7 +24178,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
             systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
               return item === null || item === void 0 ? void 0 : item.sysItemId;
             }).map(function (item) {
-              return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+              return !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
             });
             _context.next = 3;
             return servers.KM.getSupplierSingleton(systemItemIds);
@@ -23570,7 +24187,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
             dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
               return item === null || item === void 0 ? void 0 : item.sysItemId;
             })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
-              var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+              var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
               var supplierInfo = supplierMap.get(key);
               item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
               item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23587,36 +24204,52 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   }();
   var openModal = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var flag;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (!validSystemOrderFn) {
+              _context2.next = 7;
+              break;
+            }
+            _context2.next = 3;
+            return validSystemOrderFn();
+          case 3:
+            flag = _context2.sent;
+            if (!(flag === false)) {
+              _context2.next = 7;
+              break;
+            }
+            console.log('validSystemOrderFn校验不通过');
+            return _context2.abrupt("return");
+          case 7:
             if (!validSystemOrder) {
-              _context2.next = 3;
+              _context2.next = 10;
               break;
             }
             message.warning('请选择补发系统单');
             return _context2.abrupt("return");
-          case 3:
-            if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
-              _context2.next = 6;
+          case 10:
+            if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
+              _context2.next = 13;
               break;
             }
-            _context2.next = 6;
+            _context2.next = 13;
             return getDataSourceAsync();
-          case 6:
-            if (!['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
-              _context2.next = 9;
+          case 13:
+            if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
+              _context2.next = 16;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 16;
             return getKmSupplier(dataSource);
-          case 9:
+          case 16:
             setTradeGoodsVisible(true);
             // 补发直接传入的是systemNo
             if (isShowSelect && isReissueType) {
               setSelectSystemNo(selectedSystemOrders || []);
             }
-          case 11:
+          case 18:
           case "end":
             return _context2.stop();
         }
@@ -23728,9 +24361,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }), /*#__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, ")")));
 };
+SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
+  if (['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_EXCHANGE_GOODS'].includes(type)) {
     return '选择快麦ERP商品';
   }
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
@@ -23801,14 +24435,16 @@ var GoodItem$1 = function GoodItem(props) {
     _props$templateDetail = props.templateDetail,
     templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
     _props$hasSelectedSys = props.hasSelectedSystemOrder,
-    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys,
+    isReloadSelectTable = props.isReloadSelectTable,
+    validSystemOrderFn = props.validSystemOrderFn;
   var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
   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 isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
   var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
@@ -23898,6 +24534,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_RETURN_GOODS':
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
+        case 'KM_RETURN_GOODS':
+        case 'KM_EXCHANGE_GOODS':
         case 'JY_GOODS':
         case 'JY_REISSUE_GOODS':
         case 'JKY_GOODS':
@@ -24100,6 +24738,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, {
+    isReloadSelectTable: isReloadSelectTable,
+    validSystemOrderFn: validSystemOrderFn,
     validSystemOrder: validSystemOrder,
     isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
@@ -24830,7 +25470,8 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
                 billTag: item.tagName || item.tags,
-                tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
+                tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus],
+                logisticsName: ExpressData.getInstance('wdt').getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
               });
             });
           }
@@ -25117,21 +25758,25 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
         method: 'post',
         data: {
-          billNo: orderNo
+          sourceTradeNos: orderNo
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data, _res$data$tradeOrderD, _res$data3;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
-            var _filterJkyOrders, _res$data2;
-            res.data.trades = (_filterJkyOrders = filterJkyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
+          var _res$data, _res$data2;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
+            var _filterJkyOrders;
+            res.data.trades = (_filterJkyOrders = filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
-                tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus]
+                tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus],
+                logisticName: getJkyLogisticInfo(item, 'logisticName'),
+                logisticCode: getJkyLogisticInfo(item, 'logisticCode'),
+                logisticNo: getJkyLogisticInfo(item, 'logisticNo')
               });
             });
           }
-          resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
+          resolve(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.trades) || []);
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
             singletonMap$7.delete(orderNo);
@@ -25231,6 +25876,34 @@ var index$2 = (function (props) {
     showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
   var onceRef = useRef(false);
   var valueRef = useRef(null);
+  // 字段筛选状态 - 用户选择要筛选的字段（单选）
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterField = _useState2[0],
+    setFilterField = _useState2[1];
+  // 筛选关键词 - 输入框内容，用于模糊匹配选中字段列的值
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    filterKeyword = _useState4[0],
+    setFilterKeyword = _useState4[1];
+  // 初始化筛选字段（跟随 showHeader 配置）
+  useEffect(function () {
+    var allColumns = columnsMap[type] || [];
+    if (showHeader && showHeader.length > 0) {
+      var _validItems$;
+      // showHeader 是对象数组，提取第一个 dataIndex
+      var validItems = showHeader.filter(function (item) {
+        return item.show !== false;
+      });
+      var defaultField = ((_validItems$ = validItems[0]) === null || _validItems$ === void 0 ? void 0 : _validItems$.dataIndex) || '';
+      setFilterField(defaultField);
+    } else {
+      var _allColumns$;
+      // 如果 showHeader 为空，使用第一个列
+      var firstField = ((_allColumns$ = allColumns[0]) === null || _allColumns$ === void 0 ? void 0 : _allColumns$.dataIndex) || '';
+      setFilterField(firstField);
+    }
+  }, [type, showHeader]);
   useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
@@ -25258,12 +25931,66 @@ var index$2 = (function (props) {
     }
   }, [value, type]);
   var columns = useMemo(function () {
+    // 通过 getSystemShowHead 处理 showHeader 配置
     var baseInfoColumns = getSystemShowHead({
       columns: columnsMap[type] || [],
       showHeader: showHeader
     });
     return baseInfoColumns || [];
   }, [type, showHeader]);
+  // 构建字段渲染值映射表（原始值 -> 显示值），用于筛选时同时匹配原始值和显示值
+  var fieldRenderMap = useMemo(function () {
+    var map = {};
+    // JKY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JKY_SYSTEM_ORDER') {
+      // isDelete: 1 -> "是", 0 -> "否"
+      map['isDelete'] = {
+        '1': '是',
+        '0': '否'
+      };
+      // tradeFrom - 订单来源映射
+      map['tradeFrom'] = _objectSpread2({}, JKY_ORDER_FROM_MAP);
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, JKY_ORDER_TYPE_MAP);
+      // tradeStatus - 销售单状态映射
+      map['tradeStatus'] = _objectSpread2({}, JKY_ORDER_STATUS_MAP);
+    }
+    // BS_E3_SYSTEM_ORDER 需要处理的字段
+    if (type === 'BS_E3_SYSTEM_ORDER') {
+      // orderStatus - 订单状态映射
+      map['orderStatus'] = _objectSpread2({}, BS_E3_ORDER_STATUS_MAP);
+      // 布尔类型字段映射
+      var booleanMap = _objectSpread2({}, BS_E3_BOOLEAN_STATUS_MAP);
+      ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
+        map[field] = booleanMap;
+      });
+    }
+    return map;
+  }, [type]);
+  // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
+  var filteredData = useMemo(function () {
+    if (!filterField || !filterKeyword) {
+      return (value === null || value === void 0 ? void 0 : value.orders) || [];
+    }
+    var keywordLower = filterKeyword.toLowerCase();
+    var renderMap = fieldRenderMap[filterField];
+    return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
+      var fieldValue = item[filterField];
+      if (fieldValue == null) return false;
+      var fieldValueStr = String(fieldValue);
+      var fieldValueLower = fieldValueStr.toLowerCase();
+      // 直接匹配原始值
+      if (fieldValueLower.includes(keywordLower)) return true;
+      // 匹配渲染后的值
+      if (renderMap) {
+        var displayValue = renderMap[fieldValueStr];
+        if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
+          return true;
+        }
+      }
+      return false;
+    });
+  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -25493,8 +26220,8 @@ var index$2 = (function (props) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             jyUtils.getJyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+              var trades = (data || []).filter(function (item) {
+                return getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
@@ -25524,12 +26251,9 @@ var index$2 = (function (props) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
             jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
-              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: trades,
-                showOrderInfo: trades
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -25559,25 +26283,41 @@ var index$2 = (function (props) {
       };
     }
   };
-  // useEffect(() => {
-  //   const dom = document.querySelector(
-  //     `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
-  //   );
-  //   //解决列表出现横向滚动条时选择数据造成行内闪烁问题
-  //   if (
-  //     (value?.selectIds || []).length > 0 &&
-  //     dom &&
-  //     dom.scrollWidth > dom.clientWidth &&
-  //     dom.scrollLeft === 0
-  //   ) {
-  //     console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
-  //     dom.scrollLeft = 1;
-  //   }
-  // }, [JSON.stringify(value?.selectIds || [])]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
-  }, /*#__PURE__*/React.createElement(Table, {
-    dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
+  }, /*#__PURE__*/React.createElement(Space, {
+    style: {
+      marginBottom: 8
+    }
+  }, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: 150
+    },
+    placeholder: "\u9009\u62E9\u5B57\u6BB5",
+    value: filterField,
+    onChange: function onChange(value) {
+      return setFilterField(value);
+    },
+    allowClear: true,
+    showSearch: true,
+    optionFilterProp: "children"
+  }, (columnsMap[type] || []).map(function (col) {
+    return /*#__PURE__*/React.createElement(Select.Option, {
+      key: col.dataIndex,
+      value: col.dataIndex
+    }, col.title);
+  })), /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u6A21\u7CCA\u5339\u914D",
+    style: {
+      width: 200
+    },
+    value: filterKeyword,
+    onChange: function onChange(e) {
+      return setFilterKeyword(e.target.value);
+    },
+    allowClear: true
+  })), /*#__PURE__*/React.createElement(Table, {
+    dataSource: filteredData,
     columns: columns,
     rowSelection: rowSelection,
     rowKey: rowKeyMap[type] || 'billNo',
@@ -26506,8 +27246,8 @@ var processGyOrders = function processGyOrders(_ref4) {
 var processJyOrders = function processJyOrders(_ref5) {
   var data = _ref5.data,
     orderNo = _ref5.orderNo;
-  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-    return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  var trades = (data || []).filter(function (item) {
+    return getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
   });
   return trades;
 };
@@ -26832,7 +27572,7 @@ var CommonGoods = function CommonGoods(props) {
       value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
         return item === null || item === void 0 ? void 0 : item.sysItemId;
       })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+        var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
         map[key] = item;
       });
     }
@@ -26873,7 +27613,8 @@ var CommonGoods = function CommonGoods(props) {
               hasChange = false;
               currentValue = valueRef.current;
               kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
+                var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+                var supplierInfo = supplierMap.get(key);
                 var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
                 var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
                 // 如果供应商信息有变化，标记需要更新
@@ -27157,7 +27898,6 @@ var CommonGoods = function CommonGoods(props) {
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('getDataSourceAsync', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -27193,6 +27933,7 @@ var CommonGoods = function CommonGoods(props) {
     }
   }));
 };
+CommonGoods.displayName = 'CommonGoods';
 
 var componentMap$3 = {
   WDT_RETURN_GOODS: {
@@ -27386,6 +28127,55 @@ var componentMap$4 = {
       returnGoodsSysorder: 'jstReturnGoodsSysorder',
       returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
     }
+  },
+  KM_EXCHANGE_GOODS: {
+    type: 'km',
+    showChooseTradeGoodsBtn: true,
+    valueKey: 'kmExchangeGoods',
+    returnTypeKey: 'kmExchangeType',
+    systemOrder: 'kmSystemOrder',
+    systemOrderNo: 'kmSystemOrderNo',
+    oIdKey: 'billNo',
+    goodDetailsKey: 'subOrders',
+    skuIdKey: 'skuId',
+    outerOiIdKey: '',
+    name: '快麦',
+    updateGoodsHandle: updateKmGoodsHandle,
+    isReloadSelectTable: true,
+    validSystemOrderFn: function () {
+      var _validSystemOrderFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(form) {
+        var returnGoodsValue;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return form.getFieldValue('KM3F7B91C2');
+            case 2:
+              returnGoodsValue = _context.sent;
+              if (returnGoodsValue.kmSystemOrderNo) {
+                _context.next = 6;
+                break;
+              }
+              message.error('请选择退货系统单');
+              return _context.abrupt("return", false);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function validSystemOrderFn(_x) {
+        return _validSystemOrderFn.apply(this, arguments);
+      }
+      return validSystemOrderFn;
+    }(),
+    eventNameMap: {
+      // pubsub 事件
+      exchangeCopyGood: 'kmExchangeCopyGood',
+      exchangeBackCopyGood: 'kmExchangeBackCopyGood',
+      returnGoodsSysorder: 'kmReturnGoodsSysorder',
+      returnGoodsSysorderBack: 'kmReturnGoodsSysorderBack'
+    }
   }
 };
 var CommonExchangeGoods = function CommonExchangeGoods(props) {
@@ -27393,7 +28183,8 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
-    compType = props.type;
+    compType = props.type,
+    form = props.form;
   var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.skuIdKey) || 'uuid';
   var valueRef = useRef({});
   // PS: 目前选择订单商品，只有聚水潭换出商品，而且聚水潭不用考虑合并单，所以这个值一直是 false
@@ -27486,6 +28277,10 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     return new Promise(function (resolve) {
       pubsub.subscribeOnce(componentMap$4[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
         resolve(data);
+        console.log('getDataSourceAsync---111data--', data, getGoodDetails({
+          returnGoodsValue: data,
+          mode: isStrict
+        }));
         setOriginDataSource(getGoodDetails({
           returnGoodsValue: data,
           mode: isStrict
@@ -27494,9 +28289,14 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
       pubsub.publish(componentMap$4[compType].eventNameMap.returnGoodsSysorder, compType);
     });
   };
+  console.log('aaa--', originDataSource);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$4[compType].type
   }, props), {}, {
+    validSystemOrderFn: function validSystemOrderFn() {
+      return componentMap$4[compType].validSystemOrderFn(form);
+    },
+    isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
     disabled: disabled,
     canUpdateNumber: true,
     showChangeBtn: true,
@@ -27672,7 +28472,8 @@ var wdtReissue = function wdtReissue(props) {
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: true
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
     var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)]) || [];
@@ -27830,6 +28631,30 @@ var typeMap$2 = {
     uniqueKey: 'id',
     isShowSelectTradeGoods: true
   },
+  KM_RETURN_GOODS: {
+    compType: '退货',
+    key: 'kmReturnGoods',
+    typeName: 'kmReturnType',
+    systemOrder: 'kmSystemOrder',
+    systemOrderNo: 'kmSystemOrderNo',
+    getOrderList: kmUtils.getOrderListSingleton,
+    updateGoodsHandle: updateKmGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'billNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'subOrders',
+    uniqueKey: 'id',
+    isShowSelectTradeGoods: true,
+    showErpGoodsBtn: false,
+    eventNameMap: {
+      // pubsub 事件
+      exchangeCopyGood: 'kmExchangeCopyGood',
+      exchangeBackCopyGood: 'kmExchangeBackCopyGood',
+      returnGoodsSysorder: 'kmReturnGoodsSysorder',
+      returnGoodsSysorderBack: 'kmReturnGoodsSysorderBack'
+    }
+  },
   JY_REISSUE_GOODS: {
     compType: '补发',
     key: 'jyReissueGoods',
@@ -27856,14 +28681,14 @@ var typeMap$2 = {
     alwaysShowChooseErpGoodsBtn: true,
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
-    outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
+    outerOiIdKey: 'sourceSubtradeNo',
+    goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
+  var _typeMap$type18, _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54, _value$typeMap$type$s9, _typeMap$type55, _typeMap$type56, _typeMap$type57, _typeMap$type58;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27981,24 +28806,25 @@ var PublicReissue = function PublicReissue(props) {
   };
   var sysItemIdMap = useMemo(function () {
     var map = {};
-    if (type === 'KM_REISSUE_GOODS') {
-      var _value$kmReissueGoods, _value$kmReissueGoods2;
-      value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
+    if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
+      var _value$goodsKey, _value$goodsKey$filte;
+      var goodsKey = typeMap$2[type].key;
+      value === null || value === void 0 ? void 0 : (_value$goodsKey = value[goodsKey]) === null || _value$goodsKey === void 0 ? void 0 : (_value$goodsKey$filte = _value$goodsKey.filter(function (item) {
         return item === null || item === void 0 ? void 0 : item.sysItemId;
-      })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+      })) === null || _value$goodsKey$filte === void 0 ? void 0 : _value$goodsKey$filte.forEach(function (item) {
+        var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
         map[key] = item;
       });
     }
     return map;
-  }, [value === null || value === void 0 ? void 0 : value.kmReissueGoods]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key]]);
   // 用于跟踪已经处理过的 sysItemId，避免重复处理
   var processedSysItemIdsRef = useRef(new Set());
   useEffect(function () {
     var fetchSupplier = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sysItemIds) {
-        var _currentValue$kmReiss;
-        var needFetchIds, supplierMap, hasChange, currentValue, kmReissueGoods;
+        var _currentValue$goodsKe;
+        var needFetchIds, supplierMap, hasChange, currentValue, goodsKey, kmGoods;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -28026,8 +28852,10 @@ var PublicReissue = function PublicReissue(props) {
               // 检查是否有实际变化，避免不必要的更新
               hasChange = false;
               currentValue = valueRef.current;
-              kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
+              goodsKey = typeMap$2[type].key;
+              kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$goodsKe = currentValue[goodsKey]) === null || _currentValue$goodsKe === void 0 ? void 0 : _currentValue$goodsKe.map(function (item) {
+                var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+                var supplierInfo = supplierMap.get(key);
                 var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
                 var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
                 // 如果供应商信息有变化，标记需要更新
@@ -28042,12 +28870,10 @@ var PublicReissue = function PublicReissue(props) {
                 }
                 return item;
               }); // 只在有实际变化时才更新
-              if (hasChange && kmReissueGoods) {
-                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-                  kmReissueGoods: kmReissueGoods
-                }));
+              if (hasChange && kmGoods) {
+                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, _defineProperty({}, goodsKey, kmGoods)));
               }
-            case 12:
+            case 13:
             case "end":
               return _context2.stop();
           }
@@ -28063,20 +28889,20 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, [sysItemIdMap]);
   var getGoodDetails = function getGoodDetails(_ref5) {
-    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
+    var _typeMap$type19, _typeMap$type20, _value$typeMap$type$s6, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
     var mode = _ref5.mode,
       sysOrderNo = _ref5.sysOrderNo,
       _ref5$isAllOrders = _ref5.isAllOrders,
       isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[typeMap$2[type].oIdKey] === systemOrderNo;
     });
     var orderRest = undefined;
     if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
       orderRest = true;
-    } else if (type === 'KM_REISSUE_GOODS') {
+    } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
       orderRest = {
         orderBackGoodsLevel: props.orderBackGoodsLevel,
         canEdit: true
@@ -28090,13 +28916,12 @@ var PublicReissue = function PublicReissue(props) {
         canEdit: true
       };
     }
-    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
+    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
     });
-    console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
-    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
+    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest, type) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -28223,28 +29048,29 @@ var PublicReissue = function PublicReissue(props) {
     hasSelectedSystemOrder: showChangeBtn,
     // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
     alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
-    // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
+    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showErpGoodsBtn,
     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$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
-    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
+    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.showModeBtn),
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.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$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type58 = typeMap$2[type]) === null || _typeMap$type58 === void 0 ? void 0 : _typeMap$type58.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
 };
+PublicReissue.displayName = 'PublicReissue';
 
 var css_248z$g = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$g);