@kmkf-fe-packages/basic-components 2.0.54-beta.4 → 2.0.54-beta.41

package/dist/index.js

@@ -10974,7 +10974,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   })), /*#__PURE__*/React__default['default'].createElement(Item, {
     label: '发件人手机号',
-    required: true,
+    // required={true}
     key: 'interceptSenderMobile',
     hidden: !showSenderMobile
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
@@ -11154,7 +11154,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)));
@@ -11165,13 +11169,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) {
@@ -11196,13 +11210,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 && antd.message.error(msg);
@@ -11211,6 +11231,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) && antd.message.error(err === null || err === void 0 ? void 0 : err.message);
@@ -11264,6 +11288,31 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       }
     });
   };
+  // 接口状态
+  var LogisticsApiStatus = function LogisticsApiStatus() {
+    var _value$trajectoryApiS2, _value$trajectoryApiS3, _value$trajectoryApiS4;
+    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].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__default['default'].createElement(antd.Input, {
@@ -11278,7 +11327,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React__default['default'].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__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -11491,7 +11540,8 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
     disabled: disabled,
     onChange: function onChange(val) {
       return handleChange(val, changeIndex);
-    }
+    },
+    isSingle: false
   }));
 };
 
@@ -11514,7 +11564,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,
@@ -11532,8 +11582,8 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
-  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11616,59 +11666,51 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
-    type: logisticsType,
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].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__default['default'].createElement(antd.Input, {
+  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].createElement(antd.Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].createElement(antd.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__default['default'].createElement(antd.Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].createElement(antd.Select, {
     style: {
       minWidth: '100px',
@@ -11679,7 +11721,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);
     }
@@ -11689,14 +11731,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__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.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);
 };
 
@@ -12263,7 +12305,7 @@ var gyColumns = [{
 }, {
   dataIndex: 'specNo',
   title: 'SKU编码',
-  width: 200,
+  width: 150,
   ellipsis: true
 }, {
   dataIndex: 'goodName',
@@ -12274,11 +12316,11 @@ var gyColumns = [{
   dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 250
+  width: 150
 }, {
   dataIndex: 'goodNo',
   title: '商品编码',
-  width: 200,
+  width: 150,
   ellipsis: true
 }, {
   dataIndex: 'goodPicUrl',
@@ -12551,12 +12593,144 @@ var bse3Columns = [{
   width: 100
 }];
 
+var getYesOrNo = function getYesOrNo(val) {
+  if (!lodash.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__default['default'].createElement(antd.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__default['default'].createElement(antd.Image, {
+      width: 60,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'isGift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].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__default['default'].createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'isSkuItem',
+  title: "\u662F\u5426\u542B\u6709SKU",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].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 lodash.cloneDeep({
     gy: gyColumns,
     jst: jstColumns,
     wdt: wdtColumns,
-    bse3: bse3Columns
+    bse3: bse3Columns,
+    km: kmColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -12611,9 +12785,7 @@ var useGetColumns = (function (type) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var showColumnsDataIndexList = React.useMemo(function () {
-    return columns.filter(function (item) {
-      return Object.hasOwn(item, 'dataIndex');
-    }).map(function (item) {
+    return columns.map(function (item) {
       return item.dataIndex;
     });
   }, [columns]);
@@ -13508,23 +13680,17 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
 };
 var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
 
+var rowCheckKey = 'id';
 var getTableData$3 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'KM_ERP'
+    }, formData)
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -13541,22 +13707,19 @@ var getTableData$3 = function getTableData(_ref, formData) {
   });
 };
 var searchFormData$2 = [{
-  label: '商品简称',
-  name: 'goodShortName'
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  label: '商品sku名称',
+  label: '商品编码',
+  name: 'goodNo'
+}, {
+  label: 'SKU名称',
   name: 'skuName',
   dataIndex: 'specName'
 }, {
-  label: '商品sku编码',
+  label: 'SKU编码',
   name: 'skuCode',
   dataIndex: 'specNo'
-}, {
-  label: '商品名称',
-  name: 'goodName'
-}, {
-  label: '商品编码',
-  name: 'goodNo'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -13567,7 +13730,7 @@ var GoodList$3 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('gy'),
+  var _useGetColumns = useGetColumns('km'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -13596,41 +13759,50 @@ var GoodList$3 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record[rowCheckKey]]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.id;
+          return t !== record[rowCheckKey];
         }));
         setSelect(selectList.filter(function (t) {
-          return t.id !== record.id;
+          return t[rowCheckKey] !== record[rowCheckKey];
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.id;
+          return t[rowCheckKey];
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.id;
+          return t[rowCheckKey];
         })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.id !== othVal.id;
+          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.id;
+        return t !== record[rowCheckKey];
       }));
       setSelect(selectList.filter(function (t) {
-        return t.id !== record.id;
+        return t[rowCheckKey] !== record[rowCheckKey];
       }));
     };
     var showColumns = [{
@@ -13654,7 +13826,7 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'id',
+      rowKey: rowCheckKey,
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -13683,7 +13855,7 @@ var GoodList$3 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "id",
+    rowKey: rowCheckKey,
     columns: columns,
     scroll: {
       x: '100%',
@@ -13700,13 +13872,15 @@ var GoodList$3 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
 };
-var GyGoodsList$1 = /*#__PURE__*/React.forwardRef(GoodList$3);
+var ErpGoodsList = /*#__PURE__*/React.forwardRef(GoodList$3);
 
-var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
+var ErpGoodsModal = function ErpGoodsModal(props, ref) {
   React.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 || []);
       }
     };
   });
@@ -13716,13 +13890,17 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var gyGoodsListRef = React.useRef(null);
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var erpGoodsListRef = React.useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _gyGoodsListRef$curre;
-    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
+    var _erpGoodsListRef$curr;
+    var selectedList = ((_erpGoodsListRef$curr = erpGoodsListRef.current) === null || _erpGoodsListRef$curr === void 0 ? void 0 : _erpGoodsListRef$curr.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -13737,84 +13915,320 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList$1, {
-    ref: gyGoodsListRef
+  }, /*#__PURE__*/React__default['default'].createElement(ErpGoodsList, {
+    ref: erpGoodsListRef,
+    selectedRows: selectedRows
   })));
 };
-var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
+var KmGoodsModal = /*#__PURE__*/React.forwardRef(ErpGoodsModal);
 
-var getColumns = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //百胜E3补发商品
-    BS_E3_REISSUE_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      width: 150
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 60,
-          src: val
-        });
-      }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      width: 150
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u53F7ID",
-      width: 150
-    }, {
-      dataIndex: 'colorName',
-      title: "\u989C\u8272\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'colorCode',
-      title: "\u989C\u8272\u4EE3\u7801",
-      width: 150
-    }, {
-      dataIndex: 'sizeName',
-      title: "\u5C3A\u7801\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'sizeCode',
-      title: "\u5C3A\u7801\u4EE3\u7801",
-      width: 150
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodsNumber',
-      title: "\u5546\u54C1\u6570\u91CF",
-      width: 150
-    }, {
-      dataIndex: 'goodsPrice',
-      title: "\u5546\u54C1\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'shopPrice',
-      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-      width: 150
+var getTableData$4 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    goodShortName: formData.goodShortName || null,
+    skuName: formData.skuName || null,
+    skuCode: formData.skuCode || null,
+    goodName: formData.goodName || null,
+    goodNo: formData.goodNo || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'GY_ERP'
+    }, data)
+  }).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$3 = [{
+  label: '商品简称',
+  name: 'goodShortName'
+}, {
+  label: '商品sku名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: '商品sku编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
+}, {
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}];
+var GoodList$4 = function GoodList(props, ref) {
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('gy'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  React.useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = antd.Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = ahooks.useAntdTable(getTableData$4, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(lodash.takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData$3,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, tableProps))), /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(icons.CaretUpOutlined, null))));
+};
+var GyGoodsList$1 = /*#__PURE__*/React.forwardRef(GoodList$4);
+
+var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
+  React.useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var gyGoodsListRef = React.useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _gyGoodsListRef$curre;
+    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList$1, {
+    ref: gyGoodsListRef
+  })));
+};
+var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
+
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //百胜E3补发商品
+    BS_E3_REISSUE_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      width: 150
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'goodsSn',
+      title: "\u8D27\u53F7",
+      width: 150
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u53F7ID",
+      width: 150
+    }, {
+      dataIndex: 'colorName',
+      title: "\u989C\u8272\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'colorCode',
+      title: "\u989C\u8272\u4EE3\u7801",
+      width: 150
+    }, {
+      dataIndex: 'sizeName',
+      title: "\u5C3A\u7801\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'sizeCode',
+      title: "\u5C3A\u7801\u4EE3\u7801",
+      width: 150
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'goodsNumber',
+      title: "\u5546\u54C1\u6570\u91CF",
+      width: 150
+    }, {
+      dataIndex: 'goodsPrice',
+      title: "\u5546\u54C1\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'shopPrice',
+      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+      width: 150
     }, {
       dataIndex: 'isGift',
       title: "\u662F\u5426\u8D60\u54C1",
@@ -14449,6 +14863,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           style: {
             width: 70
@@ -14458,7 +14876,7 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
     }],
     //旺店通换出商品信息
