@kmkf-fe-packages/basic-components 2.2.43 → 2.2.44-beta.0

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';
@@ -8454,7 +8454,10 @@ var processLogisticsTrajectory = function processLogisticsTrajectory(getValue) {
     var map = subFields.reduce(function (cur, nxt) {
       return nxt === 'trajectoryApiStatus' ? _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_trajectoryApiStatus")), {}))) : _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
-    return _defineProperty({}, nex.uniqueKey, map);
+    var mapChild = subFields.reduce(function (cur, nxt) {
+      return nxt === 'trajectoryApiStatus' ? _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey, "_trajectoryApiStatus"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_trajectoryApiStatus")), {}))) : _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey, "_").concat(nxt), getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
+    }, {});
+    return _objectSpread2(_defineProperty({}, nex.uniqueKey, map), mapChild);
   };
 };
 var processLogisticsTrajectoryMore = function processLogisticsTrajectoryMore(getValue) {
@@ -8478,12 +8481,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
 };
 var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
   return function (nex, config) {
-    var _ref34;
+    var _ref33;
     var subFields = ['enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentRefundFee', 'enterprisePaymentStatus', 'enterprisePaymentTid'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
-    return _ref34 = {}, _defineProperty(_ref34, nex.uniqueKey, map), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref34;
+    return _ref33 = {}, _defineProperty(_ref33, nex.uniqueKey, map), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref33;
   };
 };
 var processJstLogistics = function processJstLogistics(getValue) {
@@ -9246,14 +9249,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
+    var _ref73;
+    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref75;
-    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
+    var _ref74;
+    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9548,7 +9551,6 @@ var FileRender = function FileRender(_ref) {
           cursor: 'pointer'
         },
         onClick: function onClick(e) {
-          console.log('onPreview');
           e.preventDefault();
           onPreview(item);
         },
@@ -9644,6 +9646,9 @@ var PictureRender = function PictureRender(_ref2) {
     }));
   }));
 };
+var LogisticsCompanyRender = function LogisticsCompanyRender(value) {
+  return ExpressData.getInstance().getExpressNameByCode(value) || value;
+};
 var MultipleSelectRender = function MultipleSelectRender(_ref5) {
   var _ref5$value = _ref5.value,
     value = _ref5$value === void 0 ? [] : _ref5$value;
@@ -9678,6 +9683,16 @@ var renderMap = {
     });
   }
 };
