@kmkf-fe-packages/basic-components 2.0.79-beta.63 → 2.0.79-beta.66

package/dist/index.esm.js

@@ -1,9 +1,9 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo, useCallback } from 'react';
-import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Tooltip, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton, Empty } from 'antd';
+import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Tooltip, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton, Empty, Tag } from 'antd';
 import { EyeOutlined, DeleteOutlined, CloseOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, 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, request as request$1, ExpressData, 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, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, 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, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, 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, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, 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, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, updateSkxGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, isEmpty, intersection } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -11806,7 +11806,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11817,7 +11817,8 @@ var jstGoods = function jstGoods(props) {
     showField = _props$showField === void 0 ? '' : _props$showField,
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
-    onlyShowFieldSelect = props.onlyShowFieldSelect;
+    onlyShowFieldSelect = props.onlyShowFieldSelect,
+    logisticsCompanyFormType = props.logisticsCompanyFormType;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -11908,13 +11909,20 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, {
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(React.Fragment, null, logisticsCompanyFormType === 'input' ? /*#__PURE__*/React.createElement(Input, {
+    disabled: disabled,
+    placeholder: "\u7269\u6D41\u516C\u53F8",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'logisticsCompany');
+    },
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany
+  }) : /*#__PURE__*/React.createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
       changeInputHandle(val, 'logisticsCompany');
     },
-    value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) ? (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'] : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompanyName'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompany'],
+    value: platformType === 'gy' ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
@@ -11925,34 +11933,34 @@ var jstGoods = function jstGoods(props) {
       maxWidth: '180px'
     },
     platformType: platformType
-  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
+  })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
-    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.logisticsCode
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.logisticsCode
   }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyId');
     },
-    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyId
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.supplyId
   }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyName');
     },
-    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.supplyName
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.supplyName
   })) : null, type === 3 ? /*#__PURE__*/React.createElement(Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendId');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendId
+    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
     style: {
       minWidth: '100px',
@@ -11963,7 +11971,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendSnapshotId) || ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName) || null,
+    value: ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendSnapshotId) || ((_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11973,14 +11981,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
+    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
+    value: (_value$changeIndex13 = value[changeIndex]) === null || _value$changeIndex13 === void 0 ? void 0 : _value$changeIndex13.sendName
   })) : null) : null);
 };
 
@@ -18827,6 +18835,34 @@ var getColumns$7 = function getColumns(_ref) {
 };
 
 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: 200
+    }, {
+      dataIndex: 'subOrderId',
+      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 200
+    }, {
+      dataIndex: 'onBillNo',
+      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
+      width: 200
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -18939,7 +18975,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({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -18972,8 +19008,12 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$8({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$8({
+    default: getColumns$9({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -19434,10 +19474,13 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     fixed: true,
     onChange: handleChangeSelectedKeys
   };
+  var buttonTextMapping = {
+    SKX_GOODS: '选择发货单商品'
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: openModal
-  }, "\u9009\u62E9\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React.createElement(Modal, {
+  }, buttonTextMapping[type] || '选择订单商品'), /*#__PURE__*/React.createElement(Modal, {
     title: "\u8BA2\u5355\u5546\u54C1",
     visible: tradeGoodsVisible,
     footer: null,
@@ -19640,6 +19683,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
+        case 'SKX_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -24534,4 +24578,339 @@ var KmVideo = function KmVideo(_ref) {
   }))));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };
+var singletonMap$8 = new Map();
+var getAllGoods = function getAllGoods(params, setLoading) {
+  var id = params.tid || params.onBillNo || '';
+  if (!singletonMap$8.has(id)) {
+    setLoading && setLoading(true);
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$8.delete(id);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/skxOrderDetail', {
+        method: 'post',
+        data: params
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data, _res$data$orderDetail;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$orderDetail = _res$data.orderDetailInfoList) === null || _res$data$orderDetail === void 0 ? void 0 : _res$data$orderDetail.length) {
+            var orderDetailInfoList = res === null || res === void 0 ? void 0 : res.data.orderDetailInfoList;
+            res.data.trades = orderDetailInfoList[0].subOrderList.map(function (subItem) {
+              return {
+                onBillNo: orderDetailInfoList[0].onBillNo,
+                skuEcode: subItem.skuEcode,
+                subOrderId: subItem.subOrderId
+              };
+            });
+          }
+          resolve(res.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$8.delete(id);
+          }, 1000 * 10);
+        } else {
+          doReject(res);
+        }
+      }).catch(doReject).finally(function () {
+        setLoading && setLoading(false);
+      });
+    });
+    singletonMap$8.set(id, p);
+  }
+  return singletonMap$8.get(id);
+};
+var skxUtils = {
+  getAllGoods: getAllGoods
+};
+
+var typeMap$6 = {
+  SKX_OUTBOUND_NOTICE_NO: {
+    key: 'onBillNo',
+    notDataText: '未获取到出库通知单号',
+    placeholder: '请点击按钮选择或者输入ON出库通知单号',
+    buttonText: '选择ON出库通知单号',
+    columnHeaders: {
+      title: '出库通知单号',
+      subListName: 'subOrderList',
+      leftColumn: {
+        label: '[SKX]发货单明细-skuEcode',
+        value: 'skuEcode'
+      },
+      rightColumn: {
+        label: '[SKX]发货单—子订单号',
+        value: 'subOrderId'
+      }
+    },
+    asyncGetData: function () {
+      var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(tradeId) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", skxUtils.getAllGoods({
+                tid: tradeId
+              }).then(function (data) {
+                var orderDetailInfoList = data.orderDetailInfoList || [];
+                return orderDetailInfoList;
+              }));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function asyncGetData(_x) {
+        return _asyncGetData.apply(this, arguments);
+      }
+      return asyncGetData;
+    }()
+  }
+};
+var IdInputSelect = function IdInputSelect(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _onBlur = props.onBlur,
+    disabled = props.disabled,
+    form = props.form,
+    templateDetail = props.templateDetail,
+    type = props.type;
+  var _useState = useState(value),
+    _useState2 = _slicedToArray(_useState, 2),
+    inputValue = _useState2[0],
+    setInputValue = _useState2[1];
+  // 控制Popover显示状态
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    popoverVisible = _useState4[0],
+    setPopoverVisible = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    spinning = _useState6[0],
+    setSpinning = _useState6[1];
+  var tradeIdRef = useRef('');
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    dataSource = _useState8[0],
+    setDataSource = _useState8[1];
+  //当外部数据源变化时更新内部状态;
+  useEffect(function () {
+    if (popoverVisible) {
+      asyncQueryData();
+    }
+  }, [popoverVisible]);
+  useEffect(function () {
+    setInputValue(value);
+  }, [value]);
+  var asyncQueryData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var tradeId;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            tradeId = form.getFieldValue('m3ap1EvEyd');
+            console.log('asyncQueryData---', {
+              tradeId: tradeId,
+              tradeIdRef: tradeIdRef.current,
+              form: form
+            });
+            if (!(tradeId === tradeIdRef.current)) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 4:
+            if (tradeId) {
+              _context2.next = 7;
+              break;
+            }
+            setDataSource([]);
+            return _context2.abrupt("return");
+          case 7:
+            setSpinning(true);
+            typeMap$6[type].asyncGetData(tradeId).then(function (data) {
+              setDataSource(data);
+              if (data.length > 0) {
+                tradeIdRef.current = tradeId;
+              }
+            }).catch(function () {
+              setDataSource([]);
+            }).finally(function () {
+              setSpinning(false);
+            });
+          case 9:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function asyncQueryData() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  // 渲染Popover内容
+  var RenderPopoverContent = function RenderPopoverContent() {
+    return /*#__PURE__*/React.createElement(Spin, {
+      spinning: spinning
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        minWidth: 500,
+        maxHeight: 400,
+        minHeight: 36,
+        overflow: 'auto'
+      }
+    }, !spinning && (!dataSource || dataSource.length === 0) && /*#__PURE__*/React.createElement("div", {
+      style: {
+        textAlign: 'center',
+        color: '#858585',
+        padding: 10
+      }
+    }, typeMap$6[type].notDataText), dataSource && dataSource.length > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'grid',
+        gridTemplateColumns: '1fr 1fr',
+        gap: '16px',
+        padding: '8px 16px',
+        fontWeight: 500,
+        color: '#333'
+      }
+    }, /*#__PURE__*/React.createElement("div", null, typeMap$6[type].columnHeaders.leftColumn.label), /*#__PURE__*/React.createElement("div", null, typeMap$6[type].columnHeaders.rightColumn.label)), dataSource.map(function (group) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: group[typeMap$6[type].key]
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          padding: '10px 16px',
+          backgroundColor: '#f5f5f4'
+        }
+      }, /*#__PURE__*/React.createElement(Checkbox, {
+        checked: value === group[typeMap$6[type].key],
+        onChange: function onChange() {
+          if (value !== group[typeMap$6[type].key]) {
+            handleChange(group[typeMap$6[type].key]);
+            skxSystemOrderBackValues({
+              templateList: templateDetail,
+              value: {
+                allOrders: [group]
+              },
+              form: form
+            });
+          }
+        },
+        style: {
+          marginRight: 12
+        }
+      }), /*#__PURE__*/React.createElement("span", null, typeMap$6[type].columnHeaders.title, ":", group[typeMap$6[type].key])), (group[typeMap$6[type].columnHeaders.subListName] || []).map(function (item, itemIndex) {
+        return /*#__PURE__*/React.createElement("div", {
+          key: "".concat(group[typeMap$6[type].key], "-").concat(itemIndex),
+          style: {
+            display: 'grid',
+            gridTemplateColumns: '1fr 1fr',
+            gap: '16px',
+            padding: '10px 16px 10px 44px'
+          }
+        }, /*#__PURE__*/React.createElement("div", null, item[typeMap$6[type].columnHeaders.leftColumn.value]), /*#__PURE__*/React.createElement("div", null, item[typeMap$6[type].columnHeaders.rightColumn.value]));
+      }));
+    }))));
+  };
+  var handleChange = function handleChange(val) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    // 关闭浮窗
+    setPopoverVisible(false);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Input, {
+    placeholder: typeMap$6[type].placeholder,
+    disabled: disabled,
+    value: inputValue,
+    onBlur: function onBlur(e) {
+      handleChange(e.target.value);
+      _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e);
+    },
+    onChange: function onChange(e) {
+      setInputValue(e.target.value);
+    }
+  }), !disabled && /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement(RenderPopoverContent, null),
+    trigger: "click",
+    visible: popoverVisible,
+    onVisibleChange: setPopoverVisible
+  }, /*#__PURE__*/React.createElement(Tag, {
+    color: "processing",
+    style: {
+      padding: '3px 8px',
+      marginTop: 8,
+      cursor: 'pointer'
+    }
+  }, typeMap$6[type].buttonText)));
+};
+
+var typeMap$7 = {
+  SKX_GOODS: {
+    key: 'skxGoods',
+    uniqueKey: 'subOrderId',
+    requestParams: {
+      key: 'onBillNo',
+      sourceUniqueKey: '78CADF2951',
+      request: skxUtils.getAllGoods
+    },
+    updateHandle: updateSkxGoodsHandle
+  }
+};
+var SkxGoods = function SkxGoods(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    form = props.form,
+    type = props.type;
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, typeMap$7[type].key, list)));
+  };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
+    var goodDetails = typeMap$7[type].updateHandle((value === null || value === void 0 ? void 0 : value.allGoods) || []);
+    return goodDetails;
+  };
+  var selectedGoodsChange = useCallback(function (skuList) {
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails() || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value[typeMap$7[type].key]) || [];
+    newValue[typeMap$7[type].key] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), typeMap$7[type].uniqueKey)) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item[typeMap$7[type].uniqueKey]);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value[typeMap$7[type].key]]);
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取on单号下所有商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    var businessNo = form.getFieldValue(typeMap$7[type].requestParams.sourceUniqueKey);
+    if (!businessNo) {
+      return Promise.resolve([]);
+    }
+    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+      }));
+    });
+  };
+  return /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
+    key: typeMap$7[type].key
+  }, props), {}, {
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value[typeMap$7[type].key],
+    onChange: function onChange(val) {
+      return changeHandle(val);
+    },
+    showModeBtn: false,
+    tradeGoods: {
+      uniqueKey: typeMap$7[type].uniqueKey,
+      originDataSource: getAllTradeGoodsDetails(),
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    }
+  }));
+};
+
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 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, skxUtils };

package/dist/index.js

@@ -11819,7 +11819,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11, _value$changeIndex12, _value$changeIndex13;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11830,7 +11830,8 @@ var jstGoods = function jstGoods(props) {
     showField = _props$showField === void 0 ? '' : _props$showField,
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
-    onlyShowFieldSelect = props.onlyShowFieldSelect;
+    onlyShowFieldSelect = props.onlyShowFieldSelect,
+    logisticsCompanyFormType = props.logisticsCompanyFormType;
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -11921,13 +11922,20 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, logisticsCompanyFormType === 'input' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled,
+    placeholder: "\u7269\u6D41\u516C\u53F8",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'logisticsCompany');
+    },
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany
+  }) : /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
       changeInputHandle(val, 'logisticsCompany');
     },
-    value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) ? (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'] : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompanyName'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompany'],
+    value: platformType === 'gy' ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
@@ -11938,34 +11946,34 @@ var jstGoods = function jstGoods(props) {
       maxWidth: '180px'
     },
     platformType: platformType
-  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
-    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.logisticsCode
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.logisticsCode
   }) : null) : null, type === 2 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyId');
     },
-    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyId
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.supplyId
   }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyName');
     },
-    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.supplyName
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.supplyName
   })) : null, type === 3 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendId');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendId
+    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
       minWidth: '100px',
@@ -11976,7 +11984,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendSnapshotId) || ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName) || null,
+    value: ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendSnapshotId) || ((_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11986,14 +11994,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
+    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
+    value: (_value$changeIndex13 = value[changeIndex]) === null || _value$changeIndex13 === void 0 ? void 0 : _value$changeIndex13.sendName
   })) : null) : null);
 };
 
@@ -18840,6 +18848,34 @@ var getColumns$7 = function getColumns(_ref) {
 };
 
 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: 200
+    }, {
+      dataIndex: 'subOrderId',
+      title: "[SKX]\u53D1\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 200
+    }, {
+      dataIndex: 'onBillNo',
+      title: "[SKX]ON\u51FA\u5E93\u901A\u77E5\u5355\u53F7",
+      width: 200
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var getColumns$9 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -18952,7 +18988,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({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -18985,8 +19021,12 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$8({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$8({
+    default: getColumns$9({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -19447,10 +19487,13 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     fixed: true,
     onChange: handleChangeSelectedKeys
   };
+  var buttonTextMapping = {
+    SKX_GOODS: '选择发货单商品'
+  };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: openModal
-  }, "\u9009\u62E9\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+  }, buttonTextMapping[type] || '选择订单商品'), /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: "\u8BA2\u5355\u5546\u54C1",
     visible: tradeGoodsVisible,
     footer: null,
@@ -19653,6 +19696,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
+        case 'SKX_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -24547,6 +24591,341 @@ var KmVideo = function KmVideo(_ref) {
   }))));
 };
 
+var singletonMap$8 = new Map();
+var getAllGoods = function getAllGoods(params, setLoading) {
+  var id = params.tid || params.onBillNo || '';
+  if (!singletonMap$8.has(id)) {
+    setLoading && setLoading(true);
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$8.delete(id);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/skxOrderDetail', {
+        method: 'post',
+        data: params
+      }).then(function (res) {
+        if (res === null || res === void 0 ? void 0 : res.success) {
+          var _res$data, _res$data$orderDetail;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$orderDetail = _res$data.orderDetailInfoList) === null || _res$data$orderDetail === void 0 ? void 0 : _res$data$orderDetail.length) {
+            var orderDetailInfoList = res === null || res === void 0 ? void 0 : res.data.orderDetailInfoList;
+            res.data.trades = orderDetailInfoList[0].subOrderList.map(function (subItem) {
+              return {
+                onBillNo: orderDetailInfoList[0].onBillNo,
+                skuEcode: subItem.skuEcode,
+                subOrderId: subItem.subOrderId
+              };
+            });
+          }
+          resolve(res.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$8.delete(id);
+          }, 1000 * 10);
+        } else {
+          doReject(res);
+        }
+      }).catch(doReject).finally(function () {
+        setLoading && setLoading(false);
+      });
+    });
+    singletonMap$8.set(id, p);
+  }
+  return singletonMap$8.get(id);
+};
+var skxUtils = {
+  getAllGoods: getAllGoods
+};
+
+var typeMap$6 = {
+  SKX_OUTBOUND_NOTICE_NO: {
+    key: 'onBillNo',
+    notDataText: '未获取到出库通知单号',
+    placeholder: '请点击按钮选择或者输入ON出库通知单号',
+    buttonText: '选择ON出库通知单号',
+    columnHeaders: {
+      title: '出库通知单号',
+      subListName: 'subOrderList',
+      leftColumn: {
+        label: '[SKX]发货单明细-skuEcode',
+        value: 'skuEcode'
+      },
+      rightColumn: {
+        label: '[SKX]发货单—子订单号',
+        value: 'subOrderId'
+      }
+    },
+    asyncGetData: function () {
+      var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(tradeId) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", skxUtils.getAllGoods({
+                tid: tradeId
+              }).then(function (data) {
+                var orderDetailInfoList = data.orderDetailInfoList || [];
+                return orderDetailInfoList;
+              }));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function asyncGetData(_x) {
+        return _asyncGetData.apply(this, arguments);
+      }
+      return asyncGetData;
+    }()
+  }
+};
+var IdInputSelect = function IdInputSelect(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _onBlur = props.onBlur,
+    disabled = props.disabled,
+    form = props.form,
+    templateDetail = props.templateDetail,
+    type = props.type;
+  var _useState = React.useState(value),
+    _useState2 = _slicedToArray(_useState, 2),
+    inputValue = _useState2[0],
+    setInputValue = _useState2[1];
+  // 控制Popover显示状态
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    popoverVisible = _useState4[0],
+    setPopoverVisible = _useState4[1];
+  var _useState5 = React.useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    spinning = _useState6[0],
+    setSpinning = _useState6[1];
+  var tradeIdRef = React.useRef('');
+  var _useState7 = React.useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    dataSource = _useState8[0],
+    setDataSource = _useState8[1];
+  //当外部数据源变化时更新内部状态;
+  React.useEffect(function () {
+    if (popoverVisible) {
+      asyncQueryData();
+    }
+  }, [popoverVisible]);
+  React.useEffect(function () {
+    setInputValue(value);
+  }, [value]);
+  var asyncQueryData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var tradeId;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            tradeId = form.getFieldValue('m3ap1EvEyd');
+            console.log('asyncQueryData---', {
+              tradeId: tradeId,
+              tradeIdRef: tradeIdRef.current,
+              form: form
+            });
+            if (!(tradeId === tradeIdRef.current)) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 4:
+            if (tradeId) {
+              _context2.next = 7;
+              break;
+            }
+            setDataSource([]);
+            return _context2.abrupt("return");
+          case 7:
+            setSpinning(true);
+            typeMap$6[type].asyncGetData(tradeId).then(function (data) {
+              setDataSource(data);
+              if (data.length > 0) {
+                tradeIdRef.current = tradeId;
+              }
+            }).catch(function () {
+              setDataSource([]);
+            }).finally(function () {
+              setSpinning(false);
+            });
+          case 9:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function asyncQueryData() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  // 渲染Popover内容
+  var RenderPopoverContent = function RenderPopoverContent() {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
+      spinning: spinning
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        minWidth: 500,
+        maxHeight: 400,
+        minHeight: 36,
+        overflow: 'auto'
+      }
+    }, !spinning && (!dataSource || dataSource.length === 0) && /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        textAlign: 'center',
+        color: '#858585',
+        padding: 10
+      }
+    }, typeMap$6[type].notDataText), dataSource && dataSource.length > 0 && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        display: 'grid',
+        gridTemplateColumns: '1fr 1fr',
+        gap: '16px',
+        padding: '8px 16px',
+        fontWeight: 500,
+        color: '#333'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", null, typeMap$6[type].columnHeaders.leftColumn.label), /*#__PURE__*/React__default['default'].createElement("div", null, typeMap$6[type].columnHeaders.rightColumn.label)), dataSource.map(function (group) {
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        key: group[typeMap$6[type].key]
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          padding: '10px 16px',
+          backgroundColor: '#f5f5f4'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
+        checked: value === group[typeMap$6[type].key],
+        onChange: function onChange() {
+          if (value !== group[typeMap$6[type].key]) {
+            handleChange(group[typeMap$6[type].key]);
+            kmkfUtils.skxSystemOrderBackValues({
+              templateList: templateDetail,
+              value: {
+                allOrders: [group]
+              },
+              form: form
+            });
+          }
+        },
+        style: {
+          marginRight: 12
+        }
+      }), /*#__PURE__*/React__default['default'].createElement("span", null, typeMap$6[type].columnHeaders.title, ":", group[typeMap$6[type].key])), (group[typeMap$6[type].columnHeaders.subListName] || []).map(function (item, itemIndex) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          key: "".concat(group[typeMap$6[type].key], "-").concat(itemIndex),
+          style: {
+            display: 'grid',
+            gridTemplateColumns: '1fr 1fr',
+            gap: '16px',
+            padding: '10px 16px 10px 44px'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement("div", null, item[typeMap$6[type].columnHeaders.leftColumn.value]), /*#__PURE__*/React__default['default'].createElement("div", null, item[typeMap$6[type].columnHeaders.rightColumn.value]));
+      }));
+    }))));
+  };
+  var handleChange = function handleChange(val) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    // 关闭浮窗
+    setPopoverVisible(false);
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: typeMap$6[type].placeholder,
+    disabled: disabled,
+    value: inputValue,
+    onBlur: function onBlur(e) {
+      handleChange(e.target.value);
+      _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e);
+    },
+    onChange: function onChange(e) {
+      setInputValue(e.target.value);
+    }
+  }), !disabled && /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    content: /*#__PURE__*/React__default['default'].createElement(RenderPopoverContent, null),
+    trigger: "click",
+    visible: popoverVisible,
+    onVisibleChange: setPopoverVisible
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Tag, {
+    color: "processing",
+    style: {
+      padding: '3px 8px',
+      marginTop: 8,
+      cursor: 'pointer'
+    }
+  }, typeMap$6[type].buttonText)));
+};
+
+var typeMap$7 = {
+  SKX_GOODS: {
+    key: 'skxGoods',
+    uniqueKey: 'subOrderId',
+    requestParams: {
+      key: 'onBillNo',
+      sourceUniqueKey: '78CADF2951',
+      request: skxUtils.getAllGoods
+    },
+    updateHandle: kmkfUtils.updateSkxGoodsHandle
+  }
+};
+var SkxGoods = function SkxGoods(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    form = props.form,
+    type = props.type;
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, typeMap$7[type].key, list)));
+  };
+  // 找到该订单号下所有商品
+  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
+    var goodDetails = typeMap$7[type].updateHandle((value === null || value === void 0 ? void 0 : value.allGoods) || []);
+    return goodDetails;
+  };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getAllTradeGoodsDetails() || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value[typeMap$7[type].key]) || [];
+    newValue[typeMap$7[type].key] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), typeMap$7[type].uniqueKey)) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item[typeMap$7[type].uniqueKey]);
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value[typeMap$7[type].key]]);
+  // 商品信息组件暂存后 重新编辑，此时需要重新获取on单号下所有商品信息
+  var getDataSourceAsync = function getDataSourceAsync() {
+    var businessNo = form.getFieldValue(typeMap$7[type].requestParams.sourceUniqueKey);
+    if (!businessNo) {
+      return Promise.resolve([]);
+    }
+    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+      }));
+    });
+  };
+  return /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
+    key: typeMap$7[type].key
+  }, props), {}, {
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value[typeMap$7[type].key],
+    onChange: function onChange(val) {
+      return changeHandle(val);
+    },
+    showModeBtn: false,
+    tradeGoods: {
+      uniqueKey: typeMap$7[type].uniqueKey,
+      originDataSource: getAllTradeGoodsDetails(),
+      getDataSourceAsync: getDataSourceAsync,
+      selectedGoodsChange: selectedGoodsChange
+    }
+  }));
+};
+
 exports.Address = ApaasAddress;
 exports.AliPay = AliPay;
 exports.ApaasAddress = Province;
