npm - @kmkf-fe-packages/basic-components - Versions diffs - 2.0.54-beta.3 → 2.0.54-beta.33 - Mend

@kmkf-fe-packages/basic-components 2.0.54-beta.3 → 2.0.54-beta.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/index.esm.js +997 -294
package/dist/index.js +996 -291
package/dist/src/bs/component/GoodItem/constants/bsE3ReissueGoodsColumns.d.ts +1 -1
package/dist/src/bs/component/GoodItem/constants/index.d.ts +5 -0
package/dist/src/bs/component/GoodItem/constants/wdtReissueGoodsColumns.d.ts +2 -2
package/dist/src/bs/component/model/Columns/Erp/km.d.ts +27 -0
package/dist/src/bs/component/model/Columns/useGetColumns.d.ts +2 -2
package/dist/src/bs/component/model/JstGoodsModal/index.d.ts +2 -10
package/dist/src/bs/component/model/KmGoodsModal/GoodsList.d.ts +25 -0
package/dist/src/bs/component/model/KmGoodsModal/index.d.ts +5 -0
package/dist/src/bs/component/model/type.d.ts +9 -0
package/dist/src/common/AsyncSelect/index.d.ts +6 -0
package/dist/src/constants/columnsBaseInfoMap.d.ts +1 -1
package/dist/src/constants/index.d.ts +1 -0
package/dist/src/constants/km.d.ts +3 -0
package/dist/src/index.d.ts +1 -0
package/dist/src/jst/Goods/index.d.ts +2 -0
package/package.json +3 -3

package/dist/index.esm.js CHANGED Viewed

@@ -3,8 +3,8 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isEqual, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
@@ -8001,7 +8001,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8303,7 +8304,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: uuid()
     })]));
   };
@@ -10961,7 +10962,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '发件人手机号',
-    required: true,
+    // required={true}
     key: 'interceptSenderMobile',
     hidden: !showSenderMobile
   }, /*#__PURE__*/React.createElement(Input, {
@@ -11141,7 +11142,11 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     disabled = props.disabled,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    _props$isSingle = props.isSingle,
+    isSingle = _props$isSingle === void 0 ? true : _props$isSingle,
+    _props$trajectoryApiS = props.trajectoryApiStatus,
+    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)));
@@ -11152,13 +11157,23 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     }));
     handleSearchSnapshot(val);
   };
+  var handleStatusChange = function handleStatusChange(val) {
+    var _value$trajectoryApiS;
+    var newVal = _objectSpread2(_objectSpread2({}, value), {}, {
+      trajectoryApiStatus: {
+        status: val,
+        reason: (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS = value.trajectoryApiStatus) === null || _value$trajectoryApiS === void 0 ? void 0 : _value$trajectoryApiS.reason) || ''
+      }
+    });
+    onChange(newVal);
+  };
   var handleSearchSnapshot = function handleSearchSnapshot(company) {
     var trajectoryCompany = value.trajectoryCompany,
       trajectoryCode = value.trajectoryCode,
       trajectoryPhone = value.trajectoryPhone;
     var newCompany = company ? company : trajectoryCompany;
     //不展示拦截状态不请求
-    if (!(showField && showField.includes('snapshot'))) {
+    if (!(showField && showField.includes('snapshot')) && !trajectoryApiStatus) {
       return;
     }
     if (disabled) {
@@ -11183,13 +11198,19 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
           data = res.data,
           msg = res.message;
         if (result === 100 || success) {
-          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-            trajectorySnapshot: data === null || data === void 0 ? void 0 : data.logisticsStatusDesc,
+          var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
             trajectoryCompany: newCompany
-          }));
+          });
+          if (trajectoryApiStatus) newValue.trajectoryApiStatus = data === null || data === void 0 ? void 0 : data.apiStatusObject;
+          if (showField && showField.includes('snapshot')) newValue.trajectorySnapshot = data === null || data === void 0 ? void 0 : data.logisticsStatusDesc;
+          onChange(newValue);
         } else {
           onChange(_objectSpread2(_objectSpread2({}, value), {}, {
             trajectorySnapshot: '',
+            trajectoryApiStatus: {
+              reason: '',
+              status: ''
+            },
             trajectoryCompany: newCompany
           }));
           msg && message.error(msg);
@@ -11198,6 +11219,10 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     } catch (err) {
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         trajectorySnapshot: '',
+        trajectoryApiStatus: {
+          reason: '',
+          status: ''
+        },
         trajectoryCompany: newCompany
       }));
       (err === null || err === void 0 ? void 0 : err.message) && message.error(err === null || err === void 0 ? void 0 : err.message);
@@ -11251,6 +11276,31 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       }
     });
   };
+  // 接口状态
+  var LogisticsApiStatus = function LogisticsApiStatus() {
+    var _value$trajectoryApiS2, _value$trajectoryApiS3, _value$trajectoryApiS4;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
+      value: (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS2 = value.trajectoryApiStatus) === null || _value$trajectoryApiS2 === void 0 ? void 0 : _value$trajectoryApiS2.status) || null,
+      disabled: true,
+      style: {
+        width: '100%',
+        marginTop: '8px'
+      },
+      placeholder: "\u63A5\u53E3\u72B6\u6001",
+      onChange: handleStatusChange,
+      options: [{
+        label: '成功',
+        value: '成功'
+      }, {
+        label: '失败',
+        value: '失败'
+      }]
+    }), (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS3 = value.trajectoryApiStatus) === null || _value$trajectoryApiS3 === void 0 ? void 0 : _value$trajectoryApiS3.reason) ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: 'red'
+      }
+    }, "\u5931\u8D25\u539F\u56E0\uFF1A", value === null || value === void 0 ? void 0 : (_value$trajectoryApiS4 = value.trajectoryApiStatus) === null || _value$trajectoryApiS4 === void 0 ? void 0 : _value$trajectoryApiS4.reason) : null);
+  };
   //物流快照
   var LogisticsSnapshot = function LogisticsSnapshot() {
     return /*#__PURE__*/React.createElement(Input, {
@@ -11265,7 +11315,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -11478,7 +11528,8 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
     disabled: disabled,
     onChange: function onChange(val) {
       return handleChange(val, changeIndex);
-    }
+    },
+    isSingle: false
   }));
 };
@@ -11501,7 +11552,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
+  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;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11519,8 +11570,8 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var expressDateInstance = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
-  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11603,59 +11654,51 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
-    type: logisticsType,
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      if (logisticsType === 'input') {
-        changeInputHandle(null, 'logisticsCompany');
-        changeInputHandle(val, 'logisticsCompanyName');
-      } else {
-        changeInputHandle(val, 'logisticsCompany');
-      }
+      changeInputHandle(val, 'logisticsCompany');
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
-  }, logisticsType === 'input' ? {} : {
+    value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) ? (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'] : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompanyName'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
-  }), {}, {
+    },
     style: {
       minWidth: '100px',
       maxWidth: '180px'
     },
     platformType: platformType
-  })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
+  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
-    value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
+    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.logisticsCode
   }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyId');
     },
-    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyId
   }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyName');
     },
-    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.supplyName
   })) : null, type === 3 ? /*#__PURE__*/React.createElement(Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendId');
     },
-    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
     style: {
       minWidth: '100px',
@@ -11666,7 +11709,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
+    value: ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendSnapshotId) || ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11676,14 +11719,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
+    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
+    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
   })) : null) : null);
 };
@@ -12538,12 +12581,144 @@ var bse3Columns = [{
   width: 100
 }];
+var getYesOrNo = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var kmColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: "\u5546\u54C1\u56FE\u7247",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 60,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: '商品简称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodBarcode',
+  title: '商品条码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C\u540D\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'skuType',
+  title: "\u5546\u54C1\u7C7B\u578B",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specName',
+  title: "SKU\u540D\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specNo',
+  title: "SKU\u7F16\u7801",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'propertiesValue',
+  title: "\u89C4\u683C\u503C",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'skuShortTitle',
+  title: "\u89C4\u683C\u7B80\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specBarcode',
+  title: "\u89C4\u683C\u6761\u7801",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specImgUrl',
+  title: "SKU \u56FE\u7247",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 60,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'isGift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'isVirtual',
+  title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'isSkuItem',
+  title: "\u662F\u5426\u542B\u6709SKU",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 150
+}];
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
     jst: jstColumns,
     wdt: wdtColumns,
-    bse3: bse3Columns
+    bse3: bse3Columns,
+    km: kmColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -12598,9 +12773,7 @@ var useGetColumns = (function (type) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var showColumnsDataIndexList = useMemo(function () {
-    return columns.filter(function (item) {
-      return Object.hasOwn(item, 'dataIndex');
-    }).map(function (item) {
+    return columns.map(function (item) {
       return item.dataIndex;
     });
   }, [columns]);
@@ -13302,15 +13475,241 @@ var searchFormData$1 = [{
   label: '商品名称',
   name: 'goodName'
 }, {
-  label: 'SKU',
+  label: 'SKU',
+  name: 'skuCode',
+  dataIndex: 'specNo'
+}, {
+  label: 'SKU ID',
+  name: 'skuId',
+  dataIndex: 'specId'
+}];
+var GoodList$2 = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('bse3'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$2, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.specNo;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.specNo !== record.specNo;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.specNo;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.specNo;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.specNo !== othVal.specNo;
+        });
+        setSelect(list);
+      }
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.specNo;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.specNo !== record.specNo;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'specNo',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$1,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: "specNo",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var BsE3GoodList = /*#__PURE__*/forwardRef(GoodList$2);
+var GoodsModal$4 = function GoodsModal(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var bsE3GoodListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _bsE3GoodListRef$curr;
+    var selectedList = ((_bsE3GoodListRef$curr = bsE3GoodListRef.current) === null || _bsE3GoodListRef$curr === void 0 ? void 0 : _bsE3GoodListRef$curr.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(BsE3GoodList, {
+    ref: bsE3GoodListRef
+  })));
+};
+var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
+var rowCheckKey = 'id';
+var getTableData$3 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'KM_ERP'
+    }, formData)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$2 = [{
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}, {
+  label: 'SKU名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: 'SKU编码',
   name: 'skuCode',
   dataIndex: 'specNo'
-}, {
-  label: 'SKU ID',
-  name: 'skuId',
-  dataIndex: 'specId'
 }];