+var renderSplitMap = {
+  //物流轨迹-物流公司
+  jbCFrJV4m7_trajectoryCompany: function jbCFrJV4m7_trajectoryCompany(value) {
+    return LogisticsCompanyRender(value);
+  },
+  //退货物流-物流公司
+  '0qFEv9GEyd_returnLogisticsCompany': function qFEv9GEyd_returnLogisticsCompany(value) {
+    return LogisticsCompanyRender(value);
+  }
+};
 var EditPictureRender = function EditPictureRender(_ref6) {
   var _ref6$val = _ref6.val,
     val = _ref6$val === void 0 ? [] : _ref6$val,
@@ -9773,7 +9788,6 @@ var EditFileRender = function EditFileRender(_ref7) {
 var EditRenderMap = {
   INPUT: function INPUT(_ref8) {
     var val = _ref8.val,
-      record = _ref8.record,
       index = _ref8.index,
       t = _ref8.t,
       updateHandle = _ref8.updateHandle,
@@ -9802,7 +9816,6 @@ var EditRenderMap = {
   },
   TEXTAREA: function TEXTAREA(_ref9) {
     var val = _ref9.val,
-      record = _ref9.record,
       index = _ref9.index,
       t = _ref9.t,
       updateHandle = _ref9.updateHandle,
@@ -9831,7 +9844,6 @@ var EditRenderMap = {
   },
   PICTURE: function PICTURE(_ref10) {
     var val = _ref10.val,
-      record = _ref10.record,
       index = _ref10.index,
       t = _ref10.t,
       updateHandle = _ref10.updateHandle,
@@ -9849,7 +9861,6 @@ var EditRenderMap = {
   },
   FILE: function FILE(_ref11) {
     var val = _ref11.val,
-      record = _ref11.record,
       index = _ref11.index,
       t = _ref11.t,
       updateHandle = _ref11.updateHandle,
@@ -9867,7 +9878,6 @@ var EditRenderMap = {
   },
   RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
-      record = _ref12.record,
       index = _ref12.index,
       t = _ref12.t,
       updateHandle = _ref12.updateHandle,
@@ -9890,7 +9900,6 @@ var EditRenderMap = {
   },
   SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
-      record = _ref13.record,
       index = _ref13.index,
       t = _ref13.t,
       updateHandle = _ref13.updateHandle,
@@ -9913,7 +9922,6 @@ var EditRenderMap = {
   },
   CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
-      record = _ref14.record,
       index = _ref14.index,
       t = _ref14.t,
       updateHandle = _ref14.updateHandle,
@@ -9935,7 +9943,6 @@ var EditRenderMap = {
   },
   BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
     var val = _ref15.val,
-      record = _ref15.record,
       index = _ref15.index,
       t = _ref15.t,
       updateHandle = _ref15.updateHandle,
@@ -9954,6 +9961,57 @@ var EditRenderMap = {
         return updateHandle(e, index, t.key);
       }
     }));
+  },
+  DEFAULT: function DEFAULT(_ref16) {
+    var val = _ref16.val,
+      index = _ref16.index,
+      t = _ref16.t,
+      updateHandle = _ref16.updateHandle,
+      disabled = _ref16.disabled;
+    return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(Input, {
+      allowClear: true,
+      style: {
+        width: '100%'
+      },
+      value: val,
+      onChange: function onChange(e) {
+        var _e$target3;
+        return updateHandle(e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value, index, t.key);
+      }
+    }) : /*#__PURE__*/React.createElement("div", null, val);
+  }
+};
+var EditSplitRenderMap = {
+  jbCFrJV4m7_trajectoryCompany: function jbCFrJV4m7_trajectoryCompany(_ref17) {
+    var val = _ref17.val,
+      index = _ref17.index,
+      t = _ref17.t,
+      updateHandle = _ref17.updateHandle,
+      disabled = _ref17.disabled;
+    return /*#__PURE__*/React.createElement(ApaasLogistics, {
+      value: val,
+      allowClear: true,
+      onChange: function onChange(e) {
+        return updateHandle(e, index, t.key);
+      },
+      disabled: t.isEdit || disabled
+    });
+  },
+  //退货物流-物流公司
+  '0qFEv9GEyd_returnLogisticsCompany': function qFEv9GEyd_returnLogisticsCompany(_ref18) {
+    var val = _ref18.val,
+      index = _ref18.index,
+      t = _ref18.t,
+      updateHandle = _ref18.updateHandle,
+      disabled = _ref18.disabled;
+    return /*#__PURE__*/React.createElement(ApaasLogistics, {
+      value: val,
+      allowClear: true,
+      onChange: function onChange(e) {
+        return updateHandle(e, index, t.key);
+      },
+      disabled: t.isEdit || disabled
+    });
   }
 };
 
@@ -9981,6 +10039,7 @@ function HoverTableRowDeleteIcon(_ref) {
 }
 
 var WidgetMap = {
+  TRADE_ID_INPUT: 'tradeId',
   INPUT: 'input',
   TEXTAREA: 'textarea',
   PICTURE: 'picture',
@@ -10007,8 +10066,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    manual = props.manual,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = useRef(null);
   var isRequest = useRef(false);
   var _useState = useState(false),
@@ -10083,7 +10142,6 @@ var SubForm = function SubForm(props) {
           return deleteHandle(record.uuid);
         }
       });
-      // return <div style={{ width: 25 }}>{index + 1}</div>;
     }
   }].concat(_toConsumableArray(newTableHeader.map(function (t) {
     return {
@@ -10096,27 +10154,41 @@ var SubForm = function SubForm(props) {
       ellipsis: true,
       width: t.width,
       render: function render(val, record, index) {
-        return EditRenderMap[t.workOrderComponentType] ? EditRenderMap[t.workOrderComponentType]({
-          val: val,
-          record: record,
-          index: index,
-          t: t,
-          updateHandle: updateHandle,
-          disabled: disabled,
-          componentDto: componentDtoList.find(function (item) {
-            return item.uniqueKey === t.key;
-          }),
-          platform: platform
-        }) : /*#__PURE__*/React.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);
-          }
-        });
+        if (EditRenderMap[t.workOrderComponentType]) {
+          return EditRenderMap[t.workOrderComponentType]({
+            val: val,
+            record: record,
+            index: index,
+            t: t,
+            updateHandle: updateHandle,
+            disabled: disabled,
+            componentDto: componentDtoList.find(function (item) {
+              return item.uniqueKey === t.key;
+            }),
+            platform: platform
+          });
+        } else if (EditSplitRenderMap[t.key]) {
+          return EditSplitRenderMap[t.key]({
+            val: val,
+            index: index,
+            t: t,
+            updateHandle: updateHandle,
+            disabled: disabled
+          });
+        } else {
+          return EditRenderMap['DEFAULT']({
+            val: val,
+            record: record,
+            index: index,
+            t: t,
+            updateHandle: updateHandle,
+            disabled: disabled,
+            componentDto: componentDtoList.find(function (item) {
+              return item.uniqueKey === t.key;
+            }),
+            platform: platform
+          });
+        }
       }
     };
   })), [disabled ? {} : {
@@ -10166,6 +10238,10 @@ var SubForm = function SubForm(props) {
         item.render = function (val) {
           return renderMap[t.workOrderComponentType](val, platform);
         };
+      } else if (renderSplitMap[t.key]) {
+        item.render = function (val) {
+          return renderSplitMap[t.key](val);
+        };
       }
       return item;
     })));
@@ -10180,7 +10256,11 @@ var SubForm = function SubForm(props) {
       if (['PICTURE', 'FILE', 'BASIC_MULT_SELECT', 'CHECKBOX'].includes(next.workOrderComponentType)) {
         item.defaultValue = [];
       }
-      prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
+      if (!['LOGISTICS_TRAJECTORY', 'RETURN_LOGISTICS_SELECT'].includes(next.workOrderComponentType)) {
+        prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
+      } else {
+        prv["".concat(next.key)] = item;
+      }
       return prv;
     }, {});
   }, [newTableHeader]);
