@kmkf-fe-packages/basic-components 2.2.39-beta.10 → 2.2.39-beta.14

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -9786,13 +9786,12 @@ var EditFileRender = function EditFileRender(_ref7) {
   }));
 };
 var EditRenderMap = {
-  INPUT: function INPUT(_ref9) {
-    var val = _ref9.val,
-      record = _ref9.record,
-      index = _ref9.index,
-      t = _ref9.t,
-      updateHandle = _ref9.updateHandle,
-      disabled = _ref9.disabled;
+  INPUT: function INPUT(_ref8) {
+    var val = _ref8.val,
+      index = _ref8.index,
+      t = _ref8.t,
+      updateHandle = _ref8.updateHandle,
+      disabled = _ref8.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
       style: {
@@ -9815,13 +9814,12 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React.createElement("div", null, val);
   },
-  TEXTAREA: function TEXTAREA(_ref10) {
-    var val = _ref10.val,
-      record = _ref10.record,
-      index = _ref10.index,
-      t = _ref10.t,
-      updateHandle = _ref10.updateHandle,
-      disabled = _ref10.disabled;
+  TEXTAREA: function TEXTAREA(_ref9) {
+    var val = _ref9.val,
+      index = _ref9.index,
+      t = _ref9.t,
+      updateHandle = _ref9.updateHandle,
+      disabled = _ref9.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
       style: {
@@ -9844,15 +9842,31 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React.createElement("div", null, val);
   },
-  PICTURE: function PICTURE(_ref11) {
+  PICTURE: function PICTURE(_ref10) {
+    var val = _ref10.val,
+      index = _ref10.index,
+      t = _ref10.t,
+      updateHandle = _ref10.updateHandle,
+      disabled = _ref10.disabled,
+      platform = _ref10.platform;
+    return /*#__PURE__*/React.createElement(EditPictureRender, {
+      val: val,
+      t: t,
+      disabled: disabled,
+      index: index,
+      updateHandle: updateHandle,
+      hostUrl: hostUrl,
+      platform: platform
+    });
+  },
+  FILE: function FILE(_ref11) {
     var val = _ref11.val,
-      record = _ref11.record,
       index = _ref11.index,
       t = _ref11.t,
       updateHandle = _ref11.updateHandle,
       disabled = _ref11.disabled,
       platform = _ref11.platform;
-    return /*#__PURE__*/React.createElement(EditPictureRender, {
+    return /*#__PURE__*/React.createElement(EditFileRender, {
       val: val,
       t: t,
       disabled: disabled,
@@ -9862,27 +9876,30 @@ var EditRenderMap = {
       platform: platform
     });
   },
-  FILE: function FILE(_ref12) {
+  RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
-      record = _ref12.record,
       index = _ref12.index,
       t = _ref12.t,
       updateHandle = _ref12.updateHandle,
       disabled = _ref12.disabled,
-      platform = _ref12.platform;
-    return /*#__PURE__*/React.createElement(EditFileRender, {
-      val: val,
-      t: t,
-      disabled: disabled,
-      index: index,
-      updateHandle: updateHandle,
-      hostUrl: hostUrl,
-      platform: platform
-    });
+      componentDto = _ref12.componentDto;
+    return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('subform');
+      }
+    }, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+      value: val,
+      disabled: t.isEdit || disabled,
+      allowClear: true,
+      placement: "topLeft",
+      listHeight: 120,
+      onChange: function onChange(e) {
+        return updateHandle(e, index, t.key);
+      }
+    }));
   },
-  RADIO: function RADIO(_ref13) {
+  SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
-      record = _ref13.record,
       index = _ref13.index,
       t = _ref13.t,
       updateHandle = _ref13.updateHandle,
@@ -9903,32 +9920,29 @@ var EditRenderMap = {
       }
     }));
   },
-  SELECT: function SELECT(_ref14) {
+  CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
-      record = _ref14.record,
       index = _ref14.index,
       t = _ref14.t,
       updateHandle = _ref14.updateHandle,
       disabled = _ref14.disabled,
       componentDto = _ref14.componentDto;
-    return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/React.createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({
       getPopupContainer: function getPopupContainer() {
         return document.getElementById('subform');
       }
     }, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
-      disabled: t.isEdit || disabled,
-      allowClear: true,
       placement: "topLeft",
       listHeight: 120,
+      disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       }
     }));
   },
