@kmkf-fe-packages/basic-components 2.2.39-beta.3 → 2.2.39-beta.30

package/dist/index.js

@@ -8469,7 +8469,10 @@ 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))));
     }, {});
-    return _defineProperty({}, nex.uniqueKey, map);
+    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);
   };
 };
 var processLogisticsTrajectoryMore = function processLogisticsTrajectoryMore(getValue) {
@@ -8493,12 +8496,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
 };
 var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
   return function (nex, config) {
-    var _ref34;
+    var _ref33;
     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 _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;
+    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;
   };
 };
 var processJstLogistics = function processJstLogistics(getValue) {
@@ -9261,14 +9264,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    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 _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 processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    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 _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 processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9563,7 +9566,6 @@ var FileRender = function FileRender(_ref) {
           cursor: 'pointer'
         },
         onClick: function onClick(e) {
-          console.log('onPreview');
           e.preventDefault();
           onPreview(item);
         },
@@ -9659,6 +9661,9 @@ 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;
@@ -9693,6 +9698,16 @@ 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,
@@ -9788,7 +9803,6 @@ 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,
@@ -9817,7 +9831,6 @@ var EditRenderMap = {
   },
   TEXTAREA: function TEXTAREA(_ref9) {
     var val = _ref9.val,
-      record = _ref9.record,
       index = _ref9.index,
       t = _ref9.t,
       updateHandle = _ref9.updateHandle,
@@ -9846,7 +9859,6 @@ var EditRenderMap = {
   },
   PICTURE: function PICTURE(_ref10) {
     var val = _ref10.val,
-      record = _ref10.record,
       index = _ref10.index,
       t = _ref10.t,
       updateHandle = _ref10.updateHandle,
@@ -9864,7 +9876,6 @@ var EditRenderMap = {
   },
   FILE: function FILE(_ref11) {
     var val = _ref11.val,
-      record = _ref11.record,
       index = _ref11.index,
       t = _ref11.t,
       updateHandle = _ref11.updateHandle,
@@ -9882,7 +9893,6 @@ var EditRenderMap = {
   },
   RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
-      record = _ref12.record,
       index = _ref12.index,
       t = _ref12.t,
       updateHandle = _ref12.updateHandle,
@@ -9905,7 +9915,6 @@ var EditRenderMap = {
   },
   SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
-      record = _ref13.record,
       index = _ref13.index,
       t = _ref13.t,
       updateHandle = _ref13.updateHandle,
@@ -9928,7 +9937,6 @@ var EditRenderMap = {
   },
   CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
-      record = _ref14.record,
       index = _ref14.index,
       t = _ref14.t,
       updateHandle = _ref14.updateHandle,
@@ -9950,7 +9958,6 @@ 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,
@@ -9969,6 +9976,57 @@ 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
+    });
   }
 };
 
@@ -9996,6 +10054,7 @@ function HoverTableRowDeleteIcon(_ref) {
 }
 
 var WidgetMap = {
+  TRADE_ID_INPUT: 'tradeId',
   INPUT: 'input',
   TEXTAREA: 'textarea',
   PICTURE: 'picture',
@@ -10098,7 +10157,6 @@ var SubForm = function SubForm(props) {
           return deleteHandle(record.uuid);
         }
       });
-      // return <div style={{ width: 25 }}>{index + 1}</div>;
     }
   }].concat(_toConsumableArray(newTableHeader.map(function (t) {
     return {
@@ -10111,27 +10169,41 @@ var SubForm = function SubForm(props) {
       ellipsis: true,
       width: t.width,
       render: function render(val, record, index) {
-        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);
-          }
-        });
+        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
+          });
+        }
       }
     };
   })), [disabled ? {} : {
@@ -10181,6 +10253,10 @@ 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;
     })));
@@ -10195,7 +10271,11 @@ var SubForm = function SubForm(props) {
       if (['PICTURE', 'FILE', 'BASIC_MULT_SELECT', 'CHECKBOX'].includes(next.workOrderComponentType)) {
         item.defaultValue = [];
       }
-      prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
+      if (!['LOGISTICS_TRAJECTORY', 'RETURN_LOGISTICS_SELECT'].includes(next.workOrderComponentType)) {
+        prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
+      } else {
+        prv["".concat(next.key)] = item;
+      }
       return prv;
     }, {});
   }, [newTableHeader]);
@@ -10212,7 +10292,7 @@ var SubForm = function SubForm(props) {
     }).map(function (item) {
       return {
         label: item.name,
-        value: "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType])
+        value: WidgetMap[item.workOrderComponentType] ? "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType]) : item.key
       };
     });
     setSelectKey(options === null || options === void 0 ? void 0 : (_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.value);
@@ -10254,6 +10334,7 @@ var SubForm = function SubForm(props) {
         _ref2$componentList,
         componentList,
         params,
+        queryComponents,
         res,
         data,
         success,
@@ -10286,15 +10367,25 @@ var SubForm = function SubForm(props) {
               }]
             };
             if (selectKey && inputValue) {
-              params.queryComponents = [{
+              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', {
@@ -10490,7 +10581,21 @@ var SubForm = function SubForm(props) {
     placement: "bottom",
     visible: open,
     onVisibleChange: handleOpenChange
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }, ['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, {
     placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
     allowClear: true,
     onChange: function onChange(e) {
@@ -13858,7 +13963,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'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
   var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   React.useEffect(function () {
@@ -14112,7 +14217,7 @@ var renderTextEllipsis = function renderTextEllipsis(value) {
 var css_248z$b = ".GoodModalColumns .ellipsis-text-3 {\n  display: -webkit-box;\n  overflow: hidden;\n  white-space: normal !important;\n  text-overflow: ellipsis;\n  word-break: break-all;\n  overflow-wrap: anywhere;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 3;\n  line-clamp: 3;\n}\n";
 styleInject(css_248z$b);
 
-var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 33.33% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
+var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 50% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .optional-input-select {\n    width: 70px !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
 styleInject(css_248z$c);
 
 var _excluded$d = ["shopId"];
@@ -15228,6 +15333,223 @@ 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,
@@ -15235,7 +15557,8 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns
+    jy: jyColumns,
+    jky: jkyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -15333,6 +15656,64 @@ var useGetColumns = (function (type) {
   return [columns, showColumnsDataIndexList, loading];
 });
 
+var compareSymbolList = [{
+  label: '模糊',
+  value: 'like'
+}, {
+  label: '精准',
+  value: 'eq'
+}];
+var OptionalInput = function OptionalInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _props$placeholder = props.placeholder,
+    placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
+    onPressEnter = props.onPressEnter,
+    onBlur = props.onBlur,
+    formItemProps = props.formItemProps;
+  var handleSelectChange = function handleSelectChange(compareSymbol) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: compareSymbol || 'like',
+        inputValue: value === null || value === void 0 ? void 0 : value.inputValue
+      });
+    }
+  };
+  var handleInputChange = function handleInputChange(e) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+        inputValue: e.target.value
+      });
+    }
+  };
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    className: "optional-input-select",
+    style: {
+      width: '70px'
+    },
+    options: compareSymbolList,
+    onChange: handleSelectChange,
+    value: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+    onBlur: onBlur
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({
+    style: {
+      width: '150px'
+    },
+    allowClear: true,
+    placeholder: placeholder,
+    onChange: handleInputChange,
+    onPressEnter: onPressEnter,
+    onBlur: onBlur,
+    value: value === null || value === void 0 ? void 0 : value.inputValue
+  }, formItemProps)));
+};
+
 function SearchForm(_ref) {
   var searchFormData = _ref.searchFormData,
     form = _ref.form,
@@ -15384,7 +15765,16 @@ function SearchForm(_ref) {
       style: {
         marginBottom: '12px'
       }
-    }, type === 'select' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
+    }, type === 'optionalInput' ? /*#__PURE__*/React__default['default'].createElement(OptionalInput, {
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      },
+      placeholder: label,
+      formItemProps: formItemProps
+    }) : type === 'select' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
       placeholder: label,
       showSearch: true,
       allowClear: true,
@@ -15425,24 +15815,35 @@ function SearchForm(_ref) {
   }, "\u91CD\u7F6E")));
 }
 
+var transformFormData = function transformFormData(formData) {
+  var conditionList = [];
+  for (var key in formData) {
+    if (formData[key]) {
+      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
+      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
+      conditionList.push({
+        leftValue: key,
+        compareSymbol: compareSymbol,
+        rightValue: value
+      });
+    }
+  }
+  return conditionList;
+};
+
 var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
+      platform: 'WDT_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15536,13 +15937,15 @@ var GoodList = function GoodList(props, ref) {
   }, {
     label: 'SKU编码',
     name: 'skuCode',
-    dataIndex: 'specNo'
+    dataIndex: 'specNo',
+    type: 'optionalInput'
   }, {
     label: '商品名称',
     name: 'goodName'
   }, {
     label: '商品编码',
-    name: 'goodNo'
+    name: 'goodNo',
+    type: 'optionalInput'
   }, {
     label: '品牌',
     name: 'brandIds',
@@ -15732,13 +16135,15 @@ var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
 var getTableData$1 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
+      platform: 'JST_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15759,10 +16164,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -15983,20 +16390,15 @@ var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
+      platform: 'BS_E3_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16016,18 +16418,21 @@ var getTableData$2 = function getTableData(_ref, formData) {
 };
 var searchFormData$1 = [{
   label: '商品货号',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: 'SKU',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU ID',
   name: 'skuId',
-  dataIndex: 'specId'
+  dataIndex: 'specId',
+  type: 'optionalInput'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -16229,13 +16634,15 @@ var rowCheckKey = 'id';
 var getTableData$3 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'KM_ERP'
-    }, formData)
+      platform: 'KM_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16256,7 +16663,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16264,7 +16672,8 @@ var searchFormData$2 = [{
 }, {
   label: 'SKU编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -16472,20 +16881,15 @@ var KmGoodsModal = /*#__PURE__*/React.forwardRef(ErpGoodsModal);
 var getTableData$4 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'GY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16511,13 +16915,15 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$4 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -18137,13 +18543,15 @@ var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
 var getTableData$5 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18166,13 +18574,15 @@ var searchFormData$4 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -18377,250 +18787,493 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
 };
 var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
 
-var getColumns = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //百胜E3补发商品
-    BS_E3_REISSUE_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: val
-        });
+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;
       }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u53F7ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorName',
-      title: "\u989C\u8272\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorCode',
-      title: "\u989C\u8272\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeName',
-      title: "\u5C3A\u7801\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeCode',
-      title: "\u5C3A\u7801\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsNumber',
-      title: "\u5546\u54C1\u6570\u91CF",
-      width: 150
-    }, {
-      dataIndex: 'goodsPrice',
-      title: "\u5546\u54C1\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'shopPrice',
-      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
+    };
+  });
+  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;
+        }));
       }
-    }],
-    //百胜E3商品信息
-    BS_E3_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: val
+    },
+    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);
       }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      align: 'center',
+    },
+    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,
+    updateHandle = _ref.updateHandle;
+  return {
+    //百胜E3补发商品
+    BS_E3_REISSUE_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'goodsSn',
+      title: "\u8D27\u53F7",
       width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'goodsId',
       title: "\u8D27\u53F7ID",
-      align: 'center',
-      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'colorName',
       title: "\u989C\u8272\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
+      width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'colorCode',
       title: "\u989C\u8272\u4EE3\u7801",
-      align: 'center',
-      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'sizeName',
       title: "\u5C3A\u7801\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
+      width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'sizeCode',
       title: "\u5C3A\u7801\u4EE3\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
+      width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'goodsNumber',
       title: "\u5546\u54C1\u6570\u91CF",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-          style: {
-            width: 70
-          },
-          value: val,
-          min: 1,
-          precision: 0,
-          onChange: function onChange(num) {
-            return updateHandle(num, index, 'goodsNumber');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
+      width: 150
     }, {
       dataIndex: 'goodsPrice',
       title: "\u5546\u54C1\u5355\u4EF7",
-      align: 'center',
-      ellipsis: true,
-      width: 120,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-          style: {
-            width: 70
-          },
-          value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            return updateHandle(num, index, 'goodsPrice');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-      }
+      width: 150
     }, {
       dataIndex: 'shopPrice',
       title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
+      }
+    }],
+    //百胜E3商品信息
+    BS_E3_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'sharePrice',
-      title: "\u5206\u644A\u4EF7",
+      dataIndex: 'skuId',
+      title: "SKU ID",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'sharePayment',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
       align: 'center',
       ellipsis: true,