@@ -10197,7 +10277,7 @@ var SubForm = function SubForm(props) {
     }).map(function (item) {
       return {
         label: item.name,
-        value: "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType])
+        value: WidgetMap[item.workOrderComponentType] ? "".concat(item.key, "_").concat(WidgetMap[item.workOrderComponentType]) : item.key
       };
     });
     setSelectKey(options === null || options === void 0 ? void 0 : (_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.value);
@@ -10239,6 +10319,7 @@ var SubForm = function SubForm(props) {
         _ref2$componentList,
         componentList,
         params,
+        queryComponents,
         res,
         data,
         success,
@@ -10271,15 +10352,25 @@ var SubForm = function SubForm(props) {
               }]
             };
             if (selectKey && inputValue) {
-              params.queryComponents = [{
+              queryComponents = [{
                 key: 'flowStatus',
                 symbol: 'in',
                 value: flowStatus
-              }, {
-                key: selectKey,
-                symbol: 'in',
-                value: [inputValue]
               }];
+              if (['0qFEv9GEyd_returnLogisticsCode', 'jbCFrJV4m7_trajectoryCode'].includes(selectKey)) {
+                queryComponents.push({
+                  key: selectKey,
+                  symbol: 'like',
+                  value: inputValue
+                });
+              } else {
+                queryComponents.push({
+                  key: selectKey,
+                  symbol: 'in',
+                  value: [inputValue]
+                });
+              }
+              params.queryComponents = queryComponents;
             }
             _context.next = 7;
             return extendRequest('/qy/view/workOrderList', {
@@ -10475,7 +10566,21 @@ var SubForm = function SubForm(props) {
     placement: "bottom",
     visible: open,
     onVisibleChange: handleOpenChange
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React.createElement(ApaasLogistics, {
+    value: undefined,
+    onChange: function onChange(val) {
+      onChangeInput(val);
+    },
+    placeholder: "\u8BF7\u9009\u62E9\u7269\u6D41\u516C\u53F8",
+    showSearch: true,
+    allowClear: true,
+    style: {
+      width: '180px'
+    },
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  }) : /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
     allowClear: true,
     onChange: function onChange(e) {
@@ -13451,7 +13556,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     if (disabled) {
       return;
     }
-    if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
+    if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
       return;
@@ -13587,7 +13692,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -13843,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 () {
@@ -14097,7 +14202,7 @@ var renderTextEllipsis = function renderTextEllipsis(value) {
 var css_248z$b = ".GoodModalColumns .ellipsis-text-3 {\n  display: -webkit-box;\n  overflow: hidden;\n  white-space: normal !important;\n  text-overflow: ellipsis;\n  word-break: break-all;\n  overflow-wrap: anywhere;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 3;\n  line-clamp: 3;\n}\n";
 styleInject(css_248z$b);
 
-var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 33.33% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
+var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 50% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .optional-input-select {\n    width: 70px !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
 styleInject(css_248z$c);
 
 var _excluded$d = ["shopId"];
@@ -15213,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,
@@ -15220,7 +15542,8 @@ var getColumnsMap = function getColumnsMap() {
     wdt: wdtColumns,
     bse3: bse3Columns,
     km: kmColumns,
-    jy: jyColumns
+    jy: jyColumns,
+    jky: jkyColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -15318,6 +15641,64 @@ var useGetColumns = (function (type) {
   return [columns, showColumnsDataIndexList, loading];
 });
 
+var compareSymbolList = [{
+  label: '模糊',
+  value: 'like'
+}, {
+  label: '精准',
+  value: 'eq'
+}];
+var OptionalInput = function OptionalInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _props$placeholder = props.placeholder,
+    placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
+    onPressEnter = props.onPressEnter,
+    onBlur = props.onBlur,
+    formItemProps = props.formItemProps;
+  var handleSelectChange = function handleSelectChange(compareSymbol) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: compareSymbol || 'like',
+        inputValue: value === null || value === void 0 ? void 0 : value.inputValue
+      });
+    }
+  };
+  var handleInputChange = function handleInputChange(e) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+        inputValue: e.target.value
+      });
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(Select, {
+    className: "optional-input-select",
+    style: {
+      width: '70px'
+    },
+    options: compareSymbolList,
+    onChange: handleSelectChange,
+    value: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+    onBlur: onBlur
+  }), /*#__PURE__*/React.createElement(Input, _objectSpread2({
+    style: {
+      width: '150px'
+    },
+    allowClear: true,
+    placeholder: placeholder,
+    onChange: handleInputChange,
+    onPressEnter: onPressEnter,
+    onBlur: onBlur,
+    value: value === null || value === void 0 ? void 0 : value.inputValue
+  }, formItemProps)));
+};
+
 function SearchForm(_ref) {
   var searchFormData = _ref.searchFormData,
     form = _ref.form,
@@ -15369,7 +15750,16 @@ function SearchForm(_ref) {
       style: {
         marginBottom: '12px'
       }
-    }, type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
+    }, type === 'optionalInput' ? /*#__PURE__*/React.createElement(OptionalInput, {
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      },
+      placeholder: label,
+      formItemProps: formItemProps
+    }) : type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
       placeholder: label,
       showSearch: true,
       allowClear: true,
@@ -15410,24 +15800,42 @@ function SearchForm(_ref) {
   }, "\u91CD\u7F6E")));
 }
 
+var transformFormData = function transformFormData(formData) {
+  var conditionList = [];
+  for (var key in formData) {
+    if (formData[key]) {
+      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
+      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
+      // 如果 value 是字符串且包含中英文逗号或空格，则拆分成数组
+      if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
+        var _value, _value$replace, _value$replace$split;
+        value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,， ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
+          return v;
+        });
+      }
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
+      conditionList.push({
+        leftValue: key,
+        compareSymbol: compareSymbol,
+        rightValue: value
+      });
+    }
+  }
+  return conditionList;
+};
+
 var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