-var GoodList$2 = function GoodList(props, ref) {
+var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -13319,7 +13718,7 @@ var GoodList$2 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('bse3'),
+  var _useGetColumns = useGetColumns('km'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -13334,7 +13733,7 @@ var GoodList$2 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$2, {
+  var _useAntdTable = useAntdTable(getTableData$3, {
       defaultPageSize: 10,
       form: form
     }),
@@ -13348,41 +13747,50 @@ var GoodList$2 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record[rowCheckKey]]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== record[rowCheckKey];
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return t[rowCheckKey] !== record[rowCheckKey];
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
+          return t[rowCheckKey];
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
+          return t[rowCheckKey];
         })));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return arrVal[rowCheckKey] !== othVal[rowCheckKey];
         });
         setSelect(list);
       }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row[rowCheckKey] || row.skuId;
+        }).includes(record[rowCheckKey] || record.skuId),
+        name: record[rowCheckKey]
+      };
+      return options;
     }
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== record[rowCheckKey];
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return t[rowCheckKey] !== record[rowCheckKey];
       }));
     };
     var showColumns = [{
@@ -13406,7 +13814,7 @@ var GoodList$2 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: rowCheckKey,
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -13424,7 +13832,7 @@ var GoodList$2 = function GoodList(props, ref) {
     active: true,
     loading: loading
   }, /*#__PURE__*/React.createElement(SearchForm, {
-    searchFormData: searchFormData$1,
+    searchFormData: searchFormData$2,
     form: form,
     showColumnsDataIndexList: showColumnsDataIndexList,
     submit: submit,
@@ -13435,7 +13843,7 @@ var GoodList$2 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: rowCheckKey,
     columns: columns,
     scroll: {
       x: '100%',
@@ -13452,13 +13860,15 @@ var GoodList$2 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var BsE3GoodList = /*#__PURE__*/forwardRef(GoodList$2);
+var ErpGoodsList = /*#__PURE__*/forwardRef(GoodList$3);
-var GoodsModal$4 = function GoodsModal(props, ref) {
+var ErpGoodsModal = function ErpGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         setVisible(true);
+        setSelectedRows(options.value || []);
       }
     };
   });
@@ -13468,13 +13878,17 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var bsE3GoodListRef = useRef(null);
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var erpGoodsListRef = useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _bsE3GoodListRef$curr;
-    var selectedList = ((_bsE3GoodListRef$curr = bsE3GoodListRef.current) === null || _bsE3GoodListRef$curr === void 0 ? void 0 : _bsE3GoodListRef$curr.getSelectGoodList()) || [];
+    var _erpGoodsListRef$curr;
+    var selectedList = ((_erpGoodsListRef$curr = erpGoodsListRef.current) === null || _erpGoodsListRef$curr === void 0 ? void 0 : _erpGoodsListRef$curr.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -13489,13 +13903,14 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(BsE3GoodList, {
-    ref: bsE3GoodListRef
+  }, /*#__PURE__*/React.createElement(ErpGoodsList, {
+    ref: erpGoodsListRef,
+    selectedRows: selectedRows
   })));
 };
-var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
+var KmGoodsModal = /*#__PURE__*/forwardRef(ErpGoodsModal);
-var getTableData$3 = function getTableData(_ref, formData) {
+var getTableData$4 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
@@ -13527,7 +13942,7 @@ var getTableData$3 = function getTableData(_ref, formData) {
     };
   });
 };