-      width: 120,
-      render: function render(val, record, index) {
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'goodsSn',
+      title: "\u8D27\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u53F7ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorName',
+      title: "\u989C\u8272\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorCode',
+      title: "\u989C\u8272\u4EE3\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeName',
+      title: "\u5C3A\u7801\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeCode',
+      title: "\u5C3A\u7801\u4EE3\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsNumber',
+      title: "\u5546\u54C1\u6570\u91CF",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'goodsNumber');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'goodsPrice',
+      title: "\u5546\u54C1\u5355\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'goodsPrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'shopPrice',
+      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 120
+    }, {
+      dataIndex: 'sharePrice',
+      title: "\u5206\u644A\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 120
+    }, {
+      dataIndex: 'sharePayment',
+      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 120
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 120,
+      render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
@@ -19145,7 +19798,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u8D60\u54C1\u65B9\u5F0F",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 100,
+      render: renderGiftType
     }, {
       dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
@@ -20542,219 +21196,648 @@ var getColumns$5 = function getColumns() {
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
     }, {
-      dataIndex: 'remark',
-      title: '备注',
+      dataIndex: 'remark',
+      title: '备注',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : renderTextEllipsis(val);
+      }
+    }],
+    JST_RETURN_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
+          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
+          var res = typeof v === 'number' ? v < 0 : true;
+          if (res) {
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
+        }
+      },
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
+          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var res = typeof qty === 'number' ? qty < 1 : true;
+          if (res) {
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
+          }
+          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) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+      }
+    }, {
+      dataIndex: 'batchId',
+      title: '批次号',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : renderTextEllipsis(val);
+      }
+    }, {
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240,
+      render: renderTextEllipsis
+    }].map(fillAttrs),
+    JST_EXCHANGE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'qty',
+      title: '数量',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          style: {
+            width: 70
+          },
+          value: val,
+          onChange: function onChange(e) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          }
+        }) : renderTextEllipsis(val);
+      }
+    }].map(fillAttrs),
+    // jst售后商品信息
+    JST_AFTERSALE_GOODS: [{
+      dataIndex: 'asId',
+      title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'asiId',
+      title: "\u552E\u540E\u5B50\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'outerOiId',
+      title: "\u5B50\u8BA2\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: "\u56FE\u7247",
+      width: 100,
+      align: 'center',
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      },
+      headerComponentType: 'pic'
+    }, {
+      dataIndex: 'name',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'propertiesValue',
+      title: "\u89C4\u683C\u5C5E\u6027\u503C",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'qty',
+      title: "\u7533\u8BF7\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'rQty',
+      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'defectiveQty',
+      title: "\u6B21\u54C1\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'amount',
+      title: "\u7533\u8BF7\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopAmount',
+      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combineSkuId',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopSkuId',
+      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: "\u6B3E\u5F0F\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'type',
+      title: "\u552E\u540E\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuType',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      },
+      headerMapping: {
+        transformValue: function transformValue(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        },
+        renderExport: function renderExport(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        }
+      }
+    }, {
+      dataIndex: 'receiveDate',
+      title: "\u5165\u4ED3\u65F6\u95F4",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u660E\u7EC6\u5907\u6CE8",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$6 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    KM_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
       width: 150,
-      ellipsis: true,
-      align: 'center',
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-          style: {
-            width: 70
-          },
-          value: val,
-          onChange: function onChange(e) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
-          }
-        }) : renderTextEllipsis(val);
-      }
-    }],
-    JST_RETURN_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
       render: renderTextEllipsis
     }, {
       dataIndex: 'skuId',
-      title: '商品编码',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+        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: val
+          src: imgUrl
         });
       }
     }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值',
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
-    }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
+      width: 100,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'qty',
-      title: '数量',
-      width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
-            width: 70
+            width: 130
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
       }
     }, {
-      dataIndex: 'batchId',
-      title: '批次号',
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: true
-          }, {
-            label: '否',
-            value: false
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      }
+      dataIndex: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'remark',
-      title: '备注',
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-          style: {
-            width: 70
-          },
-          value: val,
-          onChange: function onChange(e) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
-          }
-        }) : renderTextEllipsis(val);
-      }
+      dataIndex: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'outerOiId',
-      title: '子订单号',
-      width: 240,
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
-    }].map(fillAttrs),
-    JST_EXCHANGE_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: '商品编码',
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值',
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
+          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var res = typeof realNum === 'number' ? realNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'realNum');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'qty',
-      title: '数量',
+      dataIndex: 'desiredNum',
+      title: "\u5E94\u8865\u53D1\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
             width: 70
           },
@@ -20762,281 +21845,194 @@ var getColumns$5 = function getColumns() {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
-      }
-    }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: true
-          }, {
-            label: '否',
-            value: false
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
       }
     }, {
-      dataIndex: 'remark',
-      title: '备注',
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
-            width: 70
+            width: 130
           },
           value: val,
-          onChange: function onChange(e) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(e.target.value, index, 'remark');
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : renderTextEllipsis(val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
-    }].map(fillAttrs),
-    // jst售后商品信息
-    JST_AFTERSALE_GOODS: [{
-      dataIndex: 'asId',
-      title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'asiId',
-      title: "\u552E\u540E\u5B50\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'outerOiId',
-      title: "\u5B50\u8BA2\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: "\u56FE\u7247",
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
-      align: 'center',
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+        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: val
+          src: imgUrl
         });
-      },
-      headerComponentType: 'pic'
-    }, {
-      dataIndex: 'name',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 250,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'propertiesValue',
-      title: "\u89C4\u683C\u5C5E\u6027\u503C",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'qty',
-      title: "\u7533\u8BF7\u6570\u91CF",
-      width: 150,
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$4(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'rQty',
-      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'defectiveQty',
-      title: "\u6B21\u54C1\u6570\u91CF",
-      width: 150,
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'amount',
-      title: "\u7533\u8BF7\u91D1\u989D",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopAmount',
-      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
-      width: 150,
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'price',
-      title: "\u5355\u4EF7",
       width: 150,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'combineSkuId',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 250,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'shopSkuId',
-      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'iId',
-      title: "\u6B3E\u5F0F\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'type',
-      title: "\u552E\u540E\u7C7B\u578B",
-      width: 150,
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuType',
-      title: "\u5546\u54C1\u7C7B\u578B",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      },
-      headerMapping: {
-        transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
-        },
-        renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
-        }
-      }
-    }, {
-      dataIndex: 'receiveDate',
-      title: "\u5165\u4ED3\u65F6\u95F4",
-      width: 200,
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'remark',
-      title: "\u660E\u7EC6\u5907\u6CE8",
-      width: 200,
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }]
-  };
-};
-
-function toNum$3(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
-var getColumns$6 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    KM_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'code',
+      title: "\u6761\u7801",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
-      width: 150,
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
+      dataIndex: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
-      width: 170,
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
-      width: 150,
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: val
-        });
-      }
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'num',
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
@@ -21048,13 +22044,16 @@ var getColumns$6 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
@@ -21065,83 +22064,198 @@ var getColumns$6 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'settlementPrice',
+      title: "\u7ED3\u7B97\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'divideOrderFee',
+      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'bfit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
+      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');
+          },
+          options: [{
+            label: '是',
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
-      dataIndex: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'gift',
+      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, 'gift');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
         ellipsis: true
       });
     }),
-    KM_REISSUE_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250,
+    // 巨益补发商品信息
+    JY_REISSUE_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
-      width: 170,
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'realNum',
-      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value) {
-        var title = '';
-        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
-          var res = typeof realNum === 'number' ? realNum < 1 : true;
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
-            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
           }
           return res;
         })) {
-          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
         }
       },
       render: function render(val, record, index) {
@@ -21153,65 +22267,100 @@ var getColumns$6 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'realNum');
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'desiredNum',
-      title: "\u5E94\u8865\u53D1\u6570\u91CF",
-      width: 100,
+      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: 70
+            width: 130
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'bfit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-          style: {
-            width: 130
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
           },
           value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
-          }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'bfit');
+          },
+          options: [{
+            label: '是',
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
-      dataIndex: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 30,
-          src: val
-        });
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'gift',
+      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, 'gift');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21222,12 +22371,54 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
-var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+var getColumns$8 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //[SKX]商品信息(ON)
+    SKX_GOODS: [{
+      dataIndex: 'skuEcode',
+      title: "[SKX]\u53D1\u8D27\u5355\u660E\u7EC6-skuEcode",
+      width: 250
+    }, {
+      dataIndex: 'subOrderId',
+      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'onBillNo',
+      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
+      width: 200
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    //[SKX]退货商品信息(TH)
+    SKX_RETURN_GOODS: [{
+      dataIndex: 'returnSkuEcode',
+      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
+      width: 300
+    }, {
+      dataIndex: 'returnSubOrderId',
+      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'returnBillNo',
+      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
+      width: 200
+    }]
+  };
+};
+
+var isNumberOrNumberString$3 = function isNumberOrNumberString(value) {
   if (typeof value === 'number') return true;
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-function toNum$4(value) {
+function toNum$5(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -21236,44 +22427,44 @@ function toNum$4(value) {
   }
   return void 0;
 }
-var getColumns$7 = function getColumns(_ref) {
+var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
   return {
     //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+    JKY_GOODS: [{
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
@@ -21285,82 +22476,18 @@ 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,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    },
-    // {
-    //   dataIndex: 'specName',
-    //   title: `规格名称`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 200,
-    // },
-    // {
-    //   dataIndex: 'specCode',
-    //   title: `规格编号`,
-    //   align: 'center',
-    //   ellipsis: true,
-    //   width: 150,
-    // },
-    {
-      dataIndex: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'skuImgUrl',
+      title: "\u89C4\u683C\u56FE\u7247",
       align: 'center',
       ellipsis: true,
       width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
     }, {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
@@ -21376,11 +22503,16 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
+    }, {
+      dataIndex: 'actualSendCount',
+      title: "\u5B9E\u53D1\u6570\u91CF",
+      width: 150,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sellPrice',
       title: "\u5355\u4EF7",
@@ -21396,30 +22528,42 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
-    }, {
-      dataIndex: 'mallSellingPrice',
-      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
-      width: 150
     }, {
       dataIndex: 'sellTotal',
       title: "\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'settlementPrice',
-      title: "\u7ED3\u7B97\u4EF7",
+      dataIndex: 'discountTotal',
+      title: "\u62B5\u6263\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'divideOrderFee',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'shareFavourableFee',
+      title: "\u5206\u644A\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'bfit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      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, {
@@ -21431,30 +22575,45 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'bfit');
+            updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: '1'
           }, {
             label: '否',
-            value: 'False'
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }, {
-      dataIndex: 'combinationName',
-      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'combinationCode',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'isFit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
-      render: renderTextEllipsis
+      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: 'gift',
-      title: "\u662F\u5426\u8D60\u54C1",
+      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, {
@@ -21466,7 +22625,7 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isPresell');
           },
           options: [{
             label: '是',
@@ -21477,115 +22636,169 @@ var getColumns$7 = function getColumns(_ref) {
           }]
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    // 巨益补发商品信息
-    JY_REISSUE_GOODS: [{
-      dataIndex: 'productName',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'cateName',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'productId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'goodsTags',
+      title: "\u8D27\u54C1\u6807\u7B7E",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'goodsMemo',
+      title: "\u8D27\u54C1\u5907\u6CE8",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      dataIndex: 'tradeGoodsNo',
+      title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
+      dataIndex: 'tradeGoodsName',
+      title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
+      dataIndex: 'tradeGoodsSpec',
+      title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      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: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
+      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: "\u6570\u91CF",
+      title: "\u53D1\u8D27\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+        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) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
+            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(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
         }
       },
       render: function render(val, record, index) {
@@ -21599,7 +22812,7 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -21619,131 +22832,87 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellPrice: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
-    }, {
-      dataIndex: 'mallSellingPrice',
-      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
-      width: 150
     }, {
       dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
-      width: 150
+      title: "\u603B\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.sellCount * record.sellPrice;
+      }
     }, {
-      dataIndex: 'bfit',
-      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      dataIndex: 'reason',
+      title: "\u9000\u6362\u539F\u56E0",
+      width: 250,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'reason');
+          }
+        });
+      }
+    }, {
+      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, 'bfit');
+            updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: '1'
           }, {
             label: '否',
-            value: 'False'
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }, {
-      dataIndex: 'combinationName',
-      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'combinationCode',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'gift',
-      title: "\u662F\u5426\u8D60\u54C1",
+      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, 'gift');
+            updateHandle(value, index, 'isFit');
           },
           options: [{
             label: '是',
-            value: '1'
-          }, {
-            label: '否',
-            value: '0'
-          }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-      }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
-  };
-};
-
-var getColumns$8 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
-  return {
-    //[SKX]商品信息(ON)
-    SKX_GOODS: [{
-      dataIndex: 'skuEcode',
-      title: "[SKX]\u53D1\u8D27\u5355\u660E\u7EC6-skuEcode",
-      width: 250
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+      }
     }, {
-      dataIndex: 'subOrderId',
-      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
-      width: 300
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'onBillNo',
-      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
-      width: 200
+      dataIndex: 'cateName',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
         ellipsis: true
       });
-    }),
-    //[SKX]退货商品信息(TH)
-    SKX_RETURN_GOODS: [{
-      dataIndex: 'returnSkuEcode',
-      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
-      width: 300
-    }, {
-      dataIndex: 'returnSubOrderId',
-      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
-      width: 300
-    }, {
-      dataIndex: 'returnBillNo',
-      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
-      width: 200
-    }]
+    })
   };
 };
 
-var getColumns$9 = function getColumns(_ref) {
+var getColumns$a = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -21860,7 +23029,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({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -21898,8 +23067,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$9({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), {}, {
-    default: getColumns$9({
+    default: getColumns$a({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -22046,6 +23220,9 @@ 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) {
@@ -22332,6 +23509,8 @@ 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 = {
@@ -22344,6 +23523,8 @@ 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',
@@ -22379,23 +23560,75 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
-  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 getKmSupplier = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dataSource) {
+      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.map(function (item) {
+              return item.sysItemId;
+            });
+            _context.next = 3;
+            return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
+          case 3:
+            supplierMap = _context.sent;
+            dataSource === null || dataSource === void 0 ? void 0 : dataSource.forEach(function (item) {
+              var supplierInfo = supplierMap.get(item.sysItemId);
+              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 closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -22518,6 +23751,9 @@ 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) {
@@ -22575,7 +23811,7 @@ 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', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', '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);
@@ -22667,6 +23903,8 @@ 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':
           {
@@ -22714,9 +23952,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var getShowFilterColumns = React.useCallback(function (_ref2) {
-    var showHeader = _ref2.showHeader,
-      initBaseInfoColumns = _ref2.initBaseInfoColumns;
+  var getShowFilterColumns = React.useCallback(function (_ref4) {
+    var showHeader = _ref4.showHeader,
+      initBaseInfoColumns = _ref4.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]';
@@ -23871,7 +25109,7 @@ var jyUtils = {
 };
 
 var singletonMap$7 = new Map();
-var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
   if (!singletonMap$7.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
@@ -23879,6 +25117,50 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         singletonMap$7.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/jkyOrderDetail', {
+        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: {
@@ -23902,16 +25184,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$7.delete(orderNo);
+            singletonMap$8.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$7.set(orderNo, p);
+    singletonMap$8.set(orderNo, p);
   }
-  return singletonMap$7.get(orderNo);
+  return singletonMap$8.get(orderNo);
 };
 var kmUtils = {
   getOrderListSingleton: getOrderListSingleton$2
@@ -23928,6 +25210,7 @@ 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 = {
@@ -23939,6 +25222,7 @@ 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) {
@@ -23953,7 +25237,6 @@ 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') {
@@ -23972,6 +25255,8 @@ 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]);
@@ -24057,7 +25342,10 @@ var index$2 = (function (props) {
           case 0:
             wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
               var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return (item.srcTid || '').split(',').includes(orderNo);
+                var _split;
+                return (_split = (item.srcTid || '').split(',')) === null || _split === void 0 ? void 0 : _split.some(function (tid) {
+                  return tid.indexOf(orderNo) > -1;
+                });
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
@@ -24233,6 +25521,31 @@ 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,
@@ -24657,16 +25970,16 @@ var orderSubFormConstants = {
 };
 
 var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
-var singletonMap$8 = new Map();
+var singletonMap$9 = new Map();
 var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
     shopId = parmas.shopId;
   var key = "".concat(orderNo, "-").concat(shopId);
-  if (!singletonMap$8.has(key)) {
+  if (!singletonMap$9.has(key)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$8.delete(key);
+        singletonMap$9.delete(key);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -24682,16 +25995,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$8.delete(key);
+            singletonMap$9.delete(key);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$8.set(key, p);
+    singletonMap$9.set(key, p);
   }
-  return singletonMap$8.get(key);
+  return singletonMap$9.get(key);
 };
 var renderEditItem = function renderEditItem(_ref) {
   var item = _ref.item,
@@ -25124,6 +26437,9 @@ 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) {
@@ -25167,7 +26483,10 @@ var processWdtOrders = function processWdtOrders(_ref2) {
   var data = _ref2.data,
     orderNo = _ref2.orderNo;
   var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-    return (item.srcTid || '').split(',').includes(orderNo);
+    var _split;
+    return (_split = (item.srcTid || '').split(',')) === null || _split === void 0 ? void 0 : _split.some(function (tid) {
+      return tid.indexOf(orderNo) > -1;
+    });
   });
   return trades;
 };
@@ -25421,6 +26740,32 @@ 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',
@@ -25452,7 +26797,7 @@ var componentMap$2 = {
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
+  var _withInfo$current3, _withInfo$current4, _componentMap$compTyp6;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -25468,6 +26813,10 @@ 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([]);
@@ -25479,10 +26828,90 @@ 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 === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : _value$kmGoods.forEach(function (item) {
+        map[item.sysItemId] = 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 _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
               var orders = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (trade) {
@@ -25495,12 +26924,12 @@ var CommonGoods = function CommonGoods(props) {
             });
           case 1:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function getWdtOrderList(_x) {
-      return _ref.apply(this, arguments);
+    return function getWdtOrderList(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
   React.useEffect(function () {
@@ -25606,8 +27035,8 @@ var CommonGoods = function CommonGoods(props) {
       mode: isStrict
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref2) {
-    var mode = _ref2.mode;
+  var getGoodDetails = function getGoodDetails(_ref3) {
+    var mode = _ref3.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
     if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
@@ -25619,45 +27048,126 @@ var CommonGoods = function CommonGoods(props) {
       return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
     }) : goodDetails;
   };
+  // const getKmSupplier = async (list: any[]) => {
+  //   const systemItemIds = list?.map((item) => item.sysItemId);
+  //   const supplierMap = await servers.KM.getSupplierSingleton(systemItemIds);
+  //   list?.forEach((item) => {
+  //     const supplierInfo = supplierMap.get(item.sysItemId);
+  //     item.supplierCode = supplierInfo?.supplierCode;
+  //     item.supplierName = supplierInfo?.supplierName;
+  //   });
+  // };
   // 找到该订单号下所有商品
-  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 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;
+              console.log('fetchOriginDataSource', data);
+              setOriginDataSource(Array.isArray(data) ? data : []);
+            case 5:
+            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 getDataSourceAsync = function getDataSourceAsync() {
-    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 _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 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 || []
       }));
@@ -25685,11 +27195,9 @@ 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$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
+    showChangeBtn: (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.showChangeBtn,
     tradeGoods: {
-      originDataSource: getAllTradeGoodsDetails({
-        mode: value === null || value === void 0 ? void 0 : value.isStrict
-      }),
+      originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,
       selectedGoodsChange: selectedGoodsChange
     }
@@ -28936,6 +30444,7 @@ 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
 };
 
@@ -29018,6 +30527,7 @@ 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;
@@ -29026,3 +30536,4 @@ exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;
 exports.orderSubFormConstants = orderSubFormConstants;
 exports.renderMap = renderMap;
+exports.renderSplitMap = renderSplitMap;