-  CHECKBOX: function CHECKBOX(_ref15) {
+  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
     var val = _ref15.val,
-      record = _ref15.record,
       index = _ref15.index,
       t = _ref15.t,
       updateHandle = _ref15.updateHandle,
@@ -9948,27 +9962,23 @@ var EditRenderMap = {
       }
     }));
   },
-  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref16) {
+  DEFAULT: function DEFAULT(_ref16) {
     var val = _ref16.val,
-      record = _ref16.record,
       index = _ref16.index,
       t = _ref16.t,
       updateHandle = _ref16.updateHandle,
-      disabled = _ref16.disabled,
-      componentDto = _ref16.componentDto;
-    return /*#__PURE__*/React.createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({
-      getPopupContainer: function getPopupContainer() {
-        return document.getElementById('subform');
-      }
-    }, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+      disabled = _ref16.disabled;
+    return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(Input, {
+      allowClear: true,
+      style: {
+        width: '100%'
+      },
       value: val,
-      placement: "topLeft",
-      listHeight: 120,
-      disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
-        return updateHandle(e, index, t.key);
+        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.createElement("div", null, val);
   }
 };
 var EditSplitRenderMap = {
@@ -9980,10 +9990,11 @@ var EditSplitRenderMap = {
       disabled = _ref17.disabled;
     return /*#__PURE__*/React.createElement(ApaasLogistics, {
       value: val,
+      allowClear: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: disabled
+      disabled: t.isEdit || disabled
     });
   },
   //退货物流-物流公司
@@ -9995,10 +10006,11 @@ var EditSplitRenderMap = {
       disabled = _ref18.disabled;
     return /*#__PURE__*/React.createElement(ApaasLogistics, {
       value: val,
+      allowClear: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: disabled
+      disabled: t.isEdit || disabled
     });
   }
 };
@@ -10164,15 +10176,17 @@ var SubForm = function SubForm(props) {
             disabled: disabled
           });
         } else {
-          return /*#__PURE__*/React.createElement(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);
-            }
+          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
           });
         }
       }