+      platform: 'WDT_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15521,13 +15929,15 @@ var GoodList = function GoodList(props, ref) {
   }, {
     label: 'SKU编码',
     name: 'skuCode',
-    dataIndex: 'specNo'
+    dataIndex: 'specNo',
+    type: 'optionalInput'
   }, {
     label: '商品名称',
     name: 'goodName'
   }, {
     label: '商品编码',
-    name: 'goodNo'
+    name: 'goodNo',
+    type: 'optionalInput'
   }, {
     label: '品牌',
     name: 'brandIds',
@@ -15717,13 +16127,15 @@ var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
 var getTableData$1 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
+      platform: 'JST_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15744,10 +16156,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -15968,19 +16382,15 @@ var JstGoodsModal = /*#__PURE__*/forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
+      platform: 'BS_E3_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16000,18 +16410,21 @@ var getTableData$2 = function getTableData(_ref, formData) {
 };
 var searchFormData$1 = [{
   label: '商品货号',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: 'SKU',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU ID',
   name: 'skuId',
-  dataIndex: 'specId'
+  dataIndex: 'specId',
+  type: 'optionalInput'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -16213,13 +16626,15 @@ var rowCheckKey = 'id';
 var getTableData$3 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'KM_ERP'
-    }, formData)
+      platform: 'KM_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16240,7 +16655,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16248,7 +16664,8 @@ var searchFormData$2 = [{
 }, {
   label: 'SKU编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -16456,20 +16873,15 @@ var KmGoodsModal = /*#__PURE__*/forwardRef(ErpGoodsModal);
 var getTableData$4 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'GY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16495,13 +16907,15 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$4 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18121,13 +18535,15 @@ var GyGoodsModal$2 = /*#__PURE__*/forwardRef(GyGoodsModal$1);
 var getTableData$5 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18150,13 +18566,15 @@ var searchFormData$4 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18361,136 +18779,379 @@ 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;
       }
-    }, {
-      dataIndex: 'goodsSn',
-      title: "\u8D27\u53F7",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u53F7ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorName',
-      title: "\u989C\u8272\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'colorCode',
-      title: "\u989C\u8272\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeName',
-      title: "\u5C3A\u7801\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sizeCode',
-      title: "\u5C3A\u7801\u4EE3\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'brandName',
-      title: "\u54C1\u724C\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsNumber',
-      title: "\u5546\u54C1\u6570\u91CF",
-      width: 150
-    }, {
-      dataIndex: 'goodsPrice',
-      title: "\u5546\u54C1\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'shopPrice',
-      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'isGift',
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
+    };
+  });
+  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;
+        }));
       }
-    }],
-    //百胜E3商品信息
-    BS_E3_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'picPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 30,
-          src: val
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(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',
+      title: "\u8D27\u53F7",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsId',
+      title: "\u8D27\u53F7ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorName',
+      title: "\u989C\u8272\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'colorCode',
+      title: "\u989C\u8272\u4EE3\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeName',
+      title: "\u5C3A\u7801\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sizeCode',
+      title: "\u5C3A\u7801\u4EE3\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsNumber',
+      title: "\u5546\u54C1\u6570\u91CF",
+      width: 150
+    }, {
+      dataIndex: 'goodsPrice',
+      title: "\u5546\u54C1\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'shopPrice',
+      title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
+      }
+    }],
+    //百胜E3商品信息
+    BS_E3_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'picPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: val
         });
       }
     }, {
@@ -18946,7 +19607,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19080,7 +19742,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19219,7 +19882,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19396,7 +20060,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -20348,7 +21013,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20457,7 +21122,268 @@ var getColumns$5 = function getColumns() {
       //   }
       // },
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        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);
+      }
+    }, {
+      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: '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: 'skuId',
+      title: '商品编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
+          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
+          var res = typeof v === 'number' ? v < 0 : true;
+          if (res) {
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
+        }
+      },
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.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: '数量',
+      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: 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);
+      }
+    }, {
+      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: '备注',
+      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: '商品名称',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: '商品编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: '款式编码',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: '商品图片',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(ApaasImage, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'propertiesValue',
+      title: '规格值',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'saleBasePrice',
+      title: '原价',
+      render: function render(price) {
+        return price || price === 0 ? Number(price).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'salePrice',
+      title: '单价',
+      width: 120,
+      render: function render(val, record, index) {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20472,24 +21398,9 @@ var getColumns$5 = function getColumns() {
     }, {
       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, {
+        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
             width: 70
           },
@@ -20501,14 +21412,18 @@ var getColumns$5 = function getColumns() {
           }
         }) : /*#__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: '是否赠品',
-      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');
@@ -20525,11 +21440,8 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'remark',
       title: '备注',
-      width: 150,
-      ellipsis: true,
-      align: 'center',
       render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Input, {
+        return !disabled ? /*#__PURE__*/React.createElement(Input, {
           style: {
             width: 70
           },
@@ -20539,203 +21451,385 @@ var getColumns$5 = function getColumns() {
           }
         }) : renderTextEllipsis(val);
       }
-    }],
-    JST_RETURN_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
+    }].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: 'skuId',
-      title: '商品编码',
+      dataIndex: 'asiId',
+      title: "\u552E\u540E\u5B50\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'outerOiId',
+      title: "\u5B50\u8BA2\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
       render: renderTextEllipsis
     }, {
       dataIndex: 'pic',
-      title: '商品图片',
+      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: "\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: '规格值',
+      title: "\u89C4\u683C\u5C5E\u6027\u503C",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'qty',
+      title: "\u7533\u8BF7\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'rQty',
+      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'defectiveQty',
+      title: "\u6B21\u54C1\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'amount',
+      title: "\u7533\u8BF7\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopAmount',
+      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combineSkuId',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopSkuId',
+      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: "\u6B3E\u5F0F\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'type',
+      title: "\u552E\u540E\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuType',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      },
+      headerMapping: {
+        transformValue: function transformValue(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        },
+        renderExport: function renderExport(val) {
+          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+        }
+      }
+    }, {
+      dataIndex: 'receiveDate',
+      title: "\u5165\u4ED3\u65F6\u95F4",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u660E\u7EC6\u5907\u6CE8",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$6 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    KM_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
+      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",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: imgUrl
+        });
       }
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
+      width: 100,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.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, 'num');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'qty',
-      title: '数量',
-      width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        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, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
       }
     }, {
-      dataIndex: 'batchId',
-      title: '批次号',
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.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: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      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: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'outerOiId',
-      title: '子订单号',
-      width: 240,
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
-    }].map(fillAttrs),
-    JST_EXCHANGE_GOODS: [{
-      dataIndex: 'name',
-      title: '商品名称',
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: '商品编码',
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: '款式编码',
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: '商品图片',
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(ApaasImage, {
-          width: 30,
-          src: val
-        });
-      }
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'propertiesValue',
-      title: '规格值',
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'saleBasePrice',
-      title: '原价',
-      render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
-      }
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      width: 170,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'salePrice',
-      title: '单价',
-      width: 120,
+      dataIndex: 'outerSkuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u7801",
+      width: 170,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'realNum',
+      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      width: 100,
+      validator: function validator(_rule, value) {
+        var title = '';
+        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
+          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var res = typeof realNum === 'number' ? realNum < 1 : true;
+          if (res) {
+            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.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
           },
@@ -20743,281 +21837,194 @@ var getColumns$5 = function getColumns() {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'saleAmount',
-      title: '总金额',
-      render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
-      }
-    }, {
-      dataIndex: 'isGift',
-      title: '是否赠品',
-      width: 100,
-      render: function render(val, record, index) {
-        return !disabled ? /*#__PURE__*/React.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,
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'asiId',
-      title: "\u552E\u540E\u5B50\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierName',
+      title: "\u4F9B\u5E94\u5546\u540D\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'outerOiId',
-      title: "\u5B50\u8BA2\u5355\u53F7",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'supplierCode',
+      title: "\u4F9B\u5E94\u5546\u7F16\u7801",
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'pic',
-      title: "\u56FE\u7247",
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
       width: 100,
-      align: 'center',
       render: function render(val) {
-        return /*#__PURE__*/React.createElement(ApaasImage, {
+        var imgUrl = (val === null || val === void 0 ? void 0 : val.startsWith('http')) ? val : "https://erp.superboss.cc".concat(val);
+        return /*#__PURE__*/React.createElement(Image, {
           width: 30,
-          src: val
+          src: imgUrl
         });
-      },
-      headerComponentType: 'pic'
-    }, {
-      dataIndex: 'name',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 250,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'propertiesValue',
-      title: "\u89C4\u683C\u5C5E\u6027\u503C",
-      width: 200,
-      align: 'center',
-      ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'qty',
-      title: "\u7533\u8BF7\u6570\u91CF",
-      width: 150,
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var isNumberOrNumberString$2 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$4(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'rQty',
-      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'defectiveQty',
-      title: "\u6B21\u54C1\u6570\u91CF",
-      width: 150,
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'amount',
-      title: "\u7533\u8BF7\u91D1\u989D",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopAmount',
-      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
-      width: 150,
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'price',
-      title: "\u5355\u4EF7",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'combineSkuId',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      width: 250,
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shopSkuId',
-      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
-      width: 200,
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'iId',
-      title: "\u6B3E\u5F0F\u7F16\u7801",
-      width: 200,
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'type',
-      title: "\u552E\u540E\u7C7B\u578B",
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150,
-      align: 'center',
-      ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuType',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      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: '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,
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'remark',
-      title: "\u660E\u7EC6\u5907\u6CE8",
-      width: 200,
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
-    }]
-  };
-};
-
-function toNum$3(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
-var getColumns$6 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    KM_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
       width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'title',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
-      width: 170,
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
-      width: 150,
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
       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',
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
@@ -21029,13 +22036,16 @@ var getColumns$6 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
@@ -21046,83 +22056,198 @@ var getColumns$6 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$2(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'settlementPrice',
+      title: "\u7ED3\u7B97\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'divideOrderFee',
+      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'bfit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.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: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'gift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.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
       });
     }),
-    KM_REISSUE_GOODS: [{
-      dataIndex: 'skuPropertiesName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      width: 250,
+    // 巨益补发商品信息
+    JY_REISSUE_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysTitle',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'shortTitle',
-      title: "\u5546\u54C1\u7B80\u79F0",
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'title',
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'sysOuterId',
-      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'itemSysId',
-      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuSysId',
-      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuId',
-      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
-      width: 170,
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'realNum',
-      title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value) {
-        var title = '';
-        if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
-          var res = typeof realNum === 'number' ? realNum < 1 : true;
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
-            title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
           }
           return res;
         })) {
-          return Promise.reject("".concat(title, "\u5B9E\u9645\u8865\u53D1\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
         }
       },
       render: function render(val, record, index) {
@@ -21134,81 +22259,158 @@ 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: 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: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
+      width: 150
+    }, {
+      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(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
           },
           value: val,
-          min: 1,
-          precision: 0,
-          onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
-          }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'bfit');
+          },
+          options: [{
+            label: '是',
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      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(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, '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
+      });
+    })
+  };
+};
+
+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: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
-      width: 150,
-      render: renderTextEllipsis
+      dataIndex: 'subOrderId',
+      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
     }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 30,
-          src: val
-        });
-      }
+      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$2 = function isNumberOrNumberString(value) {
+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;
   }
@@ -21217,44 +22419,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,
@@ -21266,82 +22468,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",
@@ -21357,11 +22495,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",
@@ -21377,29 +22520,66 @@ 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",
-      width: 150
-    }, {
-      dataIndex: 'divideOrderFee',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: 'bfit',
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'discountTotal',
+      title: "\u62B5\u6263\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'shareFavourableFee',
+      title: "\u5206\u644A\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'shareFavourableAfterFee',
+      title: "\u5206\u644A\u540E\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'customerPrice',
+      title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
+      width: 150
+    }, {
+      dataIndex: 'customerTotal',
+      title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'divideSellTotal',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150
+    }, {
+      dataIndex: 'isGift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'isFit',
       title: "\u662F\u5426\u7EC4\u5408\u88C5",
       width: 150,
       render: function render(val, record, index) {
@@ -21412,30 +22592,20 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'bfit');
+            updateHandle(value, index, 'isFit');
           },
           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: 'isPresell',
+      title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
@@ -21447,7 +22617,7 @@ var getColumns$7 = function getColumns(_ref) {
           },
           value: val,
           onChange: function onChange(value) {
-            updateHandle(value, index, 'gift');
+            updateHandle(value, index, 'isPresell');
           },
           options: [{
             label: '是',
@@ -21458,115 +22628,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",
+      dataIndex: 'goodsTags',
+      title: "\u8D27\u54C1\u6807\u7B7E",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuName',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'goodsMemo',
+      title: "\u8D27\u54C1\u5907\u6CE8",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'skuCode',
-      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      dataIndex: 'tradeGoodsNo',
+      title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
       align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
+      dataIndex: 'tradeGoodsName',
+      title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
       ellipsis: true,
-      width: 150,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
-      width: 150,
+      dataIndex: 'tradeGoodsSpec',
+      title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
+      ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      dataIndex: 'sourceSubtradeNo',
+      title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platGoodsId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'subTradeId',
+      title: "\u5546\u54C1\u660E\u7EC6ID",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'batchNo',
+      title: "\u6279\u6B21\u53F7",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sendCount',
+      title: "\u6279\u6B21\u6570\u91CF",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'productDate',
+      title: "\u751F\u4EA7\u65E5\u671F",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'expireDate',
+      title: "\u5230\u671F\u65E5\u671F",
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    // 巨益补发商品信息
+    JKY_REISSUE_GOODS: [{
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
+      align: 'center',
+      ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductName',
-      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductOutCode',
-      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      dataIndex: 'goodsId',
+      title: "\u8D27\u54C1ID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallProductId',
-      title: "\u5E73\u53F0\u5546\u54C1ID",
+      dataIndex: 'barcode',
+      title: "\u8D27\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'mallSkuId',
-      title: "\u5E73\u53F0\u89C4\u683CID",
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
       align: 'center',
       ellipsis: true,
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuImgUrl',
+      title: "\u89C4\u683C\u56FE\u7247",
+      width: 150,
+      render: function render(val) {
+        return /*#__PURE__*/React.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) {
@@ -21580,7 +22804,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);
@@ -21600,119 +22824,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, {
           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, {
           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: '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: 'brandName',
+      title: "\u54C1\u724C",
+      width: 150,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'returnBillNo',
-      title: "[SKX]TH\u9000\u6362\u8D27\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
+      });
+    })
   };
 };
 
-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,
@@ -21829,7 +23021,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
@@ -21867,8 +23059,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
@@ -22015,6 +23212,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) {
@@ -22301,6 +23501,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 = {
@@ -22313,6 +23515,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',
@@ -22348,23 +23552,81 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
-  var openModal = function openModal() {
-    if (validSystemOrder) {
-      message.warning('请选择补发系统单');
-      return;
-    }
-    if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
-      getDataSourceAsync().then(function () {
-        setTradeGoodsVisible(true);
-      });
-    } else {
-      setTradeGoodsVisible(true);
-    }
-    // 补发直接传入的是systemNo
-    if (isShowSelect && isReissueType) {
-      setSelectSystemNo(selectedSystemOrders || []);
-    }
-  };
+  var getKmSupplier = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dataSource) {
+      var _dataSource$filter;
+      var systemItemIds, supplierMap;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
+              return item === null || item === void 0 ? void 0 : item.sysItemId;
+            }).map(function (item) {
+              return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+            });
+            _context.next = 3;
+            return servers.KM.getSupplierSingleton(systemItemIds);
+          case 3:
+            supplierMap = _context.sent;
+            dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
+              return item === null || item === void 0 ? void 0 : item.sysItemId;
+            })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
+              var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+              var supplierInfo = supplierMap.get(key);
+              item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
+              item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getKmSupplier(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var openModal = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!validSystemOrder) {
+              _context2.next = 3;
+              break;
+            }
+            message.warning('请选择补发系统单');
+            return _context2.abrupt("return");
+          case 3:
+            if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.next = 6;
+            return getDataSourceAsync();
+          case 6:
+            if (!['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
+              _context2.next = 9;
+              break;
+            }
+            _context2.next = 9;
+            return getKmSupplier(dataSource);
+          case 9:
+            setTradeGoodsVisible(true);
+            // 补发直接传入的是systemNo
+            if (isShowSelect && isReissueType) {
+              setSelectSystemNo(selectedSystemOrders || []);
+            }
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function openModal() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -22433,7 +23695,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }, isShowSelect && /*#__PURE__*/React.createElement(Row, {
     style: {
-      marginBottom: '20px'
+      marginBottom: '12px'
     }
   }, /*#__PURE__*/React.createElement(Col, {
     span: 12
@@ -22487,6 +23749,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) {
@@ -22544,7 +23809,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);
@@ -22636,6 +23901,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':
           {
@@ -22683,9 +23950,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var getShowFilterColumns = useCallback(function (_ref2) {
-    var showHeader = _ref2.showHeader,
-      initBaseInfoColumns = _ref2.initBaseInfoColumns;
+  var getShowFilterColumns = useCallback(function (_ref4) {
+    var showHeader = _ref4.showHeader,
+      initBaseInfoColumns = _ref4.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -23840,7 +25107,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) {
@@ -23848,6 +25115,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: {
@@ -23871,16 +25182,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
@@ -23897,6 +25208,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 = {
@@ -23908,6 +25220,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) {
@@ -23922,7 +25235,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') {
@@ -23941,6 +25253,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]);
@@ -24205,6 +25519,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,
@@ -24629,16 +25968,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', {
@@ -24654,16 +25993,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,
@@ -25096,6 +26435,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) {
@@ -25396,6 +26738,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',
@@ -25427,7 +26795,7 @@ var componentMap$2 = {
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
+  var _withInfo$current3, _withInfo$current4, _componentMap$compTyp6;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -25443,6 +26811,10 @@ var CommonGoods = function CommonGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    originDataSource = _useState4[0],
+    setOriginDataSource = _useState4[1];
   var withInfo = useRef(null);
   var valueRef = useRef(null);
   var tokens = useRef([]);
@@ -25454,10 +26826,93 @@ var CommonGoods = function CommonGoods(props) {
       compType.indexOf('WDT') > -1 && getWdtOrderList(value === null || value === void 0 ? void 0 : value.orderNo);
     }
   }, [value]);
+  var sysItemIdMap = useMemo(function () {
+    var map = {};
+    if (compType.indexOf('KM') > -1) {
+      var _value$kmGoods, _value$kmGoods$filter;
+      value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
+        return item === null || item === void 0 ? void 0 : item.sysItemId;
+      })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
+        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+        map[key] = item;
+      });
+    }
+    return map;
+  }, [value === null || value === void 0 ? void 0 : value.kmGoods]);
+  // 用于跟踪已经处理过的 sysItemId，避免重复处理
+  var processedSysItemIdsRef = useRef(new Set());
+  useEffect(function () {
+    var fetchSupplier = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(sysItemIds) {
+        var _currentValue$kmGoods;
+        var needFetchIds, supplierMap, hasChange, currentValue, kmGoods;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (sysItemIds.length) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
+              // 过滤出还没有供应商信息的 sysItemId
+              needFetchIds = sysItemIds.filter(function (id) {
+                var item = sysItemIdMap[id];
+                return item && (!item.supplierCode || !item.supplierName);
+              });
+              if (needFetchIds.length) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return");
+            case 5:
+              _context.next = 7;
+              return servers.KM.getSupplierSingleton(needFetchIds);
+            case 7:
+              supplierMap = _context.sent;
+              // 检查是否有实际变化，避免不必要的更新
+              hasChange = false;
+              currentValue = valueRef.current;
+              kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
+                var supplierInfo = supplierMap.get(item.sysItemId);
+                var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
+                var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
+                // 如果供应商信息有变化，标记需要更新
+                if (newSupplierCode && item.supplierCode !== newSupplierCode || newSupplierName && item.supplierName !== newSupplierName) {
+                  hasChange = true;
+                  // 标记已处理
+                  processedSysItemIdsRef.current.add(item.sysItemId);
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    supplierCode: newSupplierCode || item.supplierCode,
+                    supplierName: newSupplierName || item.supplierName
+                  });
+                }
+                return item;
+              }); // 只在有实际变化时才更新
+              if (hasChange && kmGoods) {
+                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
+                  kmGoods: kmGoods
+                }));
+              }
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function fetchSupplier(_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    var sysItemIds = Object.keys(sysItemIdMap);
+    if (sysItemIds === null || sysItemIds === void 0 ? void 0 : sysItemIds.length) {
+      fetchSupplier(sysItemIds);
+    }
+  }, [sysItemIdMap]);
   var getWdtOrderList = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             wdtUtils.getWdtOrderListSingleton(orderNo).then(function (data) {
               var orders = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (trade) {
@@ -25470,12 +26925,12 @@ var CommonGoods = function CommonGoods(props) {
             });
           case 1:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function getWdtOrderList(_x) {
-      return _ref.apply(this, arguments);
+    return function getWdtOrderList(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -25581,8 +27036,8 @@ var CommonGoods = function CommonGoods(props) {
       mode: isStrict
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref2) {
-    var mode = _ref2.mode;
+  var getGoodDetails = function getGoodDetails(_ref3) {
+    var mode = _ref3.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
     if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
@@ -25595,44 +27050,115 @@ var CommonGoods = function CommonGoods(props) {
     }) : goodDetails;
   };
   // 找到该订单号下所有商品
-  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails(_ref3) {
-    var mode = _ref3.mode;
-    var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
-    console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
-    if (!updateHandle) return [];
-    var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
-      orderBackGoodsLevel: props.orderBackGoodsLevel
-    });
-    var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
-      var _componentMap$compTyp2;
-      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
-    }) : goodDetails;
-  };
-  var selectedGoodsChange = useCallback(function (skuList) {
-    var _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
-    var newValue = _objectSpread2({}, value);
-    var isStrict = value.isStrict;
-    // 原订单商品
-    var originTradeGoodList = getAllTradeGoodsDetails({
-      mode: isStrict
-    }) || [];
-    // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
-    newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      return skuList.includes(item.uuid);
-    });
-    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.key)], value === null || value === void 0 ? void 0 : value.isStrict]);
+  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
+      var mode, updateHandle, goodDetails, orderNo;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            mode = _ref4.mode;
+            updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
+            if (updateHandle) {
+              _context3.next = 4;
+              break;
+            }
+            return _context3.abrupt("return", []);
+          case 4:
+            goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
+              orderBackGoodsLevel: props.orderBackGoodsLevel
+            });
+            orderNo = value === null || value === void 0 ? void 0 : value.orderNo; // if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(compType)) {
+            //   await getKmSupplier(goodDetails);
+            // }
+            return _context3.abrupt("return", mode ? goodDetails.filter(function (goodItem) {
+              var _componentMap$compTyp2;
+              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+            }) : goodDetails);
+          case 7:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function getAllTradeGoodsDetails(_x3) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  // 异步获取 originDataSource
+  useEffect(function () {
+    var fetchOriginDataSource = /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var data;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return getAllTradeGoodsDetails({
+                mode: value === null || value === void 0 ? void 0 : value.isStrict
+              });
+            case 2:
+              data = _context4.sent;
+              setOriginDataSource(Array.isArray(data) ? data : []);
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function fetchOriginDataSource() {
+        return _ref6.apply(this, arguments);
+      };
+    }();
+    fetchOriginDataSource();
+  }, [value === null || value === void 0 ? void 0 : value.allOrders, value === null || value === void 0 ? void 0 : value.isStrict, value === null || value === void 0 ? void 0 : value.orderNo, compType]);
+  var selectedGoodsChange = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(skuList) {
+      var _valueRef$current9, _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+      var newValue, isStrict, originTradeGoodList, currentSelectGoodList;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            newValue = _objectSpread2({}, valueRef.current);
+            isStrict = valueRef.current.isStrict; // 原订单商品
+            _context5.next = 4;
+            return getAllTradeGoodsDetails({
+              mode: isStrict
+            });
+          case 4:
+            _context5.t0 = _context5.sent;
+            if (_context5.t0) {
+              _context5.next = 7;
+              break;
+            }
+            _context5.t0 = [];
+          case 7:
+            originTradeGoodList = _context5.t0;
+            // 当前选中的所有商品【包含了原订单+商品库】
+            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
+            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+              return skuList.includes(item.uuid);
+            });
+            onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+          case 11:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function selectedGoodsChange(_x4) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _componentMap$compTyp6;
-    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
+    var _componentMap$compTyp5;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
       var list = processAllOrders({
         data: data,
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
+      console.log('getDataSourceAsync', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -25660,11 +27186,9 @@ var CommonGoods = function CommonGoods(props) {
     isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
     systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
-    showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
+    showChangeBtn: (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.showChangeBtn,
     tradeGoods: {
-      originDataSource: getAllTradeGoodsDetails({
-        mode: value === null || value === void 0 ? void 0 : value.isStrict
-      }),
+      originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,
       selectedGoodsChange: selectedGoodsChange
     }
@@ -26440,12 +27964,95 @@ var PublicReissue = function PublicReissue(props) {
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref4) {
+  var sysItemIdMap = useMemo(function () {
+    var map = {};
+    if (type === 'KM_REISSUE_GOODS') {
+      var _value$kmReissueGoods, _value$kmReissueGoods2;
+      value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
+        return item === null || item === void 0 ? void 0 : item.sysItemId;
+      })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
+        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+        map[key] = item;
+      });
+    }
+    return map;
+  }, [value === null || value === void 0 ? void 0 : value.kmReissueGoods]);
+  // 用于跟踪已经处理过的 sysItemId，避免重复处理
+  var processedSysItemIdsRef = useRef(new Set());
+  useEffect(function () {
+    var fetchSupplier = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sysItemIds) {
+        var _currentValue$kmReiss;
+        var needFetchIds, supplierMap, hasChange, currentValue, kmReissueGoods;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (sysItemIds.length) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 2:
+              // 过滤出还没有供应商信息的 sysItemId
+              needFetchIds = sysItemIds.filter(function (id) {
+                var item = sysItemIdMap[id];
+                return item && (!item.supplierCode || !item.supplierName);
+              });
+              if (needFetchIds.length) {
+                _context2.next = 5;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 5:
+              _context2.next = 7;
+              return servers.KM.getSupplierSingleton(needFetchIds);
+            case 7:
+              supplierMap = _context2.sent;
+              // 检查是否有实际变化，避免不必要的更新
+              hasChange = false;
+              currentValue = valueRef.current;
+              kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
+                var supplierInfo = supplierMap.get(item.sysItemId);
+                var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
+                var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
+                // 如果供应商信息有变化，标记需要更新
+                if (newSupplierCode && item.supplierCode !== newSupplierCode || newSupplierName && item.supplierName !== newSupplierName) {
+                  hasChange = true;
+                  // 标记已处理
+                  processedSysItemIdsRef.current.add(item.sysItemId);
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    supplierCode: newSupplierCode || item.supplierCode,
+                    supplierName: newSupplierName || item.supplierName
+                  });
+                }
+                return item;
+              }); // 只在有实际变化时才更新
+              if (hasChange && kmReissueGoods) {
+                onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, currentValue), {}, {
+                  kmReissueGoods: kmReissueGoods
+                }));
+              }
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function fetchSupplier(_x2) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    var sysItemIds = Object.keys(sysItemIdMap);
+    if (sysItemIds === null || sysItemIds === void 0 ? void 0 : sysItemIds.length) {
+      fetchSupplier(sysItemIds);
+    }
+  }, [sysItemIdMap]);
+  var getGoodDetails = function getGoodDetails(_ref5) {
     var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
-    var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo,
-      _ref4$isAllOrders = _ref4.isAllOrders,
-      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
+    var mode = _ref5.mode,
+      sysOrderNo = _ref5.sysOrderNo,
+      _ref5$isAllOrders = _ref5.isAllOrders,
+      isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -27357,7 +28964,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27935,7 +29542,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
@@ -28238,7 +29845,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
@@ -28911,7 +30518,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 };
+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 };