@@ -24606,6 +24985,8 @@ exports.PublicReissue = PublicReissue;
 exports.Remark = RemarkInput;
 exports.ReturnLogistics = ExpressLogistics;
 exports.ShopName = ShopNameSelect;
+exports.SkxGoods = SkxGoods;
+exports.SkxIdInputSelect = IdInputSelect;
 exports.Status = Status;
 exports.SubForm = SubForm;
 exports.Supplier = Supplier;
@@ -24623,5 +25004,7 @@ exports.getGyColumns = getColumns$4;
 exports.getJstColumns = getColumns$5;
 exports.getJyColumns = getColumns$7;
 exports.getKmColumns = getColumns$6;
+exports.getSkxColumns = getColumns$8;
 exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;
+exports.skxUtils = skxUtils;

package/dist/src/constants/index.d.ts

@@ -4,3 +4,4 @@ export { default as getGyColumns } from './gy';
 export { default as getWdtColumns } from './wdt';
 export { default as getKmColumns } from './km';
 export { default as getJyColumns } from './jy';
+export { default as getSkxColumns } from './skx';

package/dist/src/constants/skx.d.ts

@@ -0,0 +1,3 @@
+import { GetColumnsBaseInfoMapFnType } from './columnsBaseInfoMap';
+declare const getColumns: GetColumnsBaseInfoMapFnType;
+export default getColumns;

package/dist/src/index.d.ts

@@ -68,5 +68,8 @@ export { default as GyReissue } from './gy/Reissue';
 export * from './constants/index';
 export { default as GyReturn } from './gy/Return';
 export { default as KmVideo } from './km/KmVideo';
+export { default as SkxIdInputSelect } from './skx/IdInputSelect';
+export { default as SkxGoods } from './skx/Goods';
+export { skxUtils } from './skx/common';
 export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
 export { default as erpModalColumnsMap } from './bs/component/model/Columns';

package/dist/src/jst/Goods/index.d.ts

@@ -10,6 +10,7 @@ interface JstGoodsProps {
     platformType?: string;
     onlyShowFieldSelect: boolean;
     expressDateInstance: InstanceType<typeof ExpressData>;
+    logisticsCompanyFormType?: string;
 }
 declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
 export default jstGoods;

package/dist/src/skx/Goods/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { FormInstance } from 'antd';
+declare const SkxGoods: (props: any & {
+    form: FormInstance;
+}) => React.JSX.Element;
+export default SkxGoods;

package/dist/src/skx/IdInputSelect/index.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { FormInstance } from 'antd';
+interface IdInputSelectProps {
+    value?: string;
+    onChange?: (value: any) => void;
+    onBlur?: (value: any) => void;
+    disabled?: boolean;
+    form: FormInstance;
+    templateDetail: any;
+    type: string;
+}
+declare const IdInputSelect: (props: IdInputSelectProps) => React.JSX.Element;
+export default IdInputSelect;

package/dist/src/skx/common/index.d.ts

@@ -0,0 +1,6 @@
+export declare const skxUtils: {
+    getAllGoods: (params: {
+        tid?: string;
+        onBillNo?: string;
+    }, setLoading?: ((loading: boolean) => void) | undefined) => Promise<any>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.63",
+  "version": "2.0.79-beta.66",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.60",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.66",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ef02cfeac672869b23f3c9fa5a64807ed96ef81b"
+  "gitHead": "cffd74e91fd8e9873b5616e071b9b423d79734c9"
 }