@@ -13934,7 +13948,7 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = 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 = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   useEffect(function () {
@@ -15304,6 +15318,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.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.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.createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'isFit',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'isPresell',
+  title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+  }
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C",
+  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 cloneDeep({
     gy: gyColumns,
@@ -15311,7 +15542,8 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns
+    jy: jyColumns,
+    jky: jkyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -18453,41 +18685,284 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
 };
 var JyGoodsModal$1 = /*#__PURE__*/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.createElement(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 = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jky'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$6, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$5,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    className: "GoodModalColumns",
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    },
+    size: "small"
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
+
+var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+  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 = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var jkyGoodsListRef = 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.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(JkyGoodsList, {
+    ref: jkyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JkyGoodsModal$1 = /*#__PURE__*/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.createElement(Image, {
+          width: 30,
+          src: val
+        });
       }
     }, {
       dataIndex: 'goodsSn',
@@ -19698,182 +20173,554 @@ var getColumns$2 = function getColumns(_ref) {
       width: 150,
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundNum',
+      title: "\u9000\u6B3E\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'totalAmount',
+      title: "\u9000\u8D27\u603B\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundAmount',
+      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'num',
+      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u4EF7\u683C",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'originalPrice',
+      title: "\u539F\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'giftTypeDesc',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+var getYesOrNo$2 = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
+var getColumns$3 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //万里牛商品信息
+    WLN_GOODS: [{
+      dataIndex: 'wlnItemName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsCode',
+      title: "\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "sku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7EBF\u4E0Asku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'olnSkuCode',
+      title: "\u7EBF\u4E0Asku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sku',
+      title: "\u7EBF\u4E0Asku id",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'name',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: "\u7EBF\u4E0A\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: val
+        });
+      }
     }, {
-      dataIndex: 'refundNum',
-      title: "\u9000\u6B3E\u6570\u91CF",
-      width: 150,
+      dataIndex: 'olnItemCOde',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'totalAmount',
-      title: "\u9000\u8D27\u603B\u989D",
-      width: 150,
+      dataIndex: 'code',
+      title: "\u7EBF\u4E0A\u5546\u54C1id",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'refundAmount',
-      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
-      width: 150,
+      dataIndex: 'barCode',
+      title: "\u5546\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'num',
-      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
-      width: 150,
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
+      width: 100,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'price',
-      title: "\u4EF7\u683C",
-      width: 150,
+      dataIndex: 'number',
+      title: "".concat(text, "\u6570\u91CF"),
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'number');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
-      dataIndex: 'originalPrice',
-      title: "\u539F\u4EF7",
-      width: 150,
+      dataIndex: 'share',
+      title: "\u5E94\u6536\u6B3E",
       align: 'center',
       ellipsis: true,
+      width: 70,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'giftTypeDesc',
+      dataIndex: 'type',
       title: "\u8D60\u54C1\u7C7B\u578B",
-      width: 150,
       align: 'center',
       ellipsis: true,
+      width: 100,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'unitName',
-      title: "\u57FA\u672C\u5355\u4F4D",
-      ellipsis: true,
-      width: 150,
+      dataIndex: 'isPackage',
+      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'auxUnitName',
-      title: "\u8F85\u52A9\u5355\u4F4D",
       ellipsis: true,
-      width: 150,
-      align: 'center',
-      render: renderTextEllipsis
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
+      },
+      width: 100
     }]
   };
 };
 
-var getYesOrNo$2 = function getYesOrNo(val) {
+var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+var getYesOrNo$3 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
-var getColumns$3 = function getColumns(_ref) {
+function toNum$1(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return {
-    //万里牛商品信息
-    WLN_GOODS: [{
-      dataIndex: 'wlnItemName',
+    //管易商品信息
+    GY_GOODS: [{
+      dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsCode',
+      dataIndex: 'goodShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "sku\u7F16\u7801",
+      dataIndex: 'specName',
+      title: "SKU\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7EBF\u4E0Asku\u540D\u79F0",
+      dataIndex: 'specNo',
+      title: "SKU\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      width: 250,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'olnSkuCode',
-      title: "\u7EBF\u4E0Asku\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'qty',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5B9E\u9645\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'amount',
+      title: "\u5B9E\u9645\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'originPrice',
+      title: "\u6807\u51C6\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'originAmount',
+      title: "\u6807\u51C6\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'discountFee',
+      title: "\u8BA9\u5229\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'amountAfter',
+      title: "\u8BA9\u5229\u540E\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'cancel',
+      title: "\u662F\u5426\u53D6\u6D88",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+      }
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+      }
+    }, {
+      dataIndex: 'skuNote',
+      title: "\u5546\u54C1\u5907\u6CE8",
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    //管易补发商品信息
+    GY_REISSUE_GOODS: [{
+      dataIndex: 'goodName',
+      title: "\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sku',
-      title: "\u7EBF\u4E0Asku id",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'goodShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'name',
-      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodNo',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specName',
+      title: "SKU\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: "\u7EBF\u4E0A\u56FE\u7247",
+      dataIndex: 'specNo',
+      title: "SKU\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'qty',
+      title: "\u6570\u91CF",
       width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 30,
-          src: val
-        });
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$1(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.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'olnItemCOde',
-      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'price',
+      title: "\u5B9E\u9645\u5355\u4EF7",
       width: 150,
-      render: renderTextEllipsis
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
-      dataIndex: 'code',
-      title: "\u7EBF\u4E0A\u5546\u54C1id",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'amount',
+      title: "\u5B9E\u9645\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'originPrice',
+      title: "\u6807\u51C6\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'originAmount',
+      title: "\u6807\u51C6\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.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    //管易退货商品信息
+    GY_RETURN_GOODS: [{
+      dataIndex: 'goodName',
+      title: "\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'barCode',
-      title: "\u5546\u54C1\u6761\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'goodShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'money',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'goodNo',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specName',
+      title: "SKU\u540D\u79F0",
       align: 'center',
       ellipsis: true,
-      width: 100,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'number',
-      title: "".concat(text, "\u6570\u91CF"),
+      dataIndex: 'specNo',
+      title: "SKU\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'qty',
+      title: "\u6570\u91CF",
       width: 100,
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
+          var qty = toNum$1(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.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
-        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -19881,29 +20728,58 @@ var getColumns$3 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'number');
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'share',
-      title: "\u5E94\u6536\u6B3E",
-      align: 'center',
-      ellipsis: true,
-      width: 70,
-      render: renderTextEllipsis
+      dataIndex: 'price',
+      title: "\u5B9E\u9645\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
-      dataIndex: 'type',
-      title: "\u8D60\u54C1\u7C7B\u578B",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: renderTextEllipsis
+      dataIndex: 'amount',
+      title: "\u5B9E\u9645\u91D1\u989D",
+      width: 150
     }, {
-      dataIndex: 'isPackage',
-      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'originPrice',
+      title: "\u6807\u51C6\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'originAmount',
+      title: "\u6807\u51C6\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'discountFee',
+      title: "\u8BA9\u5229\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'amountAfter',
+      title: "\u8BA9\u5229\u540E\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.createElement(Select, {
           value: val,
@@ -19912,28 +20788,29 @@ var getColumns$3 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: true
+            value: 1
           }, {
             label: '否',
-            value: false
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
-      },
-      width: 100
-    }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
   };
 };
 
-var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
-  if (typeof value === 'number') return true;
-  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
-  return false;
-};
-var getYesOrNo$3 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
+var fillAttrs = function fillAttrs(item) {
+  if (!item.width) item.width = 150;
+  if (typeof item.ellipsis !== 'boolean') item.ellipsis = true;
+  if (!item.align) item.align = 'center';
+  return item;
 };
-function toNum$1(value) {
+function toNum$2(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -19941,182 +20818,241 @@ function toNum$1(value) {
     return value;
   }
   return void 0;
-}
-var getColumns$4 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
+}
+var getColumns$5 = function getColumns() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$text = _ref.text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
+    updateHandle = _ref.updateHandle;
   return {
-    //管易商品信息
-    GY_GOODS: [{
-      dataIndex: 'goodName',
-      title: "\u5546\u54C1\u540D\u79F0",
+    JST_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
       width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'skuId',
+      title: '商品编码',
       width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodNo',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
+      dataIndex: 'iId',
+      title: '款式编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specName',
-      title: "SKU\u540D\u79F0",
+      dataIndex: 'pic',
+      title: '商品图片',
+      ellipsis: true,
       align: 'center',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      width: 150,
       ellipsis: true,
-      width: 250,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specNo',
-      title: "SKU\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'saleBasePrice',
+      title: '原价',
       width: 150,
-      render: renderTextEllipsis
+      ellipsis: true,
+      align: 'center',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
     }, {
-      dataIndex: 'qty',
-      title: "\u6570\u91CF",
-      width: 100,
+      dataIndex: 'salePrice',
+      title: '单价',
+      ellipsis: true,
+      align: 'center',
+      width: 120,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150,
+      dataIndex: 'qty',
+      title: '数量',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
-            width: 130
+            width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'amount',
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'originPrice',
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'originAmount',
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'discountFee',
-      title: "\u8BA9\u5229\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'amountAfter',
-      title: "\u8BA9\u5229\u540E\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'cancel',
-      title: "\u662F\u5426\u53D6\u6D88",
+      dataIndex: 'saleAmount',
+      title: '总金额',
       width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+      ellipsis: true,
+      align: 'center',
+      render: function render(val, record, index) {
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
+      dataIndex: 'batchId',
+      title: '批次号',
       width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: true
           }, {
             label: '否',
-            value: 0
+            value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
     }, {
-      dataIndex: 'skuNote',
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150,
+      dataIndex: 'outerOiId',
+      title: '子订单号',
+      width: 240,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    //管易补发商品信息
-    GY_REISSUE_GOODS: [{
-      dataIndex: 'goodName',
-      title: "\u5546\u54C1\u540D\u79F0",
+    }],
+    JST_REISSUE_GOODS: [{
+      dataIndex: 'name',
+      title: '商品名称',
       width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'skuId',
+      title: '商品编码',
       width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodNo',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
+      dataIndex: 'iId',
+      title: '款式编码',
+      width: 150,
+      ellipsis: true,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specName',
-      title: "SKU\u540D\u79F0",
+      dataIndex: 'pic',
+      title: '商品图片',
+      ellipsis: true,
       align: 'center',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      width: 150,
       ellipsis: true,
-      width: 250,
+      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specNo',
-      title: "SKU\u7F16\u7801",
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      width: 150,
+      ellipsis: true,
       align: 'center',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
       ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
+      align: 'center',
+      width: 120,
+      // validator: (_rule: any, value: any) => {
+      //   let goodsName = '';
+      //   if (
+      //     (value?.jstReissueGoods || []).some((goods: any) => {
+      //       const v = toNum(goods?.salePrice);
+      //       const res = typeof v === 'number' ? v < 0 : true;
+      //       if (res) {
+      //         goodsName = goods?.name ? `[${goods?.name}]` : '';
+      //       }
+      //       return res;
+      //     })
+      //   ) {
+      //     return Promise.reject(`${goodsName}单价为大于等于0的数`);
+      //   }
+      // },
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
     }, {
       dataIndex: 'qty',
-      title: "\u6570\u91CF",
+      title: '数量',
+      ellipsis: true,
+      align: 'center',
       width: 100,
       validator: function validator(_rule, value) {
         var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
+        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).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.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
           }
           return res;
         })) {
@@ -20124,7 +21060,7 @@ var getColumns$4 = function getColumns(_ref) {
         }
       },
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20132,116 +21068,96 @@ var getColumns$4 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
-            }, index);
-          }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'price',
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
-          style: {
-            width: 130
-          },
-          value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
-    }, {
-      dataIndex: 'amount',
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'originPrice',
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'originAmount',
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
     }, {
       dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
+      title: '是否赠品',
+      ellipsis: true,
+      align: 'center',
+      width: 100,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: true
           }, {
             label: '否',
-            value: 0
+            value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    }),
-    //管易退货商品信息
-    GY_RETURN_GOODS: [{
-      dataIndex: 'goodName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
     }, {
-      dataIndex: 'goodShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'remark',
+      title: '备注',
       width: 150,
+      ellipsis: true,
+      align: 'center',
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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: 'goodNo',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
+      dataIndex: 'skuId',
+      title: '商品编码',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specName',
-      title: "SKU\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
+      dataIndex: 'iId',
+      title: '款式编码',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specNo',
-      title: "SKU\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'qty',
-      title: "\u6570\u91CF",
-      width: 100,
+      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.gyReturnGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
+        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.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+            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"));
+          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
         }
       },
       render: function render(val, record, index) {
@@ -20250,132 +21166,107 @@ var getColumns$4 = function getColumns(_ref) {
             width: 70
           },
           value: val,
-          min: 1,
-          precision: 0,
+          min: 0,
+          precision: 2,
           onChange: function onChange(num) {
-            updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150,
+      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.createElement(InputNumber, {
           style: {
-            width: 130
+            width: 70
           },
           value: val,
-          min: 0,
-          precision: 2,
+          min: 1,
+          precision: 0,
           onChange: function onChange(num) {
-            updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
-            }, index);
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'amount',
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'originPrice',
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'originAmount',
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'discountFee',
-      title: "\u8BA9\u5229\u91D1\u989D",
-      width: 150
+      dataIndex: 'saleAmount',
+      title: '总金额',
+      render: function render(val, record) {
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
+      }
     }, {
-      dataIndex: 'amountAfter',
-      title: "\u8BA9\u5229\u540E\u91D1\u989D",
-      width: 150
+      dataIndex: 'batchId',
+      title: '批次号',
+      render: renderTextEllipsis
     }, {
       dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
+      title: '是否赠品',
+      width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
           },
           options: [{
             label: '是',
-            value: 1
+            value: true
           }, {
             label: '否',
-            value: 0
-          }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
-      }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
-  };
-};
-
-var fillAttrs = function fillAttrs(item) {
-  if (!item.width) item.width = 150;
-  if (typeof item.ellipsis !== 'boolean') item.ellipsis = true;
-  if (!item.align) item.align = 'center';
-  return item;
-};
-function toNum$2(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
-var getColumns$5 = function getColumns() {
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    JST_GOODS: [{
+            value: false
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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: '商品名称',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
       dataIndex: 'skuId',
       title: '商品编码',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
       dataIndex: 'iId',
       title: '款式编码',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
       dataIndex: 'pic',
       title: '商品图片',
-      ellipsis: true,
-      align: 'center',
       width: 100,
       render: function render(val) {
         return /*#__PURE__*/React.createElement(ApaasImage, {
@@ -20386,27 +21277,19 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'propertiesValue',
       title: '规格值',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
       dataIndex: 'saleBasePrice',
       title: '原价',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: function render(price) {
         return price || price === 0 ? Number(price).toFixed(2) : '';
       }
     }, {
       dataIndex: 'salePrice',
       title: '单价',
-      ellipsis: true,
-      align: 'center',
       width: 120,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20421,11 +21304,9 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'qty',
       title: '数量',
-      ellipsis: true,
-      align: 'center',
       width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20440,27 +21321,15 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'saleAmount',
       title: '总金额',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
-      render: function render(val, record, index) {
+      render: function render(val, record) {
         return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
-    }, {
-      dataIndex: 'batchId',
-      title: '批次号',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
-      render: renderTextEllipsis
     }, {
       dataIndex: 'isGift',
       title: '是否赠品',
-      ellipsis: true,
-      align: 'center',
       width: 100,
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           value: val,
           onChange: function onChange(value) {
             updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(value, index, 'isGift');
@@ -20475,248 +21344,260 @@ var getColumns$5 = function getColumns() {
         }) : /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
       }
     }, {
-      dataIndex: 'outerOiId',
-      title: '子订单号',
-      width: 240,
+      dataIndex: 'remark',
+      title: '备注',
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(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
-    }],
-    JST_REISSUE_GOODS: [{
+    }, {
+      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.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      },
+      headerComponentType: 'pic'
+    }, {
       dataIndex: 'name',
-      title: '商品名称',
+      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: 'skuId',
-      title: '商品编码',
+      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.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: 'iId',
-      title: '款式编码',
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
-      ellipsis: true,
-      align: 'center',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
-    }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值',
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
-      ellipsis: true,
-      align: 'center',
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
-      ellipsis: true,
-      align: 'center',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
-    }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      ellipsis: true,
-      align: 'center',
-      width: 120,
-      // validator: (_rule: any, value: any) => {
-      //   let goodsName = '';
-      //   if (
-      //     (value?.jstReissueGoods || []).some((goods: any) => {
-      //       const v = toNum(goods?.salePrice);
-      //       const res = typeof v === 'number' ? v < 0 : true;
-      //       if (res) {
-      //         goodsName = goods?.name ? `[${goods?.name}]` : '';
-      //       }
-      //       return res;
-      //     })
-      //   ) {
-      //     return Promise.reject(`${goodsName}单价为大于等于0的数`);
-      //   }
-      // },
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
-      }
-    }, {
-      dataIndex: 'qty',
-      title: '数量',
-      ellipsis: true,
-      align: 'center',
-      width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).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 record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
-          style: {
-            width: 70
-          },
-          value: val,
-          min: 1,
-          precision: 0,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
-          }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
-      }
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      ellipsis: true,
-      align: 'center',
-      width: 100,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      }
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'remark',
-      title: '备注',
+      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.createElement(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.createElement(ApaasImage, {
+        return /*#__PURE__*/React.createElement(Image, {
           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.createElement(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.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
-      }
-    }, {
-      dataIndex: 'qty',
-      title: '数量',
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
       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.createElement(InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20724,114 +21605,126 @@ 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, 'num');
           }
         }) : /*#__PURE__*/React.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.createElement(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.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
-      }
-    }, {
-      dataIndex: 'remark',
-      title: '备注',
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.createElement(Input, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'outerOiId',
-      title: '子订单号',
-      width: 240,
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
-    }].map(fillAttrs),
-    JST_EXCHANGE_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
+    }].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: 'skuId',
-      title: '商品编码',
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值',
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\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.createElement(InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.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.createElement(InputNumber, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20839,396 +21732,406 @@ 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.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.createElement(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.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.createElement(Input, {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.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,
-      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,
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      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.createElement(ApaasImage, {
+        return /*#__PURE__*/React.createElement(Image, {
           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,
+      }
+    }].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,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'propertiesValue',
-      title: "\u89C4\u683C\u5C5E\u6027\u503C",
-      width: 200,
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'qty',
-      title: "\u7533\u8BF7\u6570\u91CF",
-      width: 150,
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'rQty',
-      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
-      width: 150,
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'defectiveQty',
-      title: "\u6B21\u54C1\u6570\u91CF",
-      width: 150,
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'amount',
-      title: "\u7533\u8BF7\u91D1\u989D",
-      width: 150,
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopAmount',
-      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'price',
-      title: "\u5355\u4EF7",
+      dataIndex: 'code',
+      title: "\u6761\u7801",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'combineSkuId',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 250,
+    },
+    // {
+    //   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: 'shopSkuId',
-      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
-      width: 200,
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: "\u6B3E\u5F0F\u7F16\u7801",
-      width: 200,
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'type',
-      title: "\u552E\u540E\u7C7B\u578B",
-      width: 150,
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuType',
-      title: "\u5546\u54C1\u7C7B\u578B",
-      width: 150,
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
       width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.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 ? '是' : '否';
-        }
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'receiveDate',
-      title: "\u5165\u4ED3\u65F6\u95F4",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
-      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,
+      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, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.createElement("span", null, val === 'True' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'gift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.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",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
-      width: 170,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'outerSkuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
-      width: 170,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 30,
-          src: val
-        });
-      }
-    }, {
-      dataIndex: 'num',
-      title: "\u6570\u91CF",
-      width: 100,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
-          style: {
-            width: 70
-          },
-          value: val,
-          min: 1,
-          precision: 0,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
-          }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
-      }
-    }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
-      width: 150,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
-          style: {
-            width: 130
-          },
-          value: val,
-          min: 0,
-          precision: 2,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
-          }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
-      }
-    }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
-    }, {
-      dataIndex: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
       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: 'sysTitle',
-      title: "\u7CFB\u7EDF\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: 'title',
+      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',
+      dataIndex: 'mallSkuId',
       title: "\u5E73\u53F0\u89C4\u683CID",
-      width: 170,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'outerSkuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
-      width: 170,
+      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) {
@@ -21240,65 +22143,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.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.createElement(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.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.createElement(InputNumber, {
-          style: {
-            width: 130
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(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.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.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.createElement(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.createElement(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.createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21309,12 +22247,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;
   }
@@ -21323,44 +22303,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,
@@ -21372,82 +22352,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.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
     }, {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
@@ -21463,11 +22379,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.createElement("span", null, val);
       }
+    }, {
+      dataIndex: 'actualSendCount',
+      title: "\u5B9E\u53D1\u6570\u91CF",
+      width: 150,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sellPrice',
       title: "\u5355\u4EF7",
@@ -21483,30 +22404,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.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.createElement(Select, {
@@ -21518,30 +22451,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.createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React.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.createElement(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.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.createElement(Select, {
@@ -21553,7 +22501,7 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isPresell');
           },
           options: [{
             label: '是',
@@ -21564,115 +22512,169 @@ var getColumns$7 = function getColumns(_ref) {
           }]
         }) : /*#__PURE__*/React.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",
-      align: 'center',
+      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: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
-      align: 'center',
+      dataIndex: 'subTradeId',
+      title: "\u5546\u54C1\u660E\u7EC6ID",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
-      align: 'center',
+      dataIndex: 'batchNo',
+      title: "\u6279\u6B21\u53F7",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
+      dataIndex: 'sendCount',
+      title: "\u6279\u6B21\u6570\u91CF",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
+      dataIndex: 'productDate',
+      title: "\u751F\u4EA7\u65E5\u671F",
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      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.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) {
@@ -21686,7 +22688,7 @@ var getColumns$7 = function getColumns(_ref) {
           onChange: function onChange(num) {
             updateDataHandle({
               sellCount: num,
-              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+              sellTotal: num && isNumberOrNumberString$3(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -21706,131 +22708,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.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.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.createElement(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.createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React.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.createElement(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'
+            value: 'True'
           }, {
             label: '否',
-            value: '0'
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
       }
-    }].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
     }, {
-      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,
@@ -21947,7 +22905,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
@@ -21985,8 +22943,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
@@ -22133,6 +23096,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) {
@@ -22419,6 +23385,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 = {
@@ -22431,6 +23399,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',
@@ -22605,6 +23575,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) {
@@ -22662,7 +23635,7 @@ var GoodItem$1 = function GoodItem(props) {
   var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   // 判断是否为是否展示系统单筛选项
-  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', '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 = useRef();
   console.debug('表格数据', value);
@@ -22754,6 +23727,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':
           {
@@ -23958,7 +24933,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) {
@@ -23966,6 +24941,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 = 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: JKY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: 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: {
@@ -23989,16 +25008,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
@@ -24015,6 +25034,7 @@ var columnsMap = {
   GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
+  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
 };
 var rowKeyMap = {
@@ -24026,6 +25046,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) {
@@ -24040,7 +25061,6 @@ var index$2 = (function (props) {
   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') {
@@ -24059,6 +25079,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]);
@@ -24323,6 +25345,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 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,
@@ -24747,16 +25794,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', {
@@ -24772,16 +25819,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,
@@ -25214,6 +26261,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) {
@@ -25514,6 +26564,32 @@ var componentMap$2 = {
     },
     getOrderList: jyUtils.getJyOrderListSingleton
   },
+  JKY_GOODS: {
+    type: 'jky',
+    key: 'jkyGoods',
+    name: '吉客云',
+    orderNo: 'tradeNo',
+    goodDetailOrderNo: 'tradeNo',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'jkyType',
+      updateGoodsHandle: 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',
@@ -25716,7 +26792,6 @@ var CommonGoods = function CommonGoods(props) {
   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
@@ -29029,7 +30104,8 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
   GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
   JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
+  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };