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

package/dist/index.js

@@ -7773,8 +7773,7 @@ var Province = function Province(props) {
     wdt: kmkfUtils.WdtAddressData.getInstance(),
     gy: kmkfUtils.GyAddressData.getInstance(),
     km: kmkfUtils.AddressData.getInstance(),
-    jst: kmkfUtils.JstAddressData.getInstance(),
-    jky: kmkfUtils.JkyAddressData.getInstance()
+    jst: kmkfUtils.JstAddressData.getInstance()
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -8470,10 +8469,7 @@ var processLogisticsTrajectory = function processLogisticsTrajectory(getValue) {
     var map = subFields.reduce(function (cur, nxt) {
       return nxt === 'trajectoryApiStatus' ? _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_trajectoryApiStatus")), {}))) : _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
-    var mapChild = subFields.reduce(function (cur, nxt) {
-      return nxt === 'trajectoryApiStatus' ? _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey, "_trajectoryApiStatus"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_trajectoryApiStatus")), {}))) : _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey, "_").concat(nxt), getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
-    }, {});
-    return _objectSpread2(_defineProperty({}, nex.uniqueKey, map), mapChild);
+    return _defineProperty({}, nex.uniqueKey, map);
   };
 };
 var processLogisticsTrajectoryMore = function processLogisticsTrajectoryMore(getValue) {
@@ -8497,12 +8493,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
 };
 var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
   return function (nex, config) {
-    var _ref33;
+    var _ref34;
     var subFields = ['enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentRefundFee', 'enterprisePaymentStatus', 'enterprisePaymentTid'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
-    return _ref33 = {}, _defineProperty(_ref33, nex.uniqueKey, map), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref33;
+    return _ref34 = {}, _defineProperty(_ref34, nex.uniqueKey, map), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref34;
   };
 };
 var processJstLogistics = function processJstLogistics(getValue) {
@@ -9265,14 +9261,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref73;
-    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
+    var _ref74;
+    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
+    var _ref75;
+    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9567,6 +9563,7 @@ var FileRender = function FileRender(_ref) {
           cursor: 'pointer'
         },
         onClick: function onClick(e) {
+          console.log('onPreview');
           e.preventDefault();
           onPreview(item);
         },
@@ -9662,9 +9659,6 @@ var PictureRender = function PictureRender(_ref2) {
     }));
   }));
 };
-var LogisticsCompanyRender = function LogisticsCompanyRender(value) {
-  return kmkfUtils.ExpressData.getInstance().getExpressNameByCode(value) || value;
-};
 var MultipleSelectRender = function MultipleSelectRender(_ref5) {
   var _ref5$value = _ref5.value,
     value = _ref5$value === void 0 ? [] : _ref5$value;
@@ -9699,16 +9693,6 @@ var renderMap = {
     });
   }
 };
-var renderSplitMap = {
-  //物流轨迹-物流公司
-  jbCFrJV4m7_trajectoryCompany: function jbCFrJV4m7_trajectoryCompany(value) {
-    return LogisticsCompanyRender(value);
-  },
-  //退货物流-物流公司
-  '0qFEv9GEyd_returnLogisticsCompany': function qFEv9GEyd_returnLogisticsCompany(value) {
-    return LogisticsCompanyRender(value);
-  }
-};
 var EditPictureRender = function EditPictureRender(_ref6) {
   var _ref6$val = _ref6.val,
     val = _ref6$val === void 0 ? [] : _ref6$val,
@@ -9804,6 +9788,7 @@ var EditFileRender = function EditFileRender(_ref7) {
 var EditRenderMap = {
   INPUT: function INPUT(_ref8) {
     var val = _ref8.val,
+      record = _ref8.record,
       index = _ref8.index,
       t = _ref8.t,
       updateHandle = _ref8.updateHandle,
@@ -9832,6 +9817,7 @@ var EditRenderMap = {
   },
   TEXTAREA: function TEXTAREA(_ref9) {
     var val = _ref9.val,
+      record = _ref9.record,
       index = _ref9.index,
       t = _ref9.t,
       updateHandle = _ref9.updateHandle,
@@ -9860,6 +9846,7 @@ var EditRenderMap = {
   },
   PICTURE: function PICTURE(_ref10) {
     var val = _ref10.val,
+      record = _ref10.record,
       index = _ref10.index,
       t = _ref10.t,
       updateHandle = _ref10.updateHandle,
@@ -9877,6 +9864,7 @@ var EditRenderMap = {
   },
   FILE: function FILE(_ref11) {
     var val = _ref11.val,
+      record = _ref11.record,
       index = _ref11.index,
       t = _ref11.t,
       updateHandle = _ref11.updateHandle,
@@ -9894,6 +9882,7 @@ var EditRenderMap = {
   },
   RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
+      record = _ref12.record,
       index = _ref12.index,
       t = _ref12.t,
       updateHandle = _ref12.updateHandle,
@@ -9916,6 +9905,7 @@ var EditRenderMap = {
   },
   SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
+      record = _ref13.record,
       index = _ref13.index,
       t = _ref13.t,
       updateHandle = _ref13.updateHandle,
@@ -9938,6 +9928,7 @@ var EditRenderMap = {
   },
   CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
+      record = _ref14.record,
       index = _ref14.index,
       t = _ref14.t,
       updateHandle = _ref14.updateHandle,
@@ -9959,6 +9950,7 @@ var EditRenderMap = {
   },
   BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
     var val = _ref15.val,
+      record = _ref15.record,
       index = _ref15.index,
       t = _ref15.t,
       updateHandle = _ref15.updateHandle,
@@ -9977,57 +9969,6 @@ var EditRenderMap = {
         return updateHandle(e, index, t.key);
       }
     }));
-  },
-  DEFAULT: function DEFAULT(_ref16) {
-    var val = _ref16.val,
-      index = _ref16.index,
-      t = _ref16.t,
-      updateHandle = _ref16.updateHandle,
-      disabled = _ref16.disabled;
-    return !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-      allowClear: true,
-      style: {
-        width: '100%'
-      },
-      value: val,
-      onChange: function onChange(e) {
-        var _e$target3;
-        return updateHandle(e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value, index, t.key);
-      }
-    }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
-  }
-};
-var EditSplitRenderMap = {
-  jbCFrJV4m7_trajectoryCompany: function jbCFrJV4m7_trajectoryCompany(_ref17) {
-    var val = _ref17.val,
-      index = _ref17.index,
-      t = _ref17.t,
-      updateHandle = _ref17.updateHandle,
-      disabled = _ref17.disabled;
-    return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
-      value: val,
-      allowClear: true,
-      onChange: function onChange(e) {
-        return updateHandle(e, index, t.key);
-      },
-      disabled: t.isEdit || disabled
-    });
-  },
-  //退货物流-物流公司
-  '0qFEv9GEyd_returnLogisticsCompany': function qFEv9GEyd_returnLogisticsCompany(_ref18) {
-    var val = _ref18.val,
-      index = _ref18.index,
-      t = _ref18.t,
-      updateHandle = _ref18.updateHandle,
-      disabled = _ref18.disabled;
-    return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
-      value: val,
-      allowClear: true,
-      onChange: function onChange(e) {
-        return updateHandle(e, index, t.key);
-      },
-      disabled: t.isEdit || disabled
-    });
   }
 };
 