-var searchFormData$2 = [{
+var searchFormData$3 = [{
   label: '商品简称',
   name: 'goodShortName'
 }, {
@@ -13545,7 +13960,7 @@ var searchFormData$2 = [{
   label: '商品编码',
   name: 'goodNo'
 }];
-var GoodList$3 = function GoodList(props, ref) {
+var GoodList$4 = function GoodList(props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -13569,7 +13984,7 @@ var GoodList$3 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$3, {
+  var _useAntdTable = useAntdTable(getTableData$4, {
       defaultPageSize: 10,
       form: form
     }),
@@ -13659,7 +14074,7 @@ var GoodList$3 = function GoodList(props, ref) {
     active: true,
     loading: loading
   }, /*#__PURE__*/React.createElement(SearchForm, {
-    searchFormData: searchFormData$2,
+    searchFormData: searchFormData$3,
     form: form,
     showColumnsDataIndexList: showColumnsDataIndexList,
     submit: submit,
@@ -13687,7 +14102,7 @@ var GoodList$3 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var GyGoodsList$1 = /*#__PURE__*/forwardRef(GoodList$3);
+var GyGoodsList$1 = /*#__PURE__*/forwardRef(GoodList$4);
 var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
@@ -14436,6 +14851,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: 70
@@ -14445,7 +14864,7 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }],
     //旺店通换出商品信息
@@ -14557,6 +14976,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: 70
@@ -14566,13 +14989,13 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }]
   };
 };
-var getYesOrNo = function getYesOrNo(val) {
+var getYesOrNo$1 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14710,7 +15133,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       },
       width: 100
     }]
@@ -14722,7 +15145,7 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$1 = function getYesOrNo(val) {
+var getYesOrNo$2 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14832,7 +15255,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$1(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -14851,7 +15274,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -14971,7 +15394,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15095,7 +15518,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15217,7 +15640,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -15493,7 +15916,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -15602,7 +16025,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -15642,6 +16065,104 @@ var getColumns$5 = function getColumns() {
 };
 var getColumns$6 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    KM_GOODS: [{
+      dataIndex: 'sysSkuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150
+    }, {
+      dataIndex: 'outerId',
+      title: "\u5546\u5BB6\u7F16\u7801",
+      width: 150
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'num',
+      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) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -15754,7 +16275,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -15779,8 +16300,12 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$6({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$6({
+    default: getColumns$7({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -15932,6 +16457,222 @@ function HoverTableRowDeleteIcon(_ref) {
   })));
 }
+var isErpType = {
+  isWdt: function isWdt(type) {
+    return ['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type);
+  },
+  isBsE3: function isBsE3(type) {
+    return ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type);
+  },
+  isGy: function isGy(type) {
+    return ['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type);
+  },
+  isJst: function isJst(type) {
+    return ['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type);
+  },
+  isKm: function isKm(type) {
+    return ['KM_GOODS'].includes(type);
+  }
+};
+var processGoods = function processGoods(_ref) {
+  var list = _ref.list,
+    type = _ref.type,
+    canUpdateNumber = _ref.canUpdateNumber;
+  var newList = [];
+  // 根据商品类型处理数据
+  if (isErpType.isWdt(type)) {
+    newList = processWdtGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isBsE3(type)) {
+    newList = processBsE3Goods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isGy(type)) {
+    newList = processGyGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isJst(type)) {
+    newList = processJstGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isKm(type)) {
+    newList = processKmGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else {
+    newList = processDefaultGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  }
+  return newList;
+};
+// 处理不同类型的商品数据
+var processWdtGoods = function processWdtGoods(_ref2) {
+  var list = _ref2.list,
+    type = _ref2.type,
+    canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: uuid(),
+      canDelete: true,
+      num: 1,
+      orderPrice: 0,
+      sharePrice: 0,
+      canUpdateNumber: canUpdateNumber
+    });
+    // 特殊处理换货商品
+    if (type === 'WDT_EXCHANGE_GOODS') {
+      processedItem.price = item.retailPrice;
+      processedItem.type = '1';
+    }
+    return processedItem;
+  });
+};
+var processBsE3Goods = function processBsE3Goods(_ref3) {
+  var list = _ref3.list,
+    canUpdateNumber = _ref3.canUpdateNumber;
+  return list.map(function (item) {
+    var specNo = item.specNo,
+      specId = item.specId,
+      goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodPicUrl = item.goodPicUrl,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      retailPrice = item.retailPrice;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      sku: specNo,
+      skuId: specId,
+      goodsName: goodName,
+      goodsShortName: goodShortName,
+      picPath: goodPicUrl,
+      goodsSn: goodNo,
+      goodsId: goodId,
+      goodsPrice: retailPrice,
+      shopPrice: retailPrice,
+      sharePayment: '',
+      sharePrice: '',
+      payment: '',
+      tcSku: '',
+      tcGoodsNumber: '',
+      taoCanSingleSl: '',
+      isGift: '',
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      goodsNumber: 1,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+var processGyGoods = function processGyGoods(_ref4) {
+  var list = _ref4.list;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodNo = item.goodNo,
+      specName = item.specName,
+      specNo = item.specNo,
+      retailPrice = item.retailPrice;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1,
+      goodName: goodName,
+      goodShortName: goodShortName,
+      goodNo: goodNo,
+      specName: specName,
+      specNo: specNo,
+      originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
+      originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
+    });
+  });
+};
+var processJstGoods = function processJstGoods(_ref5) {
+  var list = _ref5.list;
+  return list.map(function (item) {
+    return {
+      name: item.goodName,
+      skuId: item.goodNo,
+      iId: item.styleCode,
+      pic: item.goodPicUrl,
+      propertiesValue: item.propertiesValue,
+      saleBasePrice: item.retailPrice,
+      salePrice: item.retailPrice,
+      remark: '',
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1
+    };
+  });
+};
+var processKmGoods = function processKmGoods(_ref6) {
+  var list = _ref6.list;
+  return list.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      sysSkuPropertiesName: item.specName,
+      sysTitle: item.goodName,
+      title: null,
+      shortTitle: item.goodShortName,
+      sysOuterId: item.goodNo,
+      outerId: item.goodNo,
+      skuSysId: item.specId,
+      itemSysId: item.goodId,
+      sysPicPath: item.goodPicUrl,
+      payment: null,
+      price: item.retailPrice,
+      type: null,
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      num: 1
+    });
+  });
+};
+var processDefaultGoods = function processDefaultGoods(_ref7) {
+  var list = _ref7.list,
+    canUpdateNumber = _ref7.canUpdateNumber;
+  return list.map(function (item) {
+    var goodsId = item.goodsId,
+      name = item.name,
+      code = item.code,
+      skuCode = item.skuCode,
+      marketPrice = item.marketPrice,
+      skuName = item.skuName;
+    return {
+      id: goodsId,
+      mark: '是',
+      pic: '',
+      skuName: skuName,
+      name: name,
+      code: code,
+      sku: skuCode,
+      money: marketPrice || 0,
+      share: marketPrice || 0,
+      number: 1,
+      type: '',
+      uuid: uuid(),
+      canDelete: true,
+      canUpdateNumber: canUpdateNumber
+    };
+  });
+};
 var GoodsModalMap = {
   WDT_REISSUE_GOODS: WdtGoodsModal,
   WDT_GOODS: WdtGoodsModal,
@@ -15941,10 +16682,12 @@ var GoodsModalMap = {
   BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
   GY_GOODS: GyGoodsModal$2,
   GY_REISSUE_GOODS: GyGoodsModal$2,
+  GY_RETURN_GOODS: GyGoodsModal$2,
   JST_GOODS: JstGoodsModal,
   JST_REISSUE_GOODS: JstGoodsModal,
   JST_RETURN_GOODS: JstGoodsModal,
   JST_EXCHANGE_GOODS: JstGoodsModal,
+  KM_GOODS: KmGoodsModal,
   OTHER_GOODS: GoodsModal$2
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
@@ -15978,7 +16721,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    // console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -16007,13 +16750,16 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
 };
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['KM_GOODS'].includes(type)) {
+    return '选择快麦ERP商品';
+  }
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
     return '选择百胜ERP商品';
   }
   if (['WDT_REISSUE_GOODS'].includes(type)) {
     return '选择旺店通商品';
   }
-  if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
+  if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
     return '选择管易ERP商品';
   }
   if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
@@ -16150,6 +16896,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JST_RETURN_GOODS':
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
+        case 'KM_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -16267,120 +17014,11 @@ var GoodItem$1 = function GoodItem(props) {
     }].concat(_toConsumableArray(columns));
   }, []);
   var onSubmit = function onSubmit(list) {
-    var newList = [];
-    if (['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        item.uuid = uuid();
-        item.canDelete = true;
-        item.num = 1;
-        item.orderPrice = 0;
-        item.sharePrice = 0;
-        item.canUpdateNumber = canUpdateNumber;
-        if (type === 'WDT_EXCHANGE_GOODS') {
-          item.price = item.retailPrice;
-          item.type = '1';
-        }
-        return item;
-      });
-    } else if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        var specNo = item.specNo,
-          specId = item.specId,
-          goodName = item.goodName,
-          goodShortName = item.goodShortName,
-          goodPicUrl = item.goodPicUrl,
-          goodNo = item.goodNo,
-          goodId = item.goodId,
-          retailPrice = item.retailPrice;
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          sku: specNo,
-          skuId: specId,
-          goodsName: goodName,
-          goodsShortName: goodShortName,
-          picPath: goodPicUrl,
-          goodsSn: goodNo,
-          goodsId: goodId,
-          goodsPrice: retailPrice,
-          shopPrice: retailPrice,
-          sharePayment: '',
-          sharePrice: '',
-          payment: '',
-          tcSku: '',
-          tcGoodsNumber: '',
-          taoCanSingleSl: '',
-          isGift: '',
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          goodsNumber: 1,
-          canUpdateNumber: canUpdateNumber
-        });
-      });
-    } else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        var goodName = item.goodName,
-          goodShortName = item.goodShortName,
-          goodNo = item.goodNo,
-          specName = item.specName,
-          specNo = item.specNo,
-          retailPrice = item.retailPrice;
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          qty: 1,
-          goodName: goodName,
-          goodShortName: goodShortName,
-          goodNo: goodNo,
-          specName: specName,
-          specNo: specNo,
-          originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
-          originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
-        });
-      });
-    } else if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        return {
-          name: item.goodName,
-          skuId: item.goodNo,
-          iId: item.styleCode,
-          pic: item.goodPicUrl,
-          propertiesValue: item.propertiesValue,
-          saleBasePrice: item.retailPrice,
-          salePrice: item.retailPrice,
-          remark: '',
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          qty: 1
-        };
-      });
-    } else {
-      newList = list.map(function (item) {
-        var goodsId = item.goodsId,
-          name = item.name,
-          code = item.code,
-          skuCode = item.skuCode,
-          marketPrice = item.marketPrice,
-          skuName = item.skuName;
-        return {
-          id: goodsId,
-          mark: '是',
-          pic: '',
-          skuName: skuName,
-          name: name,
-          code: code,
-          sku: skuCode,
-          money: marketPrice || 0,
-          share: marketPrice || 0,
-          number: 1,
-          type: '',
-          uuid: uuid(),
-          canDelete: true,
-          canUpdateNumber: canUpdateNumber
-        };
-      });
-    }
+    var newList = processGoods({
+      list: list,
+      canUpdateNumber: canUpdateNumber,
+      type: type
+    });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
   };
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
@@ -17094,10 +17732,12 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
           var _data$data, _data$data$trades;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
             data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
+              var _tradeStatusMap$data$;
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName
+                billTag: item.tagName,
+                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]
               });
             });
           }
@@ -17340,7 +17980,6 @@ var index$3 = (function (props) {
       } else if (type === 'BS_E3_SYSTEM_ORDER') {
         getBsE3OrderList(value.orderNo);
       } else if (type === 'GY_SYSTEM_ORDER') {
-        console.log('触发gy--getGyOrderList--1');
         getGyOrderList(value.orderNo);
       } else if (type === 'JST_SYSTEM_ORDER') {
         getJstOrderList(value.orderNo);
@@ -17454,11 +18093,13 @@ var index$3 = (function (props) {
                 showOrderInfo: trades.map(function (_ref4) {
                   var billNo = _ref4.billNo,
                     billType = _ref4.billType,
-                    billTag = _ref4.billTag;
+                    billTag = _ref4.billTag,
+                    tradeStatusValue = _ref4.tradeStatusValue;
                   return {
                     billNo: billNo,
                     billType: billType,
-                    billTag: billTag
+                    billTag: billTag,
+                    tradeStatusValue: tradeStatusValue
                   };
                 })
               }));
@@ -17768,6 +18409,31 @@ var componentMap$1 = {
       returnDeleteGood: 'jstReturnDeleteGood',
       exchangeDeleteGood: 'jstExchangeDeleteGood'
     }
+  },
+  KM_GOODS: {
+    type: 'km',
+    key: 'kmGoods',
+    name: '快麦',
+    orderNo: 'tid',
+    goodDetailOrderNo: 'originalDealCode',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'kmType',
+      updateGoodsHandle: updateKmGoodsHandle,
+      selectListReturn: 'kmSelectListReturn',
+      selectList: 'kmSelectList',
+      reissueSelectList: 'kmReissueSelectList',
+      reissueSelectListReturn: 'kmReissueSelectListReturn',
+      reissueDeleteGood: 'kmReissueDeleteGood',
+      changeShopCode: 'kmChangeShopCode',
+      reissueType: 'kmReissueType',
+      returnType: 'kmReturnType',
+      returnSelectListReturn: 'kmReturnSelectListReturn',
+      returnSelectList: 'kmReturnSelectList',
+      deleteGood: 'kmDeleteGood',
+      returnDeleteGood: 'kmReturnDeleteGood',
+      exchangeDeleteGood: 'kmExchangeDeleteGood'
+    }
   }
 };
 var CommonGoods = function CommonGoods(props) {
@@ -17776,7 +18442,7 @@ var CommonGoods = function CommonGoods(props) {
     disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
-  console.log('value?.orders', value === null || value === void 0 ? void 0 : value.orders);
+  // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
   var showModeBtn = !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
@@ -17983,7 +18649,8 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    compType = props.type;
+    compType = props.type,
+    isSettingConfig = props.isSettingConfig;
   var valueRef = useRef({});
   useEffect(function () {
     var subscription = pubsub.subscribe(componentMap$2[compType].eventNameMap.exchangeCopyGood, function () {
@@ -18075,7 +18742,7 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     var newValue = _objectSpread2({}, value);
     newValue[componentMap$2[compType].returnTypeKey] = val;
     newValue[componentMap$2[compType].valueKey] = [];
-    if (['2'].includes(val[0])) {
+    if (isSettingConfig || ['2'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       valueRef.current = newValue;
     }
@@ -18097,7 +18764,7 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value[componentMap$2[compType].returnTypeKey],
@@ -18279,7 +18946,7 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   })));
 };
-var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$1 = {
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
@@ -18300,13 +18967,14 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s5, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _value$wdtSystemOrder, _typeMap$type23, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s5, _typeMap$type27, _typeMap$type28, _typeMap$type29;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
+    isSettingConfig = props.isSettingConfig,
     other = _objectWithoutProperties(props, _excluded$i);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$wdtSystemOrder = value.wdtSystemOrder) === null || _value$wdtSystemOrder === void 0 ? void 0 : _value$wdtSystemOrder.orders) || []).some(function (order) {
     var _order$srcTid;
@@ -18370,11 +19038,13 @@ var wdtReissue = function wdtReissue(props) {
               var showOrderInfo = orders.map(function (_ref2) {
                 var billNo = _ref2.billNo,
                   billType = _ref2.billType,
-                  billTag = _ref2.billTag;
+                  billTag = _ref2.billTag,
+                  tradeStatusValue = _ref2.tradeStatusValue;
                 return {
                   billNo: billNo,
                   billType: billType,
-                  billTag: billTag
+                  billTag: billTag,
+                  tradeStatusValue: tradeStatusValue
                 };
               });
               onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) || {}), {}, {
@@ -18457,7 +19127,7 @@ var wdtReissue = function wdtReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type21, _typeMap$type22, _uniqBy, _typeMap$type23;
+    var _typeMap$type21, _typeMap$type22, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -18468,14 +19138,14 @@ var wdtReissue = function wdtReissue(props) {
     newValue["".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)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)], isStrict]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _typeMap$type25;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]]);
+    var _typeMap$type24;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
@@ -18493,12 +19163,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -18516,10 +19186,10 @@ var wdtReissue = function wdtReissue(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -18531,7 +19201,7 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -18547,7 +19217,7 @@ var wdtReissue = function wdtReissue(props) {
   })));
 };
-var _excluded$j = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$j = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$2 = {
   JST_REISSUE_GOODS: {
     compType: '补发',
@@ -18595,6 +19265,7 @@ var PublicReissue = function PublicReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
+    isSettingConfig = props.isSettingConfig,
     other = _objectWithoutProperties(props, _excluded$j);
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -18803,7 +19474,7 @@ var PublicReissue = function PublicReissue(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.typeName)],
@@ -19603,6 +20274,39 @@ var MsgStatus = function MsgStatus(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null) : null);
 };
+var _excluded$n = ["showOnly", "getOptionsAsync"];
+var AsyncSelect = function AsyncSelect(props) {
+  var _props$showOnly = props.showOnly,
+    showOnly = _props$showOnly === void 0 ? false : _props$showOnly,
+    getOptionsAsync = props.getOptionsAsync,
+    otherProps = _objectWithoutProperties(props, _excluded$n);
+  var _React$useState = React.useState([]),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    data = _React$useState2[0],
+    setData = _React$useState2[1];
+  React.useEffect(function () {
+    getOptionsAsync === null || getOptionsAsync === void 0 ? void 0 : getOptionsAsync().then(function (list) {
+      setData(list);
+    });
+  }, []);
+  var options = [].concat(_toConsumableArray(props.options || []), _toConsumableArray(data || []));
+  if (showOnly) {
+    var selectedItem = options.find(function (option) {
+      return option.value === props.value;
+    });
+    return selectedItem ? selectedItem.label : props.value;
+  }
+  return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    },
+    notFoundContent: null
+  }, otherProps), {}, {
+    options: options
+  }));
+};
 var CalculationInput = function CalculationInput(props) {
   var _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config;
@@ -19621,7 +20325,7 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
-var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$o = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$3 = {
   BS_E3_REISSUE_GOODS: {
     key: 'bsE3ReissueGoods',
@@ -19639,7 +20343,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$n);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$o);
   var getOrderFlag = useRef(false);
   var valueRef = useRef(null);
   var _useState = useState(false),
@@ -19826,7 +20531,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type27 = typeMap$3[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
@@ -19857,7 +20562,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
   })));
 };