@@ -14570,6 +14988,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           style: {
             width: 70
@@ -14579,13 +15001,13 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
     }]
   };
 };
 
-var getYesOrNo = function getYesOrNo(val) {
+var getYesOrNo$1 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14723,7 +15145,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
       },
       width: 100
     }]
@@ -14735,7 +15157,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 (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14845,7 +15267,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -14864,7 +15286,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -14984,7 +15406,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15108,7 +15530,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15230,7 +15652,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',
@@ -15506,7 +15928,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',
@@ -15553,53 +15975,282 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'name',
       title: '商品名称'
     }, {
-      dataIndex: 'skuId',
-      title: '商品编码'
+      dataIndex: 'skuId',
+      title: '商品编码'
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码'
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值'
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.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, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }].map(fillAttrs)
+  };
+};
+
+function toNum$2(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$6 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    KM_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      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__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].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__default['default'].createElement(antd.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__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'sysSkuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150
     }, {
-      dataIndex: 'iId',
-      title: '款式编码'
+      dataIndex: 'outerId',
+      title: "\u5546\u5BB6\u7F16\u7801",
+      width: 150
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 60,
-          src: val
-        });
-      }
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150
     }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值'
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
+          var realNum = toNum$2(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var res = typeof realNum === 'number' ? realNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'realNum');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'qty',
-      title: '数量',
+      dataIndex: 'desiredNum',
+      title: "\u5E94\u8865\u53D1\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
@@ -15607,54 +16258,55 @@ var getColumns$5 = function getColumns() {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
-      }
-    }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: true
-          }, {
-            label: '否',
-            value: false
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      }
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150
     }, {
-      dataIndex: 'remark',
-      title: '备注',
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
-            width: 70
+            width: 130
           },
           value: val,
-          onChange: function onChange(e) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
-    }].map(fillAttrs)
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
   };
 };
 
-var getColumns$6 = function getColumns(_ref) {
+var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -15767,7 +16419,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
@@ -15792,8 +16444,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
@@ -15945,6 +16601,231 @@ 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', 'KM_REISSUE_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: kmkfUtils.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: kmkfUtils.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: kmkfUtils.uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1,
+      goodName: goodName,
+      goodShortName: goodShortName,
+      goodNo: goodNo,
+      specName: specName,
+      specNo: specNo,
+      originPrice: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
+      originAmount: !kmkfUtils.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: kmkfUtils.uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1
+    };
+  });
+};
+var processKmGoods = function processKmGoods(_ref6) {
+  var list = _ref6.list,
+    type = _ref6.type;
+  var initParamsMap = {
+    KM_GOODS: {
+      num: 1
+    },
+    KM_REISSUE_GOODS: {
+      realNum: 1,
+      desiredNum: 1
+    }
+  };
+  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: kmkfUtils.uuid(),
+      canDelete: true,
+      canEdit: true
+    }, initParamsMap[type] || {});
+  });
+};
+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: kmkfUtils.uuid(),
+      canDelete: true,
+      canUpdateNumber: canUpdateNumber
+    };
+  });
+};
+
 var GoodsModalMap = {
   WDT_REISSUE_GOODS: WdtGoodsModal,
   WDT_GOODS: WdtGoodsModal,
@@ -15954,10 +16835,13 @@ 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,
+  KM_REISSUE_GOODS: KmGoodsModal,
   OTHER_GOODS: GoodsModal$2
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
@@ -15991,7 +16875,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 = {
@@ -16020,13 +16904,16 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
 };
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['KM_GOODS', 'KM_REISSUE_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)) {
@@ -16163,6 +17050,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JST_RETURN_GOODS':
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
+        case 'KM_GOODS':
+        case 'KM_REISSUE_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -16280,120 +17169,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 = kmkfUtils.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: kmkfUtils.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: kmkfUtils.uuid(),
-          canDelete: true,
-          canEdit: true,
-          qty: 1,
-          goodName: goodName,
-          goodShortName: goodShortName,
-          goodNo: goodNo,
-          specName: specName,
-          specNo: specNo,
-          originPrice: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
-          originAmount: !kmkfUtils.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: kmkfUtils.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: kmkfUtils.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) {
@@ -17107,10 +17887,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 = kmkfUtils.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: kmkfUtils.WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName
+                billTag: item.tagName,
+                tradeStatusValue: kmkfUtils.tradeStatusMap === null || kmkfUtils.tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = kmkfUtils.tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
               });
             });
           }
@@ -17353,7 +18135,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);
@@ -17467,11 +18248,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
                   };
                 })
               }));
@@ -17781,6 +18564,31 @@ var componentMap$1 = {
       returnDeleteGood: 'jstReturnDeleteGood',
       exchangeDeleteGood: 'jstExchangeDeleteGood'
     }
+  },
+  KM_GOODS: {
+    type: 'km',
+    key: 'kmGoods',
+    name: '快麦',
+    orderNo: 'tid',
+    goodDetailOrderNo: 'originalDealCode',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'kmType',
+      updateGoodsHandle: kmkfUtils.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) {
@@ -17789,7 +18597,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;
@@ -17942,7 +18750,9 @@ var CommonGoods = function CommonGoods(props) {
   var getGoodDetails = function getGoodDetails(_ref2) {
     var mode = _ref2.mode;
     var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
-    var goodDetails = updateHandle(value.orders || []);
+    var goodDetails = updateHandle(value.orders || [], {
+      orderBackGoodsLevel: props.orderBackGoodsLevel
+    });
     var orderNo = value.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       var _componentMap$compTyp;
@@ -17996,7 +18806,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 = React.useRef({});
   React.useEffect(function () {
     var subscription = pubsub__default['default'].subscribe(componentMap$2[compType].eventNameMap.exchangeCopyGood, function () {
@@ -18088,7 +18899,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;
     }
@@ -18110,7 +18921,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],
@@ -18292,7 +19103,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',
@@ -18313,13 +19124,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;
@@ -18383,11 +19195,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]) || {}), {}, {
@@ -18470,7 +19284,7 @@ var wdtReissue = function wdtReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type21, _typeMap$type22, _uniqBy, _typeMap$type23;
+    var _typeMap$type21, _typeMap$type22, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -18481,14 +19295,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 = lodash.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 = React.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__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
@@ -18502,16 +19316,17 @@ var wdtReissue = function wdtReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     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__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -18527,12 +19342,13 @@ var wdtReissue = function wdtReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    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);
     }
@@ -18544,7 +19360,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);
     },
@@ -18560,7 +19376,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: '补发',
@@ -18575,7 +19391,9 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'oId',
     outerOiIdKey: '',
-    goodDetailsKey: 'items'
+    goodDetailsKey: 'items',
+    mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
+    uniqueKey: 'uuid'
   },
   JST_RETURN_GOODS: {
     compType: '退货',
@@ -18591,6 +19409,8 @@ var typeMap$2 = {
     oIdKey: 'oId',
     outerOiIdKey: '',
     goodDetailsKey: 'items',
+    mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
+    uniqueKey: 'uuid',
     eventNameMap: {
       // pubsub 事件
       exchangeCopyGood: 'jstExchangeCopyGood',
@@ -18598,16 +19418,32 @@ var typeMap$2 = {
       returnGoodsSysorder: 'jstReturnGoodsSysorder',
       returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
     }
+  },
+  KM_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'kmReissueGoods',
+    typeName: 'kmReissueType',
+    systemOrder: 'kmSystemOrder',
+    systemOrderNo: 'kmSystemOrderNo',
+    getOrderList: kmUtils.getOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateKmGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'billNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'subOrders',
+    uniqueKey: 'id'
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44;
+  var _typeMap$type32, _typeMap$type37, _typeMap$type38, _typeMap$type39, _typeMap$type40, _value$typeMap$type$s6, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48;
   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$j);
   var getOrderFlag = React.useRef(false);
   var _useState = React.useState(false),
@@ -18714,7 +19550,7 @@ var PublicReissue = function PublicReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19;
+    var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19, _typeMap$type20;
     var mode = _ref4.mode,
       sysOrderNo = _ref4.sysOrderNo;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrder];
@@ -18722,37 +19558,47 @@ var PublicReissue = function PublicReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[typeMap$2[type].oIdKey] === systemOrderNo;
     });
-    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? (_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], true) : []);
+    var orderRest = undefined;
+    if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
+      orderRest = true;
+    } else if (type === 'KM_REISSUE_GOODS') {
+      orderRest = {
+        orderBackGoodsLevel: props.orderBackGoodsLevel,
+        canEdit: true
+      };
+    }
+    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], orderRest)) : (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    var list = mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
     }) : goodDetails;
+    return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type20;
+    var _typeMap$type21;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type21, _typeMap$type22, _value$typeMap$type$t2, _typeMap$type27, _value$typeMap$type$t3, _typeMap$type29;
+    var _typeMap$type22, _typeMap$type23, _value$typeMap$type$t2, _typeMap$type28, _value$typeMap$type$t3, _typeMap$type30;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderBillType) {
-      var _value$typeMap$type$s5, _typeMap$type23, _typeMap$type25, _typeMap$type26;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orders) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderBillType) {
+      var _value$typeMap$type$s5, _typeMap$type24, _typeMap$type26, _typeMap$type27;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type24;
-        return oItem[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.oIdKey] === val;
+        var _typeMap$type25;
+        return oItem[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.oIdKey] === val;
       });
-      newValue[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type28;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type30;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = getGoodDetails({
+      newValue[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type29;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type31;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -18760,25 +19606,26 @@ var PublicReissue = function PublicReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type32, _typeMap$type33, _uniqBy;
+    var _typeMap$type33, _typeMap$type34, _uniqBy, _typeMap$type35;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      return skuList.includes(item.uuid);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type36;
+      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey]);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key) || "".concat(Date.now())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -18789,16 +19636,17 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo)],
+    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.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -18814,16 +19662,17 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    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)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderBillType) && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -18832,7 +19681,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -18842,10 +19691,10 @@ var PublicReissue = function PublicReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.alwaysShowChooseErpGoodsBtn,
+    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.showErpGoodsBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -18856,6 +19705,7 @@ var PublicReissue = function PublicReissue(props) {
       originDataSource: getGoodDetails({
         mode: isStrict
       }),
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -19616,6 +20466,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__default['default'].useState([]),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    data = _React$useState2[0],
+    setData = _React$useState2[1];
+  React__default['default'].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__default['default'].createElement(antd.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;
@@ -19634,7 +20517,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',
@@ -19652,7 +20535,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 = React.useRef(false);
   var valueRef = React.useRef(null);
   var _useState = React.useState(false),
@@ -19812,7 +20696,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
@@ -19837,9 +20722,10 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    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)],
@@ -19870,7 +20756,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: {
@@ -19892,14 +20778,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(';'),
   // );
@@ -20047,7 +20934,7 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _ref12, _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
+    var _ref12, _typeMap$type25, _typeMap$type26, _uniqBy;
     kmkfUtils.pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
@@ -20059,21 +20946,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 = lodash.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);
     kmkfUtils.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 = React.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__default['default'].createElement("div", {
-    id: "TEST_GY",
-    onClick: function onClick() {
-      console.log('TEST_GY', value);
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
@@ -20086,16 +20967,17 @@ var GyReissue = function GyReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     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__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -20111,12 +20993,13 @@ var GyReissue = function GyReissue(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    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);
     }
@@ -20127,8 +21010,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);
     },
@@ -20143,7 +21028,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: {
@@ -20165,14 +21050,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 = React.useRef({});
   var getOrderFlag = React.useRef(false);
   var _useState = React.useState(false),
@@ -20273,7 +21159,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
     };
   }();
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type7, _typeMap$type8, _uniqBy, _typeMap$type9;
+    var _typeMap$type7, _typeMap$type8, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -20284,49 +21170,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 = lodash.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
       });
@@ -20334,11 +21220,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;
     });
@@ -20349,19 +21235,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 = React.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__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
@@ -20375,16 +21260,17 @@ var GyReturnGoods = function GyReturnGoods(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     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__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -20400,12 +21286,13 @@ var GyReturnGoods = function GyReturnGoods(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    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);
     }
@@ -20417,13 +21304,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
@@ -20454,6 +21342,7 @@ exports.ApaasUpload = ApaasUpload;
 exports.ApaasUploadAsync = index;
 exports.ApaasUploadFile = ApaasUploadFile;
 exports.ApaasUploadProAsync = index$1;
+exports.AsyncSelect = AsyncSelect;
 exports.BsE3Reissue = bsE3Reissue;
 exports.BsExchange = BsExchange;
 exports.BsGoods = BsGoods;
@@ -20505,5 +21394,6 @@ exports.erpFormValidator = erpFormValidator;
 exports.erpModalColumnsMap = index$2;
 exports.getGyColumns = getColumns$4;
 exports.getJstColumns = getColumns$5;
+exports.getKmColumns = getColumns$6;
 exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;