@@ -10055,7 +9996,6 @@ function HoverTableRowDeleteIcon(_ref) {
 }
 
 var WidgetMap = {
-  TRADE_ID_INPUT: 'tradeId',
   INPUT: 'input',
   TEXTAREA: 'textarea',
   PICTURE: 'picture',
@@ -10082,8 +10022,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    maxCount = props.maxCount,
-    manual = props.manual;
+    manual = props.manual,
+    maxCount = props.maxCount;
   var ref = React.useRef(null);
   var isRequest = React.useRef(false);
   var _useState = React.useState(false),
@@ -10158,6 +10098,7 @@ var SubForm = function SubForm(props) {
           return deleteHandle(record.uuid);
         }
       });
+      // return <div style={{ width: 25 }}>{index + 1}</div>;
     }
   }].concat(_toConsumableArray(newTableHeader.map(function (t) {
     return {
@@ -10170,41 +10111,27 @@ var SubForm = function SubForm(props) {
       ellipsis: true,
       width: t.width,
       render: function render(val, record, index) {
-        if (EditRenderMap[t.workOrderComponentType]) {
-          return EditRenderMap[t.workOrderComponentType]({
-            val: val,
-            record: record,
-            index: index,
-            t: t,
-            updateHandle: updateHandle,
-            disabled: disabled,
-            componentDto: componentDtoList.find(function (item) {
-              return item.uniqueKey === t.key;
-            }),
-            platform: platform
-          });
-        } else if (EditSplitRenderMap[t.key]) {
-          return EditSplitRenderMap[t.key]({
-            val: val,
-            index: index,
-            t: t,
-            updateHandle: updateHandle,
-            disabled: disabled
-          });
-        } else {
-          return EditRenderMap['DEFAULT']({
-            val: val,
-            record: record,
-            index: index,
-            t: t,
-            updateHandle: updateHandle,
-            disabled: disabled,
-            componentDto: componentDtoList.find(function (item) {
-              return item.uniqueKey === t.key;
-            }),
-            platform: platform
-          });
-        }
+        return EditRenderMap[t.workOrderComponentType] ? EditRenderMap[t.workOrderComponentType]({
+          val: val,
+          record: record,
+          index: index,
+          t: t,
+          updateHandle: updateHandle,
+          disabled: disabled,
+          componentDto: componentDtoList.find(function (item) {
+            return item.uniqueKey === t.key;
+          }),
+          platform: platform
+        }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: '100%'
+          },
+          value: val,
+          onChange: function onChange(e) {
+            var _e$target;
+            return updateHandle(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value, index, t.key);
+          }
+        });
       }
     };
   })), [disabled ? {} : {
@@ -10254,10 +10181,6 @@ var SubForm = function SubForm(props) {
         item.render = function (val) {
           return renderMap[t.workOrderComponentType](val, platform);
         };
-      } else if (renderSplitMap[t.key]) {
-        item.render = function (val) {
-          return renderSplitMap[t.key](val);
-        };
       }
       return item;
     })));
@@ -10272,11 +10195,7 @@ var SubForm = function SubForm(props) {
       if (['PICTURE', 'FILE', 'BASIC_MULT_SELECT', 'CHECKBOX'].includes(next.workOrderComponentType)) {
         item.defaultValue = [];
       }
-      if (!['LOGISTICS_TRAJECTORY', 'RETURN_LOGISTICS_SELECT'].includes(next.workOrderComponentType)) {
-        prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
-      } else {
-        prv["".concat(next.key)] = item;
-      }
+      prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
       return prv;
     }, {});
   }, [newTableHeader]);
@@ -10293,7 +10212,7 @@ var SubForm = function SubForm(props) {
     }).map(function (item) {
       return {
         label: item.name,
-        value: WidgetMap[item.workOrderComponentType] ? "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType]) : item.key
+        value: "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType])
       };
     });
     setSelectKey(options === null || options === void 0 ? void 0 : (_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.value);
@@ -10335,7 +10254,6 @@ var SubForm = function SubForm(props) {
         _ref2$componentList,
         componentList,
         params,
-        queryComponents,
         res,
         data,
         success,
@@ -10368,25 +10286,15 @@ var SubForm = function SubForm(props) {
               }]
             };
             if (selectKey && inputValue) {
-              queryComponents = [{
+              params.queryComponents = [{
                 key: 'flowStatus',
                 symbol: 'in',
                 value: flowStatus
+              }, {
+                key: selectKey,
+                symbol: 'in',
+                value: [inputValue]
               }];
-              if (['0qFEv9GEyd_returnLogisticsCode', 'jbCFrJV4m7_trajectoryCode'].includes(selectKey)) {
-                queryComponents.push({
-                  key: selectKey,
-                  symbol: 'like',
-                  value: inputValue
-                });
-              } else {
-                queryComponents.push({
-                  key: selectKey,
-                  symbol: 'in',
-                  value: [inputValue]
-                });
-              }
-              params.queryComponents = queryComponents;
             }
             _context.next = 7;
             return extendRequest('/qy/view/workOrderList', {
@@ -10582,21 +10490,7 @@ var SubForm = function SubForm(props) {
     placement: "bottom",
     visible: open,
     onVisibleChange: handleOpenChange
-  }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
-    value: undefined,
-    onChange: function onChange(val) {
-      onChangeInput(val);
-    },
-    placeholder: "\u8BF7\u9009\u62E9\u7269\u6D41\u516C\u53F8",
-    showSearch: true,
-    allowClear: true,
-    style: {
-      width: '180px'
-    },
-    filterOption: function filterOption(input, option) {
-      return option.label.includes(input);
-    }
-  }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
     allowClear: true,
     onChange: function onChange(e) {
@@ -13572,7 +13466,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     if (disabled) {
       return;
     }
-    if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
+    if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
       return;
@@ -13708,7 +13602,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(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -13964,7 +13858,7 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
   var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   React.useEffect(function () {
@@ -15336,223 +15230,6 @@ var jyColumns = [{
   }
 }];
 
-var jkyColumns = [{
-  dataIndex: 'goodsNo',
-  title: "\u8D27\u54C1\u7F16\u53F7",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'goodsName',
-  title: "\u8D27\u54C1\u540D\u79F0",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'goodsId',
-  title: "\u8D27\u54C1ID",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'barcode',
-  title: "\u8D27\u54C1\u6761\u7801",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'specName',
-  title: "\u89C4\u683C\u540D\u79F0",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'specId',
-  title: "\u89C4\u683CID",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'skuImgUrl',
-  title: "\u89C4\u683C\u56FE\u7247",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
-      style: {
-        width: '30px',
-        height: '30px',
-        objectFit: 'contain'
-      },
-      src: val
-    });
-  }
-}, {
-  dataIndex: 'sellCount',
-  title: "\u6570\u91CF",
-  width: 100,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val);
-  }
-}, {
-  dataIndex: 'actualSendCount',
-  title: "\u5B9E\u53D1\u6570\u91CF",
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sellPrice',
-  title: "\u5355\u4EF7",
-  width: 150,
-  render: function render(val) {
-    return val || val === 0 ? Number(val).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'sellTotal',
-  title: "\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'discountTotal',
-  title: "\u62B5\u6263\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableFee',
-  title: "\u5206\u644A\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableAfterFee',
-  title: "\u5206\u644A\u540E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'customerPrice',
-  title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
-  width: 150
-}, {
-  dataIndex: 'customerTotal',
-  title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'divideSellTotal',
-  title: "\u5B9E\u4ED8\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'isGift',
-  title: "\u662F\u5426\u8D60\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isFit',
-  title: "\u662F\u5426\u7EC4\u5408\u88C5",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isPresell',
-  title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'brandName',
-  title: "\u54C1\u724C",
-  align: 'center',
-  ellipsis: true,
-  width: 200,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'cateName',
-  title: "\u8D27\u54C1\u7C7B\u522B",
-  align: 'center',
-  ellipsis: true,
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'goodsTags',
-  title: "\u8D27\u54C1\u6807\u7B7E",
-  align: 'center',
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'goodsMemo',
-  title: "\u8D27\u54C1\u5907\u6CE8",
-  align: 'center',
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'tradeGoodsNo',
-  title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
-  align: 'center',
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'tradeGoodsName',
-  title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'tradeGoodsSpec',
-  title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sourceSubtradeNo',
-  title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'platGoodsId',
-  title: "\u5E73\u53F0\u5546\u54C1ID",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'subTradeId',
-  title: "\u5546\u54C1\u660E\u7EC6ID",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'batchNo',
-  title: "\u6279\u6B21\u53F7",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sendCount',
-  title: "\u6279\u6B21\u6570\u91CF",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'productDate',
-  title: "\u751F\u4EA7\u65E5\u671F",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'expireDate',
-  title: "\u5230\u671F\u65E5\u671F",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}];
-
 var getColumnsMap = function getColumnsMap() {
   return lodash.cloneDeep({
     gy: gyColumns,
@@ -15560,8 +15237,7 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns,
-    jky: jkyColumns
+    jy: jyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -18790,249 +18466,6 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
 };
 var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
 
-var getTableData$6 = function getTableData(_ref, formData) {
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
-  }).then(function (res) {
-    var _res$data = res.data,
-      _res$data$productSkuL = _res$data.productSkuList,
-      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
-      _res$data$total = _res$data.total,
-      total = _res$data$total === void 0 ? 0 : _res$data$total;
-    var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2({}, item);
-    });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var searchFormData$5 = [{
-  label: '规格名称',
-  name: 'skuName',
-  dataIndex: 'specName'
-}, {
-  label: '规格编码',
-  name: 'skuCode',
-  dataIndex: 'specNo'
-}, {
-  label: '商品名称',
-  name: 'goodName'
-}, {
-  label: '商品编码',
-  name: 'goodNo'
-}];
-var GoodList$6 = 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('jky'),
-    _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$6, {
-      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);
-      }
-    },
-    getCheckboxProps: function getCheckboxProps(record) {
-      var options = {
-        disabled: (props.selectedRows || []).map(function (row) {
-          return row.id || row.specId;
-        }).includes(record.id || record.specId),
-        name: record.id
-      };
-      return options;
-    }
-  };
-  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$5,
-    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({
-    className: "GoodModalColumns",
-    rowSelection: rowSelection,
-    rowKey: "id",
-    columns: columns,
-    scroll: {
-      x: '100%',
-      y: 250
-    },
-    size: "small"
-  }, 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 JkyGoodsList = /*#__PURE__*/React.forwardRef(GoodList$6);
-
-var JkyGoodsModal = function JkyGoodsModal(props, ref) {
-  React.useImperativeHandle(ref, function () {
-    return {
-      open: function open(shopCode) {
-        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        setVisible(true);
-        setSelectedRows(options.value || []);
-      }
-    };
-  });
-  var onSubmit = props.onSubmit,
-    width = props.width;
-  var _useState = React.useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useState3 = React.useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
-  var jkyGoodsListRef = React.useRef(null);
-  var _onCancel = function onCancel() {
-    setVisible(false);
-  };
-  var onOk = function onOk() {
-    var _jkyGoodsListRef$curr;
-    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.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(JkyGoodsList, {
-    ref: jkyGoodsListRef,
-    selectedRows: selectedRows
-  })));
-};
-var JkyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JkyGoodsModal);
-
 var getColumns = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -19618,8 +19051,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      ellipsis: true
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19753,8 +19185,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      ellipsis: true
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19893,8 +19324,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      ellipsis: true
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -20071,8 +19501,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      ellipsis: true
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -21024,7 +20453,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+        return (record.qty || 0) * (+record.salePrice || 0);
       }
     }, {
       dataIndex: 'batchId',
@@ -21312,7 +20741,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+        return (record.qty || 0) * (+record.salePrice || 0);
       }
     }, {
       dataIndex: 'batchId',
@@ -21427,7 +20856,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+        return (record.qty || 0) * (+record.salePrice || 0);
       }
     }, {
       dataIndex: 'isGift',
@@ -21692,10 +21121,9 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
       render: function render(val) {
-        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
         return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
           width: 30,
-          src: imgUrl
+          src: val
         });
       }
     }, {
@@ -21744,16 +21172,6 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u5546\u54C1\u7C7B\u578B",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'supplierName',
-      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'supplierCode',
-      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
-      width: 150,
-      render: renderTextEllipsis
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
@@ -21881,25 +21299,14 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u5546\u54C1\u7C7B\u578B",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'supplierName',
-      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'supplierCode',
-      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
-      width: 150,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysPicPath',
       title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
       render: function render(val) {
-        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
         return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
           width: 30,
-          src: imgUrl
+          src: val
         });
       }
     }].map(function (item) {
@@ -21974,7 +21381,23 @@ var getColumns$7 = function getColumns(_ref) {
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
-    }, {
+    },
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 250,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'goodsClass',
       title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150,
@@ -22311,12 +21734,6 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'bfit');
@@ -22346,12 +21763,6 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'gift');
@@ -22416,518 +21827,16 @@ var getColumns$8 = function getColumns(_ref) {
   };
 };
 
-var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
-  if (typeof value === 'number') return true;
-  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
-  return false;
-};
-function toNum$5(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
 var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
+    updateHandle = _ref.updateHandle;
   return {
-    //吉客云商品信息
-    JKY_GOODS: [{
-      dataIndex: 'goodsNo',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'barcode',
-      title: "\u8D27\u54C1\u6761\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuImgUrl',
-      title: "\u89C4\u683C\u56FE\u7247",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
-    }, {
-      dataIndex: 'sellCount',
-      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) {
-            updateDataHandle({
-              sellCount: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
-            }, index);
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'actualSendCount',
-      title: "\u5B9E\u53D1\u6570\u91CF",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sellPrice',
-      title: "\u5355\u4EF7",
-      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) {
-            updateDataHandle({
-              sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
-            }, index);
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'discountTotal',
-      title: "\u62B5\u6263\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'shareFavourableFee',
-      title: "\u5206\u644A\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'shareFavourableAfterFee',
-      title: "\u5206\u644A\u540E\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'customerPrice',
-      title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'customerTotal',
-      title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'divideSellTotal',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: '1'
-          }, {
-            label: '否',
-            value: '0'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'isFit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
-      width: 150,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isFit');
-          },
-          options: [{
-            label: '是',
-            value: '1'
-          }, {
-            label: '否',
-            value: '0'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'isPresell',
-      title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
-      width: 150,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          dropdownStyle: {
-            zIndex: 2000
-          },
-          getPopupContainer: function getPopupContainer() {
-            return document.body;
-          },
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isPresell');
-          },
-          options: [{
-            label: '是',
-            value: '1'
-          }, {
-            label: '否',
-            value: '0'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C",
-      align: 'center',
-      ellipsis: true,
-      width: 200,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'cateName',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsTags',
-      title: "\u8D27\u54C1\u6807\u7B7E",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsMemo',
-      title: "\u8D27\u54C1\u5907\u6CE8",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'tradeGoodsNo',
-      title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'tradeGoodsName',
-      title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'tradeGoodsSpec',
-      title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sourceSubtradeNo',
-      title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'platGoodsId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'subTradeId',
-      title: "\u5546\u54C1\u660E\u7EC6ID",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'batchNo',
-      title: "\u6279\u6B21\u53F7",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sendCount',
-      title: "\u6279\u6B21\u6570\u91CF",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'productDate',
-      title: "\u751F\u4EA7\u65E5\u671F",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'expireDate',
-      title: "\u5230\u671F\u65E5\u671F",
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    // 吉客云补发商品信息
-    JKY_REISSUE_GOODS: [{
-      dataIndex: 'goodsNo',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'barcode',
-      title: "\u8D27\u54C1\u6761\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuImgUrl',
-      title: "\u89C4\u683C\u56FE\u7247",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
-    }, {
-      dataIndex: 'sellCount',
-      title: "\u53D1\u8D27\u6570\u91CF",
-      width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jkyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$5(goods === null || goods === void 0 ? void 0 : goods.sellCount);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodsName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodsName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
-      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) {
-            updateDataHandle({
-              sellCount: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
-            }, index);
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'sellPrice',
-      title: "\u5355\u4EF7",
-      width: 150,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-          style: {
-            width: 130
-          },
-          value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            updateDataHandle({
-              sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
-            }, index);
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'sellTotal',
-      title: "\u603B\u91D1\u989D",
-      width: 150,
-      render: function render(val, record, index) {
-        if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
-          return record.sellCount * record.sellPrice;
-        }
-        return '';
-      }
-    }, {
-      dataIndex: 'reason',
-      title: "\u9000\u6362\u539F\u56E0",
-      width: 250,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'reason');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: '1'
-          }, {
-            label: '否',
-            value: '0'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'isFit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
-      width: 150,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isFit');
-          },
-          options: [{
-            label: '是',
-            value: 'True'
-          }, {
-            label: '否',
-            value: 'False'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'cateName',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
-      render: renderTextEllipsis
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
-  };
-};
-
-var getColumns$a = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? '' : _ref$text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //bs商品信息
-    default: [{
-      dataIndex: 'mark',
-      title: "\u5546\u54C1\u6807\u8BB0",
+    //bs商品信息
+    default: [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
       align: 'center',
       ellipsis: true,
       width: 70,
@@ -23035,7 +21944,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -23073,13 +21982,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
-  })), getColumns$9({
-    text: text,
-    disabled: disabled,
-    updateHandle: updateHandle,
-    updateDataHandle: updateDataHandle
   })), {}, {
-    default: getColumns$a({
+    default: getColumns$9({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -23226,9 +22130,6 @@ var isErpType = {
   },
   isJy: function isJy(type) {
     return ['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type);
-  },
-  isJky: function isJky(type) {
-    return ['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -23515,8 +22416,6 @@ var GoodsModalMap = {
   KM_REISSUE_GOODS: KmGoodsModal,
   JY_GOODS: JyGoodsModal$1,
   JY_REISSUE_GOODS: JyGoodsModal$1,
-  JKY_GOODS: JkyGoodsModal$1,
-  JKY_REISSUE_GOODS: JkyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -23529,8 +22428,6 @@ var systemOrderNoMap = {
   WLN_GOODS: 'tradeNo',
   JY_GOODS: 'tradeNo',
   JY_REISSUE_GOODS: 'tradeNo',
-  JKY_GOODS: 'tradeNo',
-  JKY_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   JST_REISSUE_GOODS: 'oId',
   GY_REISSUE_GOODS: 'code',
@@ -23566,81 +22463,23 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
-  var getKmSupplier = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dataSource) {
-      var _dataSource$filter;
-      var systemItemIds, supplierMap;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
-              return item === null || item === void 0 ? void 0 : item.sysItemId;
-            }).map(function (item) {
-              return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
-            });
-            _context.next = 3;
-            return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
-          case 3:
-            supplierMap = _context.sent;
-            dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
-              return item === null || item === void 0 ? void 0 : item.sysItemId;
-            })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
-              var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
-              var supplierInfo = supplierMap.get(key);
-              item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
-              item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
-            });
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getKmSupplier(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var openModal = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!validSystemOrder) {
-              _context2.next = 3;
-              break;
-            }
-            antd.message.warning('请选择补发系统单');
-            return _context2.abrupt("return");
-          case 3:
-            if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
-              _context2.next = 6;
-              break;
-            }
-            _context2.next = 6;
-            return getDataSourceAsync();
-          case 6:
-            if (!['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
-              _context2.next = 9;
-              break;
-            }
-            _context2.next = 9;
-            return getKmSupplier(dataSource);
-          case 9:
-            setTradeGoodsVisible(true);
-            // 补发直接传入的是systemNo
-            if (isShowSelect && isReissueType) {
-              setSelectSystemNo(selectedSystemOrders || []);
-            }
-          case 11:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function openModal() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+  var openModal = function openModal() {
+    if (validSystemOrder) {
+      antd.message.warning('请选择补发系统单');
+      return;
+    }
+    if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
+      getDataSourceAsync().then(function () {
+        setTradeGoodsVisible(true);
+      });
+    } else {
+      setTradeGoodsVisible(true);
+    }
+    // 补发直接传入的是systemNo
+    if (isShowSelect && isReissueType) {
+      setSelectSystemNo(selectedSystemOrders || []);
+    }
+  };
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -23709,7 +22548,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     style: {
-      marginBottom: '12px'
+      marginBottom: '20px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     span: 12
@@ -23763,9 +22602,6 @@ var getButtonText = function getButtonText() {
   if (['JY_GOODS', 'JY_REISSUE_GOODS'].includes(type)) {
     return '选择巨益ERP商品';
   }
-  if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
-    return '选择吉客云ERP商品';
-  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -23823,8 +22659,8 @@ var GoodItem$1 = function GoodItem(props) {
   var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   // 判断是否为是否展示系统单筛选项
-  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
-  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -23915,8 +22751,6 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
         case 'JY_REISSUE_GOODS':
-        case 'JKY_GOODS':
-        case 'JKY_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -23964,9 +22798,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var getShowFilterColumns = React.useCallback(function (_ref4) {
-    var showHeader = _ref4.showHeader,
-      initBaseInfoColumns = _ref4.initBaseInfoColumns;
+  var getShowFilterColumns = React.useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -25121,7 +23955,7 @@ var jyUtils = {
 };
 
 var singletonMap$7 = new Map();
-var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
   if (!singletonMap$7.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
@@ -25129,50 +23963,6 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
         singletonMap$7.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
-        method: 'post',
-        data: {
-          billNo: orderNo
-        }
-      }).then(function (res) {
-        if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data, _res$data$tradeOrderD, _res$data3;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
-            var _filterJkyOrders, _res$data2;
-            res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
-                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
-              });
-            });
-          }
-          resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$7.delete(orderNo);
-          }, 1000 * 10);
-        } else {
-          doReject(res);
-        }
-      }).catch(doReject);
-    });
-    singletonMap$7.set(orderNo, p);
-  }
-  return singletonMap$7.get(orderNo);
-};
-var jkyUtils = {
-  getJkyOrderListSingleton: getJkyOrderListSingleton
-};
-
-var singletonMap$8 = new Map();
-var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
-  if (!singletonMap$8.has(orderNo)) {
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$8.delete(orderNo);
-        reject(err);
-      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -25196,16 +23986,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$8.delete(orderNo);
+            singletonMap$7.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$8.set(orderNo, p);
+    singletonMap$7.set(orderNo, p);
   }
-  return singletonMap$8.get(orderNo);
+  return singletonMap$7.get(orderNo);
 };
 var kmUtils = {
   getOrderListSingleton: getOrderListSingleton$2
@@ -25222,7 +24012,6 @@ var columnsMap = {
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
-  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 var rowKeyMap = {
@@ -25234,7 +24023,6 @@ var rowKeyMap = {
   GY_SYSTEM_ORDER: 'billNo',
   JST_SYSTEM_ORDER: 'oId',
   JY_SYSTEM_ORDER: 'tradeNo',
-  JKY_SYSTEM_ORDER: 'tradeNo',
   WDT_RETURN_BILL_NO: 'refundNo'
 };
 var index$2 = (function (props) {
@@ -25249,6 +24037,7 @@ var index$2 = (function (props) {
   React.useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
+    console.log('value77777777', value);
     if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length) && !onceRef.current) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
@@ -25267,8 +24056,6 @@ var index$2 = (function (props) {
         getJstOrderList(value.orderNo);
       } else if (type === 'JY_SYSTEM_ORDER') {
         getJyOrderList(value.orderNo);
-      } else if (type === 'JKY_SYSTEM_ORDER') {
-        getJkyOrderList(value.orderNo);
       }
     }
   }, [value, type]);
@@ -25533,31 +24320,6 @@ var index$2 = (function (props) {
       return _ref10.apply(this, arguments);
     };
   }();
-  var getJkyOrderList = /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
-              });
-              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: trades,
-                showOrderInfo: trades
-              }));
-            });
-            onceRef.current = false;
-          case 2:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee9);
-    }));
-    return function getJkyOrderList(_x9) {
-      return _ref12.apply(this, arguments);
-    };
-  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -25982,16 +24744,16 @@ var orderSubFormConstants = {
 };
 
 var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
-var singletonMap$9 = new Map();
+var singletonMap$8 = new Map();
 var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
     shopId = parmas.shopId;
   var key = "".concat(orderNo, "-").concat(shopId);
-  if (!singletonMap$9.has(key)) {
+  if (!singletonMap$8.has(key)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$9.delete(key);
+        singletonMap$8.delete(key);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -26007,16 +24769,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$9.delete(key);
+            singletonMap$8.delete(key);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$9.set(key, p);
+    singletonMap$8.set(key, p);
   }
-  return singletonMap$9.get(key);
+  return singletonMap$8.get(key);
 };
 var renderEditItem = function renderEditItem(_ref) {
   var item = _ref.item,
@@ -26449,9 +25211,6 @@ var isErpType$1 = {
   },
   isJy: function isJy(type) {
     return ['JY_GOODS'].includes(type);
-  },
-  isJky: function isJky(type) {
-    return ['JKY_GOODS'].includes(type);
   }
 };
 var processAllOrders = function processAllOrders(_ref) {
@@ -26752,32 +25511,6 @@ var componentMap$2 = {
     },
     getOrderList: jyUtils.getJyOrderListSingleton
   },
-  JKY_GOODS: {
-    type: 'jky',
-    key: 'jkyGoods',
-    name: '吉客云',
-    orderNo: 'tradeNo',
-    goodDetailOrderNo: 'tradeNo',
-    eventNameMap: {
-      // pubsub 事件
-      type: 'jkyType',
-      updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
-      selectListReturn: 'jkySelectListReturn',
-      selectList: 'jkySelectList',
-      reissueSelectList: 'jkyReissueSelectList',
-      reissueSelectListReturn: 'jkyReissueSelectListReturn',
-      reissueDeleteGood: 'jkyReissueDeleteGood',
-      changeShopCode: 'jkyChangeShopCode',
-      reissueType: 'jkyReissueType',
-      returnType: 'jkyReturnType',
-      returnSelectListReturn: 'jkyReturnSelectListReturn',
-      returnSelectList: 'jkyReturnSelectList',
-      deleteGood: 'jkyDeleteGood',
-      returnDeleteGood: 'jkyReturnDeleteGood',
-      exchangeDeleteGood: 'jkyExchangeDeleteGood'
-    },
-    getOrderList: jkyUtils.getJkyOrderListSingleton
-  },
   WDT_AFTERSALE_GOODS: {
     type: 'wdtAftersale',
     key: 'wdtAftersaleGoods',
@@ -26809,7 +25542,7 @@ var componentMap$2 = {
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _withInfo$current3, _withInfo$current4, _componentMap$compTyp6;
+  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -26825,10 +25558,6 @@ var CommonGoods = function CommonGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  var _useState3 = React.useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    originDataSource = _useState4[0],
-    setOriginDataSource = _useState4[1];
   var withInfo = React.useRef(null);
   var valueRef = React.useRef(null);
   var tokens = React.useRef([]);
@@ -26840,93 +25569,10 @@ var CommonGoods = function CommonGoods(props) {
       compType.indexOf('WDT') > -1 && getWdtOrderList(value === null || value === void 0 ? void 0 : value.orderNo);
     }
   }, [value]);
-  var sysItemIdMap = React.useMemo(function () {
-    var map = {};
-    if (compType.indexOf('KM') > -1) {
-      var _value$kmGoods, _value$kmGoods$filter;
-      value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
-        return item === null || item === void 0 ? void 0 : item.sysItemId;
-      })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
-        map[key] = item;
-      });
-    }
-    return map;
-  }, [value === null || value === void 0 ? void 0 : value.kmGoods]);
-  // 用于跟踪已经处理过的 sysItemId，避免重复处理
-  var processedSysItemIdsRef = React.useRef(new Set());
-  React.useEffect(function () {
-    var fetchSupplier = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(sysItemIds) {
-        var _currentValue$kmGoods;
-        var needFetchIds, supplierMap, hasChange, currentValue, kmGoods;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (sysItemIds.length) {
-                _context.next = 2;
-                break;
-              }
-              return _context.abrupt("return");
-            case 2:
-              // 过滤出还没有供应商信息的 sysItemId
-              needFetchIds = sysItemIds.filter(function (id) {
-                var item = sysItemIdMap[id];
-                return item && (!item.supplierCode || !item.supplierName);
-              });
-              if (needFetchIds.length) {
-                _context.next = 5;
-                break;
-              }
-              return _context.abrupt("return");
-            case 5:
-              _context.next = 7;
-              return kmkfUtils.servers.KM.getSupplierSingleton(needFetchIds);
-            case 7:
-              supplierMap = _context.sent;
-              // 检查是否有实际变化，避免不必要的更新
-              hasChange = false;
-              currentValue = valueRef.current;
-              kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
-                var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
-                var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
-                // 如果供应商信息有变化，标记需要更新
-                if (newSupplierCode && item.supplierCode !== newSupplierCode || newSupplierName && item.supplierName !== newSupplierName) {
-                  hasChange = true;
-                  // 标记已处理
-                  processedSysItemIdsRef.current.add(item.sysItemId);
-                  return _objectSpread2(_objectSpread2({}, item), {}, {
-                    supplierCode: newSupplierCode || item.supplierCode,
-                    supplierName: newSupplierName || item.supplierName
-                  });
-                }
-                return item;
-              }); // 只在有实际变化时才更新
-              if (hasChange && kmGoods) {
-                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-                  kmGoods: kmGoods
-                }));
-              }
-            case 12:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function fetchSupplier(_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    var sysItemIds = Object.keys(sysItemIdMap);
-    if (sysItemIds === null || sysItemIds === void 0 ? void 0 : sysItemIds.length) {
-      fetchSupplier(sysItemIds);
-    }
-  }, [sysItemIdMap]);
   var getWdtOrderList = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
               var orders = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (trade) {
@@ -26939,12 +25585,12 @@ var CommonGoods = function CommonGoods(props) {
             });
           case 1:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
-    return function getWdtOrderList(_x2) {
-      return _ref2.apply(this, arguments);
+    return function getWdtOrderList(_x) {
+      return _ref.apply(this, arguments);
     };
   }();
   React.useEffect(function () {
@@ -27050,8 +25696,8 @@ var CommonGoods = function CommonGoods(props) {
       mode: isStrict
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref3) {
-    var mode = _ref3.mode;
+  var getGoodDetails = function getGoodDetails(_ref2) {
+    var mode = _ref2.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
     if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
@@ -27064,115 +25710,44 @@ var CommonGoods = function CommonGoods(props) {
     }) : goodDetails;
   };
   // 找到该订单号下所有商品
-  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
-      var mode, updateHandle, goodDetails, orderNo;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            mode = _ref4.mode;
-            updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
-            if (updateHandle) {
-              _context3.next = 4;
-              break;
-            }
-            return _context3.abrupt("return", []);
-          case 4:
-            goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
-              orderBackGoodsLevel: props.orderBackGoodsLevel
-            });
-            orderNo = value === null || value === void 0 ? void 0 : value.orderNo; // if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(compType)) {
-            //   await getKmSupplier(goodDetails);
-            // }
-            return _context3.abrupt("return", mode ? goodDetails.filter(function (goodItem) {
-              var _componentMap$compTyp2;
-              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
-            }) : goodDetails);
-          case 7:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function getAllTradeGoodsDetails(_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
-  // 异步获取 originDataSource
-  React.useEffect(function () {
-    var fetchOriginDataSource = /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var data;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return getAllTradeGoodsDetails({
-                mode: value === null || value === void 0 ? void 0 : value.isStrict
-              });
-            case 2:
-              data = _context4.sent;
-              setOriginDataSource(Array.isArray(data) ? data : []);
-            case 4:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      }));
-      return function fetchOriginDataSource() {
-        return _ref6.apply(this, arguments);
-      };
-    }();
-    fetchOriginDataSource();
-  }, [value === null || value === void 0 ? void 0 : value.allOrders, value === null || value === void 0 ? void 0 : value.isStrict, value === null || value === void 0 ? void 0 : value.orderNo, compType]);
-  var selectedGoodsChange = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(skuList) {
-      var _valueRef$current9, _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
-      var newValue, isStrict, originTradeGoodList, currentSelectGoodList;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            newValue = _objectSpread2({}, valueRef.current);
-            isStrict = valueRef.current.isStrict; // 原订单商品
-            _context5.next = 4;
-            return getAllTradeGoodsDetails({
-              mode: isStrict
-            });
-          case 4:
-            _context5.t0 = _context5.sent;
-            if (_context5.t0) {
-              _context5.next = 7;
-              break;
-            }
-            _context5.t0 = [];
-          case 7:
-            originTradeGoodList = _context5.t0;
-            // 当前选中的所有商品【包含了原订单+商品库】
-            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
-            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-              return skuList.includes(item.uuid);
-            });
-            onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-          case 11:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    return function selectedGoodsChange(_x4) {
-      return _ref7.apply(this, arguments);
-    };
-  }();
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails(_ref3) {
+    var mode = _ref3.mode;
+    var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
+    console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    if (!updateHandle) return [];
+    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
+      orderBackGoodsLevel: props.orderBackGoodsLevel
+    });
+    var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
+    return mode ? goodDetails.filter(function (goodItem) {
+      var _componentMap$compTyp2;
+      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+    }) : goodDetails;
+  };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    var isStrict = value.isStrict;
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails({
+      mode: isStrict
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
+    newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.uuid);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.key)], value === null || value === void 0 ? void 0 : value.isStrict]);
   // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _componentMap$compTyp5;
-    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
+    var _componentMap$compTyp6;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
       var list = processAllOrders({
         data: data,
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('getDataSourceAsync', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -27200,9 +25775,11 @@ var CommonGoods = function CommonGoods(props) {
     isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
     systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
-    showChangeBtn: (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.showChangeBtn,
+    showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     tradeGoods: {
-      originDataSource: originDataSource,
+      originDataSource: getAllTradeGoodsDetails({
+        mode: value === null || value === void 0 ? void 0 : value.isStrict
+      }),
       getDataSourceAsync: getDataSourceAsync,
       selectedGoodsChange: selectedGoodsChange
     }
@@ -27859,26 +26436,10 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'subOrderDetails',
     isShowSelectTradeGoods: true
-  },
-  JKY_REISSUE_GOODS: {
-    compType: '补发',
-    key: 'jkyReissueGoods',
-    typeName: 'jkyReissueType',
-    systemOrder: 'jkySystemOrder',
-    systemOrderNo: 'jkySystemOrderNo',
-    getOrderList: jkyUtils.getJkyOrderListSingleton,
-    updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
-    alwaysShowChooseErpGoodsBtn: true,
-    orderTypeKey: 'orderType',
-    oIdKey: 'tradeNo',
-    outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
-    isShowSelectTradeGoods: true,
-    showModeBtn: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
+  var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27994,95 +26555,12 @@ var PublicReissue = function PublicReissue(props) {
       mode: mode
     }))));
   };
-  var sysItemIdMap = React.useMemo(function () {
-    var map = {};
-    if (type === 'KM_REISSUE_GOODS') {
-      var _value$kmReissueGoods, _value$kmReissueGoods2;
-      value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
-        return item === null || item === void 0 ? void 0 : item.sysItemId;
-      })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
-        map[key] = item;
-      });
-    }
-    return map;
-  }, [value === null || value === void 0 ? void 0 : value.kmReissueGoods]);
-  // 用于跟踪已经处理过的 sysItemId，避免重复处理
-  var processedSysItemIdsRef = React.useRef(new Set());
-  React.useEffect(function () {
-    var fetchSupplier = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sysItemIds) {
-        var _currentValue$kmReiss;
-        var needFetchIds, supplierMap, hasChange, currentValue, kmReissueGoods;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              if (sysItemIds.length) {
-                _context2.next = 2;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 2:
-              // 过滤出还没有供应商信息的 sysItemId
-              needFetchIds = sysItemIds.filter(function (id) {
-                var item = sysItemIdMap[id];
-                return item && (!item.supplierCode || !item.supplierName);
-              });
-              if (needFetchIds.length) {
-                _context2.next = 5;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 5:
-              _context2.next = 7;
-              return kmkfUtils.servers.KM.getSupplierSingleton(needFetchIds);
-            case 7:
-              supplierMap = _context2.sent;
-              // 检查是否有实际变化，避免不必要的更新
-              hasChange = false;
-              currentValue = valueRef.current;
-              kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
-                var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
-                var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
-                // 如果供应商信息有变化，标记需要更新
-                if (newSupplierCode && item.supplierCode !== newSupplierCode || newSupplierName && item.supplierName !== newSupplierName) {
-                  hasChange = true;
-                  // 标记已处理
-                  processedSysItemIdsRef.current.add(item.sysItemId);
-                  return _objectSpread2(_objectSpread2({}, item), {}, {
-                    supplierCode: newSupplierCode || item.supplierCode,
-                    supplierName: newSupplierName || item.supplierName
-                  });
-                }
-                return item;
-              }); // 只在有实际变化时才更新
-              if (hasChange && kmReissueGoods) {
-                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
-                  kmReissueGoods: kmReissueGoods
-                }));
-              }
-            case 12:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function fetchSupplier(_x2) {
-        return _ref4.apply(this, arguments);
-      };
-    }();
-    var sysItemIds = Object.keys(sysItemIdMap);
-    if (sysItemIds === null || sysItemIds === void 0 ? void 0 : sysItemIds.length) {
-      fetchSupplier(sysItemIds);
-    }
-  }, [sysItemIdMap]);
-  var getGoodDetails = function getGoodDetails(_ref5) {
+  var getGoodDetails = function getGoodDetails(_ref4) {
     var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
-    var mode = _ref5.mode,
-      sysOrderNo = _ref5.sysOrderNo,
-      _ref5$isAllOrders = _ref5.isAllOrders,
-      isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
+    var mode = _ref4.mode,
+      sysOrderNo = _ref4.sysOrderNo,
+      _ref4$isAllOrders = _ref4.isAllOrders,
+      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -28100,10 +26578,6 @@ var PublicReissue = function PublicReissue(props) {
       orderRest = {
         canEdit: true
       };
-    } else if (['JKY_REISSUE_GOODS'].includes(type)) {
-      orderRest = {
-        canEdit: true
-      };
     }
     var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -28245,17 +26719,17 @@ var PublicReissue = function PublicReissue(props) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
-    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
+    showModeBtn: false,
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
-    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -28998,7 +27472,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
+    }, kmkfUtils.msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -29576,7 +28050,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 4
+      span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -29879,7 +28353,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 4
+      span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -30552,7 +29026,6 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
-  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 
@@ -30635,7 +29108,6 @@ exports.erpColumnsMap = erpColumnsMap;
 exports.erpFormValidator = erpFormValidator;
 exports.erpModalColumnsMap = index$1;
 exports.getGyColumns = getColumns$4;
-exports.getJkyColumns = getColumns$9;
 exports.getJstColumns = getColumns$5;
 exports.getJyColumns = getColumns$7;
 exports.getKmColumns = getColumns$6;
@@ -30644,4 +29116,3 @@ exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;
 exports.orderSubFormConstants = orderSubFormConstants;
 exports.renderMap = renderMap;
-exports.renderSplitMap = renderSplitMap;