-var _excluded$o = ["value", "onChange", "reasonList", "disabled", "type"],
+var _excluded$p = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
   _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$4 = {
   GY_REISSUE_GOODS: {
@@ -19879,14 +20584,15 @@ var typeMap$4 = {
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
+  var _typeMap$type27, _typeMap$type28, _typeMap$type29, _systemOrder$orders, _typeMap$type30, _value$typeMap$type$s5, _typeMap$type31, _typeMap$type32, _typeMap$type33;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$o);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$p);
   // const showModeBtn = (value?.gySystemOrder?.orders || []).some((order: any) =>
   //   order?.platformCode?.includes(';'),
   // );
@@ -20034,7 +20740,7 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _ref12, _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
+    var _ref12, _typeMap$type25, _typeMap$type26, _uniqBy;
     pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
@@ -20046,21 +20752,15 @@ var GyReissue = function GyReissue(props) {
     newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var showChangeBtn = useMemo(function () {
-    var _typeMap$type29;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
-  return /*#__PURE__*/React.createElement("div", {
-    id: "TEST_GY",
-    onClick: function onClick() {
-      console.log('TEST_GY', value);
-    }
-  }, /*#__PURE__*/React.createElement(Row, {
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder];
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
+  var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
   }, /*#__PURE__*/React.createElement(Col, {
@@ -20077,12 +20777,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -20100,10 +20800,10 @@ var GyReissue = function GyReissue(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -20114,8 +20814,10 @@ var GyReissue = function GyReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
+    showErpGoodsBtn: showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -20130,7 +20832,7 @@ var GyReissue = function GyReissue(props) {
   })));
 };
-var _excluded$p = ["value", "onChange", "reasonList", "disabled", "type"],
+var _excluded$q = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
   _excluded2$1 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$5 = {
   GY_RETURN_GOODS: {
@@ -20152,14 +20854,15 @@ var typeMap$5 = {
   }
 };
 var GyReturnGoods = function GyReturnGoods(props) {
-  var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
+  var _typeMap$type9, _typeMap$type26, _systemOrder$orders, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$p);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$q);
   var valueRef = useRef({});
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -20260,7 +20963,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
     };
   }();
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type7, _typeMap$type8, _uniqBy, _typeMap$type9;
+    var _typeMap$type7, _typeMap$type8, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -20271,49 +20974,49 @@ var GyReturnGoods = function GyReturnGoods(props) {
     newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type8 = typeMap$5[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type9 = typeMap$5[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type10 = typeMap$5[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type9 = typeMap$5[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)], isStrict]);
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _value$typeMap$type$t, _typeMap$type11, _typeMap$type12;
+    var _value$typeMap$type$t, _typeMap$type10, _typeMap$type11;
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type11 = typeMap$5[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
+    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type10 = typeMap$5[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type12 = typeMap$5[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.typeName] = val;
+    newValue[(_typeMap$type11 = typeMap$5[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type13;
-      newValue[(_typeMap$type13 = typeMap$5[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = getGoodDetails({
+      var _typeMap$type12;
+      newValue[(_typeMap$type12 = typeMap$5[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type14;
+      var _typeMap$type13;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type14 = typeMap$5[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key] = [];
+      newValue[(_typeMap$type13 = typeMap$5[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type15;
+    var _typeMap$type14;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type15 = typeMap$5[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
-      var _typeMap$type16, _typeMap$type17;
-      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type16 = typeMap$5[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type17 = typeMap$5[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
+    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type14 = typeMap$5[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = (val || []).map(function (item) {
+      var _typeMap$type15, _typeMap$type16;
+      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type15 = typeMap$5[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type16 = typeMap$5[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type18, _value$typeMap$type$t2, _typeMap$type19, _value$typeMap$type$t3, _typeMap$type21;
+    var _typeMap$type17, _value$typeMap$type$t2, _typeMap$type18, _value$typeMap$type$t3, _typeMap$type20;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type18 = typeMap$5[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type19 = typeMap$5[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type20;
-      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type20 = typeMap$5[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type21 = typeMap$5[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type22;
-      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type22 = typeMap$5[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
+    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type17 = typeMap$5[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type18 = typeMap$5[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type19;
+      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type19 = typeMap$5[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type20 = typeMap$5[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type21;
+      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type21 = typeMap$5[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -20321,11 +21024,11 @@ var GyReturnGoods = function GyReturnGoods(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type23, _typeMap$type24, _order$details;
+    var _typeMap$type22, _typeMap$type23, _order$details;
     var mode = _ref4.mode,
       sysOrderNo = _ref4.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$5[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$5[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$5[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$5[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
@@ -20336,19 +21039,18 @@ var GyReturnGoods = function GyReturnGoods(props) {
     }) : goodDetails;
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _value$typeMap$type$t4, _typeMap$type25, _typeMap$type26;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type25 = typeMap$5[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0]) === '1';
+    var _value$typeMap$type$t4, _typeMap$type24, _typeMap$type25;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type24 = typeMap$5[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type26 = typeMap$5[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type25 = typeMap$5[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key, getGoodDetails({
       mode: mode
     }))));
   };
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var showChangeBtn = useMemo(function () {
-    var _typeMap$type27;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$5[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder];
+  var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
@@ -20366,12 +21068,12 @@ var GyReturnGoods = function GyReturnGoods(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type29 = typeMap$5[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u9000\u8D27\u7684\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$5[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$5[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -20389,10 +21091,10 @@ var GyReturnGoods = function GyReturnGoods(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type31 = typeMap$5[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type30 = typeMap$5[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -20404,13 +21106,14 @@ var GyReturnGoods = function GyReturnGoods(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type32 = typeMap$5[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type31 = typeMap$5[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     isStrict: isStrict,
-    showErpGoodsBtn: false,
+    showErpGoodsBtn: showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict
@@ -20420,4 +21123,4 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$6 as getKmColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };