@kmkf-fe-packages/basic-components 2.0.54-beta.1 → 2.0.54-beta.100

package/dist/index.esm.js

@@ -1,10 +1,10 @@
 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, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton } from 'antd';
-import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled, 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, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isEqual, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject, isEmpty, intersection } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
@@ -473,6 +473,57 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _createForOfIteratorHelper(o, allowArrayLike) {
+  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+  if (!it) {
+    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+      if (it) o = it;
+      var i = 0;
+      var F = function () {};
+      return {
+        s: F,
+        n: function () {
+          if (i >= o.length) return {
+            done: true
+          };
+          return {
+            done: false,
+            value: o[i++]
+          };
+        },
+        e: function (e) {
+          throw e;
+        },
+        f: F
+      };
+    }
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  var normalCompletion = true,
+    didErr = false,
+    err;
+  return {
+    s: function () {
+      it = it.call(o);
+    },
+    n: function () {
+      var step = it.next();
+      normalCompletion = step.done;
+      return step;
+    },
+    e: function (e) {
+      didErr = true;
+      err = e;
+    },
+    f: function () {
+      try {
+        if (!normalCompletion && it.return != null) it.return();
+      } finally {
+        if (didErr) throw err;
+      }
+    }
+  };
+}
 function _toPrimitive(input, hint) {
   if (typeof input !== "object" || input === null) return input;
   var prim = input[Symbol.toPrimitive];
@@ -7671,7 +7722,8 @@ var Province = function Province(props) {
     workOrder: AddressData.getInstance(),
     bs: BsAddressData.getInstance(),
     wdt: WdtAddressData.getInstance(),
-    gy: GyAddressData.getInstance()
+    gy: GyAddressData.getInstance(),
+    km: AddressData.getInstance()
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -7685,8 +7737,7 @@ var Province = function Province(props) {
 var TextArea$1 = Input.TextArea;
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange,
-    _props$selfCalibratio = props.selfCalibration,
-    selfCalibration = _props$selfCalibratio === void 0 ? false : _props$selfCalibratio;
+    _props$selfCalibratio = props.selfCalibration;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -7695,29 +7746,70 @@ var ParseLogistics = function ParseLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isCopy = _useState4[0],
     setIsCopy = _useState4[1];
-  var handleIdentify = function handleIdentify(val) {
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    aiLoading = _useState8[0],
+    setAiLoading = _useState8[1];
+  var handleIdentify = function handleIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     if (!value && !val) {
       return;
     }
+    setLoading(true);
     var fullAddress = value || val;
-    var needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
+    // const needCalibration = selfCalibration && !/1\d{10}/.test(fullAddress);
     setIsCopy(false);
     request$1({
       url: '/qy/logistics/addressAnalysis',
       method: 'post',
       data: {
-        fullAddress: needCalibration ? "".concat(fullAddress, " \u5F20\u4E09 18888888888") : fullAddress
+        fullAddress: fullAddress
+        // fullAddress: needCalibration
+        //   ? `${fullAddress} 张三 18888888888`
+        //   : fullAddress,
       }
     }).then(function (res) {
       var data = res.data;
       // 如果是通过内部校准添加的姓名和手机号，则去除
-      if (needCalibration) {
-        data.name = '';
-        data.phone = '';
+      // if (needCalibration) {
+      //   data.name = '';
+      //   data.phone = '';
+      // }
+      onChange === null || onChange === void 0 ? void 0 : onChange(data);
+    }).catch(function (e) {
+      handleAIIdentify(fullAddress);
+      console.log(e);
+    }).finally(function () {
+      setLoading(false);
+    });
+  };
+  var handleAIIdentify = function handleAIIdentify() {
+    var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    if (!value && !val) {
+      return;
+    }
+    setAiLoading(true);
+    var fullAddress = value || val;
+    setIsCopy(false);
+    request$1({
+      url: '/qy/logistics/addressAnalysis',
+      method: 'post',
+      data: {
+        fullAddress: fullAddress,
+        isAiParse: true
       }
+    }).then(function (res) {
+      var data = res.data;
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       console.log(e);
+      message.error('识别失败，请输入正确的信息');
+    }).finally(function () {
+      setAiLoading(false);
     });
   };
   var _onKeyDown = function onKeyDown(e) {
@@ -7744,10 +7836,18 @@ var ParseLogistics = function ParseLogistics(props) {
   }), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
     size: "small",
     type: "primary",
+    loading: loading,
+    onClick: function onClick() {
+      return handleIdentify();
+    }
+  }, "\u4E00\u952E\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
+    size: "small",
+    type: "primary",
+    loading: aiLoading,
     onClick: function onClick() {
-      return handleIdentify('');
+      return handleAIIdentify();
     }
-  }, "\u667A\u80FD\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
+  }, "AI\u8BC6\u522B"), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     onClick: function onClick() {
       return setValue('');
@@ -7777,6 +7877,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
       bs: BsAddressData,
       wdt: WdtAddressData,
       gy: GyAddressData,
+      km: AddressData,
       workOrder: AddressData
     }[type] || AddressData).getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
@@ -7950,7 +8051,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8079,17 +8181,16 @@ var SubForm = function SubForm(props) {
     return [{
       dataIndex: 'index',
       title: '序号',
+      fixed: 'left',
+      width: 20,
       render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement("div", {
-          style: {
-            width: 25
-          }
-        }, index + 1);
+        return index + 1;
       }
     }].concat(_toConsumableArray(newTableHeader.map(function (t) {
       return {
         dataIndex: t.key,
-        title: t.name
+        title: t.name,
+        width: 90
       };
     })));
   }, [newTableHeader]);
@@ -8252,7 +8353,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: uuid()
     })]));
   };
@@ -8277,7 +8378,7 @@ var SubForm = function SubForm(props) {
       onScrollCapture: onScrollCapture,
       style: {
         height: 320,
-        maxWidth: platform !== 'pc' ? '325px' : '100%',
+        maxWidth: platform !== 'pc' ? '325px' : '700px',
         overflowY: 'scroll',
         overflowX: 'auto'
       }
@@ -8288,7 +8389,7 @@ var SubForm = function SubForm(props) {
       size: "small",
       pagination: false,
       scroll: {
-        x: '100%'
+        x: 'max-content'
       },
       locale: {
         emptyText: '暂无数据'
@@ -8661,7 +8762,9 @@ var GoodsModal = function GoodsModal(props) {
     changeSku = props.changeSku,
     width = props.width,
     _props$numIidType = props.numIidType,
-    numIidType = _props$numIidType === void 0 ? 'string' : _props$numIidType;
+    numIidType = _props$numIidType === void 0 ? 'string' : _props$numIidType,
+    form = props.form,
+    isPriorityDisplayOfOrderNo = props.isPriorityDisplayOfOrderNo;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -8674,10 +8777,14 @@ var GoodsModal = function GoodsModal(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     goodList = _useState6[0],
     setGoodList = _useState6[1];
-  var _useState7 = useState(false),
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
+    orderNoItems = _useState8[0],
+    setOrderNoItems = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
   var transformIdType = function transformIdType(id) {
     if (!['string', 'number'].includes(_typeof(id))) return id;
     return numIidType === 'string' ? id + '' : +id;
@@ -8697,7 +8804,7 @@ var GoodsModal = function GoodsModal(props) {
   var handleSetGoodList = function handleSetGoodList(list) {
     return setGoodList(list.map(transformType));
   };
-  var _useState9 = useState({
+  var _useState11 = useState({
       apiName: 'queryItems',
       desc: true,
       numIids: '',
@@ -8709,30 +8816,30 @@ var GoodsModal = function GoodsModal(props) {
       cids: '',
       title: ''
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    searchParams = _useState10[0],
-    setSearch = _useState10[1];
-  var _useState11 = useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    total = _useState12[0],
-    setTotal = _useState12[1];
-  var _useState13 = useState(''),
+    searchParams = _useState12[0],
+    setSearch = _useState12[1];
+  var _useState13 = useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    platform = _useState14[0],
-    setPlatform = _useState14[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState15 = useState({}),
+    total = _useState14[0],
+    setTotal = _useState14[1];
+  var _useState15 = useState(''),
     _useState16 = _slicedToArray(_useState15, 2),
-    shopInfo = _useState16[0],
-    setShopInfo = _useState16[1]; //店铺信息
-  var _useState17 = useState(true),
+    platform = _useState16[0],
+    setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
+  var _useState17 = useState({}),
     _useState18 = _slicedToArray(_useState17, 2),
-    canSearch = _useState18[0],
-    setCanSearch = _useState18[1];
-  var _useState19 = useState([null]),
+    shopInfo = _useState18[0],
+    setShopInfo = _useState18[1]; //店铺信息
+  var _useState19 = useState(true),
     _useState20 = _slicedToArray(_useState19, 2),
-    nextKeyList = _useState20[0],
-    setNextKeyList = _useState20[1];
-  var _useState21 = useState([{
+    canSearch = _useState20[0],
+    setCanSearch = _useState20[1];
+  var _useState21 = useState([null]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    nextKeyList = _useState22[0],
+    setNextKeyList = _useState22[1];
+  var _useState23 = useState([{
       tab: '出售中',
       key: 'onSale'
     }, {
@@ -8742,10 +8849,10 @@ var GoodsModal = function GoodsModal(props) {
       tab: '已选择',
       key: 'select'
     }]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    tabs = _useState22[0],
-    setTabs = _useState22[1];
-  var _useState23 = useState([{
+    _useState24 = _slicedToArray(_useState23, 2),
+    tabs = _useState24[0],
+    setTabs = _useState24[1];
+  var _useState25 = useState([{
       name: '上架时间',
       value: 'list_time'
     }, {
@@ -8755,13 +8862,13 @@ var GoodsModal = function GoodsModal(props) {
       name: '按价格',
       value: 'price'
     }]),
-    _useState24 = _slicedToArray(_useState23, 1),
-    goodSort = _useState24[0];
+    _useState26 = _slicedToArray(_useState25, 1),
+    goodSort = _useState26[0];
   //宝贝分类
-  var _useState25 = useState([]),
-    _useState26 = _slicedToArray(_useState25, 2),
-    shell = _useState26[0],
-    setShell = _useState26[1];
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    shell = _useState28[0],
+    setShell = _useState28[1];
   var clickOrder = function clickOrder(sort) {
     if (sort.value === searchParams.orderBy) {
       setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9034,8 +9141,112 @@ var GoodsModal = function GoodsModal(props) {
     }
   }, [platform]);
   useEffect(function () {
-    platform && canSearch && getItem(searchParams, platform);
+    if (platform && canSearch) {
+      if (searchParams.type === 'orderProduct') {
+        getOrderProductItem(searchParams);
+      } else {
+        getItem(searchParams, platform);
+      }
+    }
   }, [searchParams, platform]);
+  useEffect(function () {
+    if (visible && platform !== 'fxg') {
+      var val = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+      var orderNo = val['m3ap1EvEyd'];
+      if (orderNo) {
+        setTabs(function (prev) {
+          return uniqBy([{
+            tab: '订单商品',
+            key: 'orderProduct'
+          }].concat(_toConsumableArray(prev)), 'key');
+        });
+        if (isPriorityDisplayOfOrderNo) {
+          setSearch(function (prev) {
+            return _objectSpread2(_objectSpread2({}, prev), {}, {
+              type: 'orderProduct'
+            });
+          });
+        }
+      }
+    }
+    if (!visible) {
+      setOrderNoItems([]);
+    }
+  }, [visible]);
+  var getOrderProductItem = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var val, orderNo, shopId, res, items, totalCount, pageNo, pageSize, _pageNo, _pageSize, title, _items;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            val = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+            orderNo = val.m3ap1EvEyd, shopId = val.shopId;
+            if (orderNo) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return", handleSetGoodList([]));
+          case 4:
+            if (orderNoItems.length) {
+              _context2.next = 20;
+              break;
+            }
+            _context2.prev = 5;
+            setLoading(true);
+            _context2.next = 9;
+            return servers.orderDetail({
+              shopId: shopId,
+              orderNo: orderNo
+            });
+          case 9:
+            res = _context2.sent;
+            if (res.success) {
+              _context2.next = 14;
+              break;
+            }
+            handleSetGoodList([]);
+            message.warn(res.message);
+            return _context2.abrupt("return");
+          case 14:
+            if (res.data && res.data.itemList && res.data.itemList.length) {
+              items = res.data.itemList;
+              totalCount = items.length;
+              items.forEach(function (item) {
+                item.platform = platform;
+              });
+              setOrderNoItems(items);
+              pageNo = params.pageNo, pageSize = params.pageSize;
+              handleSetGoodList(_toConsumableArray(items.slice((pageNo - 1) * pageSize, pageNo * pageSize)));
+              setTotal(totalCount);
+            }
+          case 15:
+            _context2.prev = 15;
+            setLoading(false);
+            return _context2.finish(15);
+          case 18:
+            _context2.next = 26;
+            break;
+          case 20:
+            _pageNo = params.pageNo, _pageSize = params.pageSize;
+            title = params.title;
+            if (platform !== 'taobao') {
+              title = params.numIids;
+            }
+            _items = title ? orderNoItems.filter(function (item) {
+              return item.title.includes(title.trim());
+            }) : orderNoItems;
+            handleSetGoodList(_toConsumableArray(_items.slice((_pageNo - 1) * _pageSize, _pageNo * _pageSize)));
+            setTotal(_items.length);
+          case 26:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[5,, 15, 18]]);
+    }));
+    return function getOrderProductItem(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择宝贝',
     okText: '确认',
@@ -9069,7 +9280,7 @@ var GoodsModal = function GoodsModal(props) {
     style: {
       display: searchParams.type === 'select' ? 'none' : ''
     }
-  }, platform === 'taobao' && /*#__PURE__*/React.createElement(Radio.Group, {
+  }, /*#__PURE__*/React.createElement("div", null, platform === 'taobao' && searchParams.type !== 'orderProduct' && /*#__PURE__*/React.createElement(Radio.Group, {
     value: searchParams.orderBy,
     onChange: function onChange(e) {
       setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9085,7 +9296,7 @@ var GoodsModal = function GoodsModal(props) {
       },
       key: sort.value
     }, sort.name, sort.value === searchParams.orderBy ? searchParams.desc ? /*#__PURE__*/React.createElement("span", null, "\u21BE") : /*#__PURE__*/React.createElement("span", null, "\u21C2") : /*#__PURE__*/React.createElement("span", null, "\u21C5"));
-  })), /*#__PURE__*/React.createElement("div", null, platform === 'taobao' && /*#__PURE__*/React.createElement(Select, {
+  }))), /*#__PURE__*/React.createElement("div", null, platform === 'taobao' && searchParams.type !== 'orderProduct' && /*#__PURE__*/React.createElement(Select, {
     className: "classify",
     value: searchParams.cids,
     onChange: function onChange(value) {
@@ -9100,7 +9311,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search, {
-    placeholder: platform === 'taobao' ? '宝贝链接，标题' : '商品ID',
+    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接，标题' : '商品ID' : '宝贝标题',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -9723,7 +9934,9 @@ var GoodItem = function GoodItem(props) {
     userNick = props.userNick,
     disabled = props.disabled,
     changeSku = props.changeSku,
-    width = props.width;
+    width = props.width,
+    form = props.form,
+    isPriorityDisplayOfOrderNo = props.isPriorityDisplayOfOrderNo;
   var shopId = value.shopId,
     imgList = value.imgList;
   var _useState = useState(false),
@@ -9814,7 +10027,7 @@ var GoodItem = function GoodItem(props) {
   var onSubmit = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(list) {
       var _list$;
-      var newList, newImgList;
+      var newList, newImgList, _list$2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -9836,7 +10049,11 @@ var GoodItem = function GoodItem(props) {
               // if (type === 1) {
               //   params.outerId = item.outerId; //编码
               // }
-              if (changeSku) {
+              //返填商品属性 && 为订单商品
+              if (changeSku && item.skuInfoDTO) {
+                params.outerSkuId = item.skuInfoDTO.outerSkuId;
+                params.propertiesName = item.skuInfoDTO.propertiesName;
+              } else if (changeSku) {
                 params.propertiesName = '';
               }
               // if (type === 4) {
@@ -9855,7 +10072,9 @@ var GoodItem = function GoodItem(props) {
               imgList: newImgList
             });
             setVisible(false);
-            checkSkus(list === null || list === void 0 ? void 0 : (_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.numIid, newImgList.length - 1);
+            if (!(list === null || list === void 0 ? void 0 : (_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.skuInfoDTO)) {
+              checkSkus(list === null || list === void 0 ? void 0 : (_list$2 = list[0]) === null || _list$2 === void 0 ? void 0 : _list$2.numIid, newImgList.length - 1);
+            }
           case 5:
           case "end":
             return _context2.stop();
@@ -10112,6 +10331,8 @@ var GoodItem = function GoodItem(props) {
     shopId: shopId,
     maxLength: maxLength,
     changeSku: changeSku,
+    form: form,
+    isPriorityDisplayOfOrderNo: isPriorityDisplayOfOrderNo,
     onCancel: function onCancel() {
       setVisible(false);
     }
@@ -10910,7 +11131,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '发件人手机号',
-    required: true,
+    // required={true}
     key: 'interceptSenderMobile',
     hidden: !showSenderMobile
   }, /*#__PURE__*/React.createElement(Input, {
@@ -10939,7 +11160,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       value: item.uk
     }, "".concat(address.getNameByCode(item === null || item === void 0 ? void 0 : item.province) || '').concat(address.getNameByCode(item === null || item === void 0 ? void 0 : item.city) || '').concat(address.getNameByCode(item === null || item === void 0 ? void 0 : item.district) || '').concat(item.detail, " ").concat(item === null || item === void 0 ? void 0 : item.userName, ":").concat(item === null || item === void 0 ? void 0 : item.mobile));
   }))), /*#__PURE__*/React.createElement(Item, {
-    label: '派送地址',
+    label: '修改后派送地址',
     required: true,
     key: 'newAddress',
     hidden: !showNewAddress
@@ -11090,7 +11311,11 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     disabled = props.disabled,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    _props$isSingle = props.isSingle,
+    isSingle = _props$isSingle === void 0 ? true : _props$isSingle,
+    _props$trajectoryApiS = props.trajectoryApiStatus,
+    trajectoryApiStatus = _props$trajectoryApiS === void 0 ? false : _props$trajectoryApiS;
   var handleInputChange = function handleInputChange(e, type) {
     var val = e.target.value;
     typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val)));
@@ -11101,13 +11326,23 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     }));
     handleSearchSnapshot(val);
   };
+  var handleStatusChange = function handleStatusChange(val) {
+    var _value$trajectoryApiS;
+    var newVal = _objectSpread2(_objectSpread2({}, value), {}, {
+      trajectoryApiStatus: {
+        status: val,
+        reason: (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS = value.trajectoryApiStatus) === null || _value$trajectoryApiS === void 0 ? void 0 : _value$trajectoryApiS.reason) || ''
+      }
+    });
+    onChange(newVal);
+  };
   var handleSearchSnapshot = function handleSearchSnapshot(company) {
     var trajectoryCompany = value.trajectoryCompany,
       trajectoryCode = value.trajectoryCode,
       trajectoryPhone = value.trajectoryPhone;
     var newCompany = company ? company : trajectoryCompany;
     //不展示拦截状态不请求
-    if (!(showField && showField.includes('snapshot'))) {
+    if (!(showField && showField.includes('snapshot')) && !trajectoryApiStatus) {
       return;
     }
     if (disabled) {
@@ -11132,13 +11367,19 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
           data = res.data,
           msg = res.message;
         if (result === 100 || success) {
-          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-            trajectorySnapshot: data === null || data === void 0 ? void 0 : data.logisticsStatusDesc,
+          var newValue = _objectSpread2(_objectSpread2({}, value), {}, {
             trajectoryCompany: newCompany
-          }));
+          });
+          if (trajectoryApiStatus) newValue.trajectoryApiStatus = data === null || data === void 0 ? void 0 : data.apiStatusObject;
+          if (showField && showField.includes('snapshot')) newValue.trajectorySnapshot = data === null || data === void 0 ? void 0 : data.logisticsStatusDesc;
+          onChange(newValue);
         } else {
           onChange(_objectSpread2(_objectSpread2({}, value), {}, {
             trajectorySnapshot: '',
+            trajectoryApiStatus: {
+              reason: '',
+              status: ''
+            },
             trajectoryCompany: newCompany
           }));
           msg && message.error(msg);
@@ -11147,6 +11388,10 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     } catch (err) {
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         trajectorySnapshot: '',
+        trajectoryApiStatus: {
+          reason: '',
+          status: ''
+        },
         trajectoryCompany: newCompany
       }));
       (err === null || err === void 0 ? void 0 : err.message) && message.error(err === null || err === void 0 ? void 0 : err.message);
@@ -11200,6 +11445,31 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       }
     });
   };
+  // 接口状态
+  var LogisticsApiStatus = function LogisticsApiStatus() {
+    var _value$trajectoryApiS2, _value$trajectoryApiS3, _value$trajectoryApiS4;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
+      value: (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS2 = value.trajectoryApiStatus) === null || _value$trajectoryApiS2 === void 0 ? void 0 : _value$trajectoryApiS2.status) || null,
+      disabled: true,
+      style: {
+        width: '100%',
+        marginTop: '8px'
+      },
+      placeholder: "\u63A5\u53E3\u72B6\u6001",
+      onChange: handleStatusChange,
+      options: [{
+        label: '成功',
+        value: '成功'
+      }, {
+        label: '失败',
+        value: '失败'
+      }]
+    }), (value === null || value === void 0 ? void 0 : (_value$trajectoryApiS3 = value.trajectoryApiStatus) === null || _value$trajectoryApiS3 === void 0 ? void 0 : _value$trajectoryApiS3.reason) ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: 'red'
+      }
+    }, "\u5931\u8D25\u539F\u56E0\uFF1A", value === null || value === void 0 ? void 0 : (_value$trajectoryApiS4 = value.trajectoryApiStatus) === null || _value$trajectoryApiS4 === void 0 ? void 0 : _value$trajectoryApiS4.reason) : null);
+  };
   //物流快照
   var LogisticsSnapshot = function LogisticsSnapshot() {
     return /*#__PURE__*/React.createElement(Input, {
@@ -11214,7 +11484,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -11427,7 +11697,8 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
     disabled: disabled,
     onChange: function onChange(val) {
       return handleChange(val, changeIndex);
-    }
+    },
+    isSingle: false
   }));
 };
 
@@ -11450,7 +11721,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;
+  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 _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11468,8 +11739,8 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var expressDateInstance = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
-  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11552,59 +11823,51 @@ 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, _objectSpread2(_objectSpread2({
-    type: logisticsType,
+  }))) : 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, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      if (logisticsType === 'input') {
-        changeInputHandle(null, 'logisticsCompany');
-        changeInputHandle(val, 'logisticsCompanyName');
-      } else {
-        changeInputHandle(val, 'logisticsCompany');
-      }
+      changeInputHandle(val, 'logisticsCompany');
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
-  }, logisticsType === 'input' ? {} : {
+    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'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
-  }), {}, {
+    },
     style: {
       minWidth: '100px',
       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$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
+    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.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$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.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$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.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$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
     style: {
       minWidth: '100px',
@@ -11615,7 +11878,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
+    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,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11625,14 +11888,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
+    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.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$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
+    value: (_value$changeIndex12 = value[changeIndex]) === null || _value$changeIndex12 === void 0 ? void 0 : _value$changeIndex12.sendName
   })) : null) : null);
 };
 
@@ -12199,7 +12462,7 @@ var gyColumns = [{
 }, {
   dataIndex: 'specNo',
   title: 'SKU编码',
-  width: 200,
+  width: 150,
   ellipsis: true
 }, {
   dataIndex: 'goodName',
@@ -12210,11 +12473,11 @@ var gyColumns = [{
   dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 250
+  width: 150
 }, {
   dataIndex: 'goodNo',
   title: '商品编码',
-  width: 200,
+  width: 150,
   ellipsis: true
 }, {
   dataIndex: 'goodPicUrl',
@@ -12487,12 +12750,144 @@ var bse3Columns = [{
   width: 100
 }];
 
+var getYesOrNo = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var kmColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: "\u5546\u54C1\u56FE\u7247",
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 60,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: '商品简称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodBarcode',
+  title: '商品条码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C\u540D\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'skuType',
+  title: "\u5546\u54C1\u7C7B\u578B",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specName',
+  title: "SKU\u540D\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specNo',
+  title: "SKU\u7F16\u7801",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'propertiesValue',
+  title: "\u89C4\u683C\u503C",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'skuShortTitle',
+  title: "\u89C4\u683C\u7B80\u79F0",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specBarcode',
+  title: "\u89C4\u683C\u6761\u7801",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'specImgUrl',
+  title: "SKU \u56FE\u7247",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 60,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'isGift',
+  title: "\u662F\u5426\u8D60\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'isVirtual',
+  title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'isSkuItem',
+  title: "\u662F\u5426\u542B\u6709SKU",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+  }
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 150
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
     jst: jstColumns,
     wdt: wdtColumns,
-    bse3: bse3Columns
+    bse3: bse3Columns,
+    km: kmColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -12547,9 +12942,7 @@ var useGetColumns = (function (type) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var showColumnsDataIndexList = useMemo(function () {
-    return columns.filter(function (item) {
-      return Object.hasOwn(item, 'dataIndex');
-    }).map(function (item) {
+    return columns.map(function (item) {
       return item.dataIndex;
     });
   }, [columns]);
@@ -13444,23 +13837,17 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
 };
 var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
 
+var rowCheckKey = 'id';
 var getTableData$3 = 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
-  };
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'KM_ERP'
+    }, formData)
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -13477,6 +13864,254 @@ var getTableData$3 = function getTableData(_ref, formData) {
   });
 };
 var searchFormData$2 = [{
+  label: '商品名称',
+  name: 'goodName'
+}, {
+  label: '商品编码',
+  name: 'goodNo'
+}, {
+  label: 'SKU名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: 'SKU编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
+}];
+var GoodList$3 = 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('km'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$3, {
+      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[rowCheckKey]]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record[rowCheckKey];
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t[rowCheckKey] !== record[rowCheckKey];
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t[rowCheckKey];
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t[rowCheckKey];
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal[rowCheckKey] !== othVal[rowCheckKey];
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row[rowCheckKey] || row.skuId;
+        }).includes(record[rowCheckKey] || record.skuId),
+        name: record[rowCheckKey]
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record[rowCheckKey];
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t[rowCheckKey] !== record[rowCheckKey];
+      }));
+    };
+    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: rowCheckKey,
+      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$2,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: rowCheckKey,
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, 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 ErpGoodsList = /*#__PURE__*/forwardRef(GoodList$3);
+
+var ErpGoodsModal = function ErpGoodsModal(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 erpGoodsListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _erpGoodsListRef$curr;
+    var selectedList = ((_erpGoodsListRef$curr = erpGoodsListRef.current) === null || _erpGoodsListRef$curr === void 0 ? void 0 : _erpGoodsListRef$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(ErpGoodsList, {
+    ref: erpGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+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
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'GY_ERP'
+    }, data)
+  }).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$3 = [{
   label: '商品简称',
   name: 'goodShortName'
 }, {
@@ -13494,7 +14129,7 @@ var searchFormData$2 = [{
   label: '商品编码',
   name: 'goodNo'
 }];
-var GoodList$3 = function GoodList(props, ref) {
+var GoodList$4 = function GoodList(props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -13518,7 +14153,7 @@ var GoodList$3 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$3, {
+  var _useAntdTable = useAntdTable(getTableData$4, {
       defaultPageSize: 10,
       form: form
     }),
@@ -13608,7 +14243,7 @@ var GoodList$3 = function GoodList(props, ref) {
     active: true,
     loading: loading
   }, /*#__PURE__*/React.createElement(SearchForm, {
-    searchFormData: searchFormData$2,
+    searchFormData: searchFormData$3,
     form: form,
     showColumnsDataIndexList: showColumnsDataIndexList,
     submit: submit,
@@ -13636,7 +14271,7 @@ var GoodList$3 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var GyGoodsList$1 = /*#__PURE__*/forwardRef(GoodList$3);
+var GyGoodsList$1 = /*#__PURE__*/forwardRef(GoodList$4);
 
 var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
@@ -14385,6 +15020,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: 70
@@ -14394,7 +15033,7 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }],
     //旺店通换出商品信息
@@ -14506,6 +15145,10 @@ var getColumns$2 = function getColumns(_ref) {
           label: '组合装',
           value: '2'
         }];
+        var typeMap = {
+          '1': '单品',
+          '2': '组合装'
+        };
         return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: 70
@@ -14515,13 +15158,13 @@ var getColumns$2 = function getColumns(_ref) {
           onChange: function onChange(value) {
             return updateHandle(value, index, 'type');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }]
   };
 };
 
-var getYesOrNo = function getYesOrNo(val) {
+var getYesOrNo$1 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14659,7 +15302,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       },
       width: 100
     }]
@@ -14671,7 +15314,7 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$1 = function getYesOrNo(val) {
+var getYesOrNo$2 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14781,7 +15424,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -14800,7 +15443,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -14920,7 +15563,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15044,7 +15687,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$2(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -15166,7 +15809,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',
@@ -15442,7 +16085,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -15551,7 +16194,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -15590,22 +16233,255 @@ var getColumns$5 = function getColumns() {
   };
 };
 
+function toNum$2(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,
-    text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle;
   return {
-    //bs商品信息
-    default: [{
-      dataIndex: 'mark',
-      title: "\u5546\u54C1\u6807\u8BB0",
-      align: 'center',
-      ellipsis: true,
-      width: 70,
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement(Select, {
-          options: [{
+    KM_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
+      width: 170
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'num',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'num');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    KM_REISSUE_GOODS: [{
+      dataIndex: 'skuPropertiesName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 250
+    }, {
+      dataIndex: 'sysTitle',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'shortTitle',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'title',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      width: 150
+    }, {
+      dataIndex: 'sysOuterId',
+      title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
+      width: 150
+    }, {
+      dataIndex: 'itemSysId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      width: 150
+    }, {
+      dataIndex: 'skuSysId',
+      title: "\u7CFB\u7EDF\u89C4\u683CID",
+      width: 150
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5E73\u53F0\u89C4\u683C\u7F16\u53F7",
+      width: 170
+    }, {
+      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$2(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 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, 'realNum');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'desiredNum',
+      title: "\u5E94\u8865\u53D1\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'desiredNum');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //bs商品信息
+    default: [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: 'center',
+      ellipsis: true,
+      width: 70,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement(Select, {
+          options: [{
             label: '是',
             value: '是'
           }, {
@@ -15703,7 +16579,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -15728,8 +16604,12 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
+  })), getColumns$6({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
   })), {}, {
-    default: getColumns$6({
+    default: getColumns$7({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -15737,6 +16617,29 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   });
 };
 var erpColumnsMap = getColumnsMap$1();
+var erpFormValidator = function erpFormValidator(_rule, value, type) {
+  var validatorFnList = (erpColumnsMap[type] || erpColumnsMap['default']).map(function (column) {
+    return column.validator;
+  }).filter(Boolean);
+  var res = null;
+  var _iterator = _createForOfIteratorHelper(validatorFnList),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var validatorFn = _step.value;
+      var validatorResult = validatorFn(_rule, value, type);
+      if (validatorResult) {
+        res = validatorResult;
+        break;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return res;
+};
 var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var clone_columnsMap = cloneDeep(getColumnsMap$1());
   var newColumns = {};
@@ -15858,6 +16761,231 @@ function HoverTableRowDeleteIcon(_ref) {
   })));
 }
 
+var isErpType = {
+  isWdt: function isWdt(type) {
+    return ['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type);
+  },
+  isBsE3: function isBsE3(type) {
+    return ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type);
+  },
+  isGy: function isGy(type) {
+    return ['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type);
+  },
+  isJst: function isJst(type) {
+    return ['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type);
+  },
+  isKm: function isKm(type) {
+    return ['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type);
+  }
+};
+var processGoods = function processGoods(_ref) {
+  var list = _ref.list,
+    type = _ref.type,
+    canUpdateNumber = _ref.canUpdateNumber;
+  var newList = [];
+  // 根据商品类型处理数据
+  if (isErpType.isWdt(type)) {
+    newList = processWdtGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isBsE3(type)) {
+    newList = processBsE3Goods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isGy(type)) {
+    newList = processGyGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isJst(type)) {
+    newList = processJstGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else if (isErpType.isKm(type)) {
+    newList = processKmGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  } else {
+    newList = processDefaultGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
+  }
+  return newList;
+};
+// 处理不同类型的商品数据
+var processWdtGoods = function processWdtGoods(_ref2) {
+  var list = _ref2.list,
+    type = _ref2.type,
+    canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: uuid(),
+      canDelete: true,
+      num: 1,
+      orderPrice: 0,
+      sharePrice: 0,
+      canUpdateNumber: canUpdateNumber
+    });
+    // 特殊处理换货商品
+    if (type === 'WDT_EXCHANGE_GOODS') {
+      processedItem.price = item.retailPrice;
+      processedItem.type = '1';
+    }
+    return processedItem;
+  });
+};
+var processBsE3Goods = function processBsE3Goods(_ref3) {
+  var list = _ref3.list,
+    canUpdateNumber = _ref3.canUpdateNumber;
+  return list.map(function (item) {
+    var specNo = item.specNo,
+      specId = item.specId,
+      goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodPicUrl = item.goodPicUrl,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      retailPrice = item.retailPrice;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      sku: specNo,
+      skuId: specId,
+      goodsName: goodName,
+      goodsShortName: goodShortName,
+      picPath: goodPicUrl,
+      goodsSn: goodNo,
+      goodsId: goodId,
+      goodsPrice: retailPrice,
+      shopPrice: retailPrice,
+      sharePayment: '',
+      sharePrice: '',
+      payment: '',
+      tcSku: '',
+      tcGoodsNumber: '',
+      taoCanSingleSl: '',
+      isGift: '',
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      goodsNumber: 1,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+var processGyGoods = function processGyGoods(_ref4) {
+  var list = _ref4.list;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodNo = item.goodNo,
+      specName = item.specName,
+      specNo = item.specNo,
+      retailPrice = item.retailPrice;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1,
+      goodName: goodName,
+      goodShortName: goodShortName,
+      goodNo: goodNo,
+      specName: specName,
+      specNo: specNo,
+      originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
+      originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
+    });
+  });
+};
+var processJstGoods = function processJstGoods(_ref5) {
+  var list = _ref5.list;
+  return list.map(function (item) {
+    return {
+      name: item.goodName,
+      skuId: item.goodNo,
+      iId: item.styleCode,
+      pic: item.goodPicUrl,
+      propertiesValue: item.propertiesValue,
+      saleBasePrice: item.retailPrice,
+      salePrice: item.retailPrice,
+      remark: '',
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true,
+      qty: 1
+    };
+  });
+};
+var processKmGoods = function processKmGoods(_ref6) {
+  var list = _ref6.list,
+    type = _ref6.type;
+  var initParamsMap = {
+    KM_GOODS: {
+      num: 1
+    },
+    KM_REISSUE_GOODS: {
+      realNum: 1,
+      desiredNum: 1
+    }
+  };
+  return list.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      skuPropertiesName: item.specName,
+      sysTitle: item.goodName,
+      title: null,
+      shortTitle: item.goodShortName,
+      sysOuterId: item.goodNo,
+      outerId: item.goodNo,
+      skuSysId: item.specId,
+      itemSysId: item.goodId,
+      sysPicPath: item.goodPicUrl,
+      payment: null,
+      price: item.retailPrice,
+      type: null,
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true
+    }, initParamsMap[type] || {});
+  });
+};
+var processDefaultGoods = function processDefaultGoods(_ref7) {
+  var list = _ref7.list,
+    canUpdateNumber = _ref7.canUpdateNumber;
+  return list.map(function (item) {
+    var goodsId = item.goodsId,
+      name = item.name,
+      code = item.code,
+      skuCode = item.skuCode,
+      marketPrice = item.marketPrice,
+      skuName = item.skuName;
+    return {
+      id: goodsId,
+      mark: '是',
+      pic: '',
+      skuName: skuName,
+      name: name,
+      code: code,
+      sku: skuCode,
+      money: marketPrice || 0,
+      share: marketPrice || 0,
+      number: 1,
+      type: '',
+      uuid: uuid(),
+      canDelete: true,
+      canUpdateNumber: canUpdateNumber
+    };
+  });
+};
+
 var GoodsModalMap = {
   WDT_REISSUE_GOODS: WdtGoodsModal,
   WDT_GOODS: WdtGoodsModal,
@@ -15867,10 +16995,13 @@ var GoodsModalMap = {
   BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
   GY_GOODS: GyGoodsModal$2,
   GY_REISSUE_GOODS: GyGoodsModal$2,
+  GY_RETURN_GOODS: GyGoodsModal$2,
   JST_GOODS: JstGoodsModal,
   JST_REISSUE_GOODS: JstGoodsModal,
   JST_RETURN_GOODS: JstGoodsModal,
   JST_EXCHANGE_GOODS: JstGoodsModal,
+  KM_GOODS: KmGoodsModal,
+  KM_REISSUE_GOODS: KmGoodsModal,
   OTHER_GOODS: GoodsModal$2
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
@@ -15904,7 +17035,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    // console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -15933,13 +17064,16 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
 };
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
+    return '选择快麦ERP商品';
+  }
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
     return '选择百胜ERP商品';
   }
   if (['WDT_REISSUE_GOODS'].includes(type)) {
     return '选择旺店通商品';
   }
-  if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
+  if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
     return '选择管易ERP商品';
   }
   if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
@@ -16076,6 +17210,8 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JST_RETURN_GOODS':
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
+        case 'KM_GOODS':
+        case 'KM_REISSUE_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -16193,120 +17329,11 @@ var GoodItem$1 = function GoodItem(props) {
     }].concat(_toConsumableArray(columns));
   }, []);
   var onSubmit = function onSubmit(list) {
-    var newList = [];
-    if (['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        item.uuid = uuid();
-        item.canDelete = true;
-        item.num = 1;
-        item.orderPrice = 0;
-        item.sharePrice = 0;
-        item.canUpdateNumber = canUpdateNumber;
-        if (type === 'WDT_EXCHANGE_GOODS') {
-          item.price = item.retailPrice;
-          item.type = '1';
-        }
-        return item;
-      });
-    } else if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        var specNo = item.specNo,
-          specId = item.specId,
-          goodName = item.goodName,
-          goodShortName = item.goodShortName,
-          goodPicUrl = item.goodPicUrl,
-          goodNo = item.goodNo,
-          goodId = item.goodId,
-          retailPrice = item.retailPrice;
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          sku: specNo,
-          skuId: specId,
-          goodsName: goodName,
-          goodsShortName: goodShortName,
-          picPath: goodPicUrl,
-          goodsSn: goodNo,
-          goodsId: goodId,
-          goodsPrice: retailPrice,
-          shopPrice: retailPrice,
-          sharePayment: '',
-          sharePrice: '',
-          payment: '',
-          tcSku: '',
-          tcGoodsNumber: '',
-          taoCanSingleSl: '',
-          isGift: '',
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          goodsNumber: 1,
-          canUpdateNumber: canUpdateNumber
-        });
-      });
-    } else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        var goodName = item.goodName,
-          goodShortName = item.goodShortName,
-          goodNo = item.goodNo,
-          specName = item.specName,
-          specNo = item.specNo,
-          retailPrice = item.retailPrice;
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          qty: 1,
-          goodName: goodName,
-          goodShortName: goodShortName,
-          goodNo: goodNo,
-          specName: specName,
-          specNo: specNo,
-          originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
-          originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
-        });
-      });
-    } else if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
-      newList = list.map(function (item) {
-        return {
-          name: item.goodName,
-          skuId: item.goodNo,
-          iId: item.styleCode,
-          pic: item.goodPicUrl,
-          propertiesValue: item.propertiesValue,
-          saleBasePrice: item.retailPrice,
-          salePrice: item.retailPrice,
-          remark: '',
-          uuid: uuid(),
-          canDelete: true,
-          canEdit: true,
-          qty: 1
-        };
-      });
-    } else {
-      newList = list.map(function (item) {
-        var goodsId = item.goodsId,
-          name = item.name,
-          code = item.code,
-          skuCode = item.skuCode,
-          marketPrice = item.marketPrice,
-          skuName = item.skuName;
-        return {
-          id: goodsId,
-          mark: '是',
-          pic: '',
-          skuName: skuName,
-          name: name,
-          code: code,
-          sku: skuCode,
-          money: marketPrice || 0,
-          share: marketPrice || 0,
-          number: 1,
-          type: '',
-          uuid: uuid(),
-          canDelete: true,
-          canUpdateNumber: canUpdateNumber
-        };
-      });
-    }
+    var newList = processGoods({
+      list: list,
+      canUpdateNumber: canUpdateNumber,
+      type: type
+    });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
   };
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
@@ -17020,10 +18047,12 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
           var _data$data, _data$data$trades;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
             data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
+              var _tradeStatusMap$data$;
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName
+                billTag: item.tagName,
+                tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
               });
             });
           }
@@ -17066,6 +18095,10 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
             data.data.orderList = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
           }
           resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$1.delete(orderNo);
+          }, 1000 * 10);
         } else {
           doReject(data);
         }
@@ -17106,6 +18139,7 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 deliveryState: item.deliveryState,
                 vipCode: item.vipCode,
                 shopCode: item.shopCode,
+                cancelName: item.cancel ? '是' : '否',
                 deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
@@ -17143,7 +18177,11 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
             orderList: (data === null || data === void 0 ? void 0 : data.data) || []
           }, orderNo);
           resolve(data.data);
-        } else {
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$3.delete(orderNo);
+          }, 1000 * 10);
+        } else {
           doReject(data);
         }
       }).catch(doReject);
@@ -17186,6 +18224,74 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
         singletonMap$4.delete(orderNo);
         reject(err);
       };
+      extendRequest('/qy/gdfw/order/wlnOrderList', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$4.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$4.set(orderNo, p);
+  }
+  return singletonMap$4.get(orderNo);
+};
+var wlnUtils = {
+  getOrderListSingleton: getOrderListSingleton
+};
+
+var singletonMap$5 = new Map();
+var getOrderListSingleton$1 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$5.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$5.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/bsOrderDetail', {
+        method: 'post',
+        data: {
+          billNo: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          resolve(data.data);
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$5.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$5.set(orderNo, p);
+  }
+  return singletonMap$5.get(orderNo);
+};
+var bsUtils = {
+  getOrderListSingleton: getOrderListSingleton$1
+};
+
+var singletonMap$6 = new Map();
+var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$6.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$6.delete(orderNo);
+        reject(err);
+      };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
         method: 'post',
         data: {
@@ -17209,22 +18315,22 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$4.delete(orderNo);
+            singletonMap$6.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$4.set(orderNo, p);
+    singletonMap$6.set(orderNo, p);
   }
-  return singletonMap$4.get(orderNo);
+  return singletonMap$6.get(orderNo);
 };
 var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton
+  getOrderListSingleton: getOrderListSingleton$2
 };
 
-var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -17266,7 +18372,6 @@ var index$3 = (function (props) {
       } else if (type === 'BS_E3_SYSTEM_ORDER') {
         getBsE3OrderList(value.orderNo);
       } else if (type === 'GY_SYSTEM_ORDER') {
-        console.log('触发gy--getGyOrderList--1');
         getGyOrderList(value.orderNo);
       } else if (type === 'JST_SYSTEM_ORDER') {
         getJstOrderList(value.orderNo);
@@ -17278,22 +18383,11 @@ var index$3 = (function (props) {
   }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      var _yield$request, success, data, _valueRef$current;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return extendRequest('/qy/gdfw/order/bsOrderDetail', {
-              method: 'post',
-              data: {
-                billNo: orderNo
-              }
-            });
-          case 2:
-            _yield$request = _context.sent;
-            success = _yield$request.success;
-            data = _yield$request.data;
-            if (success) {
+            bsUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, {
                 orders: (data === null || data === void 0 ? void 0 : data.orders) || [],
                 showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
@@ -17307,10 +18401,10 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
 
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -17322,22 +18416,11 @@ var index$3 = (function (props) {
   }();
   var getWlnOrderList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
-      var _yield$request2, success, data, _valueRef$current2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return extendRequest('/qy/gdfw/order/wlnOrderList', {
-              method: 'post',
-              data: {
-                billCode: orderNo
-              }
-            });
-          case 2:
-            _yield$request2 = _context2.sent;
-            success = _yield$request2.success;
-            data = _yield$request2.data;
-            if (success) {
+            wlnUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var _valueRef$current2;
               _onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}), {}, {
                 orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
                   return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -17354,9 +18437,9 @@ var index$3 = (function (props) {
                   };
                 })
               }));
-            }
+            });
             onceRef.current = false;
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -17380,11 +18463,13 @@ var index$3 = (function (props) {
                 showOrderInfo: trades.map(function (_ref4) {
                   var billNo = _ref4.billNo,
                     billType = _ref4.billType,
-                    billTag = _ref4.billTag;
+                    billTag = _ref4.billTag,
+                    tradeStatusValue = _ref4.tradeStatusValue;
                   return {
                     billNo: billNo,
                     billType: billType,
-                    billTag: billTag
+                    billTag: billTag,
+                    tradeStatusValue: tradeStatusValue
                   };
                 })
               }));
@@ -17498,6 +18583,7 @@ var index$3 = (function (props) {
                     deliveryState = _ref10.deliveryState,
                     vipCode = _ref10.vipCode,
                     shopCode = _ref10.shopCode,
+                    cancel = _ref10.cancel,
                     rest = _objectWithoutProperties(_ref10, _excluded$h);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     billNo: billNo,
@@ -17505,6 +18591,7 @@ var index$3 = (function (props) {
                     billTag: billTag,
                     tradeTagName: tradeTagName,
                     deliveryState: deliveryState,
+                    cancelName: cancel ? '是' : '否',
                     deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
                     vipCode: vipCode,
                     shopCode: shopCode
@@ -17694,6 +18781,31 @@ var componentMap$1 = {
       returnDeleteGood: 'jstReturnDeleteGood',
       exchangeDeleteGood: 'jstExchangeDeleteGood'
     }
+  },
+  KM_GOODS: {
+    type: 'km',
+    key: 'kmGoods',
+    name: '快麦',
+    orderNo: 'tid',
+    goodDetailOrderNo: 'originalDealCode',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'kmType',
+      updateGoodsHandle: updateKmGoodsHandle,
+      selectListReturn: 'kmSelectListReturn',
+      selectList: 'kmSelectList',
+      reissueSelectList: 'kmReissueSelectList',
+      reissueSelectListReturn: 'kmReissueSelectListReturn',
+      reissueDeleteGood: 'kmReissueDeleteGood',
+      changeShopCode: 'kmChangeShopCode',
+      reissueType: 'kmReissueType',
+      returnType: 'kmReturnType',
+      returnSelectListReturn: 'kmReturnSelectListReturn',
+      returnSelectList: 'kmReturnSelectList',
+      deleteGood: 'kmDeleteGood',
+      returnDeleteGood: 'kmReturnDeleteGood',
+      exchangeDeleteGood: 'kmExchangeDeleteGood'
+    }
   }
 };
 var CommonGoods = function CommonGoods(props) {
@@ -17702,7 +18814,7 @@ var CommonGoods = function CommonGoods(props) {
     disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
-  console.log('value?.orders', value === null || value === void 0 ? void 0 : value.orders);
+  // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
   var showModeBtn = !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
@@ -17855,7 +18967,9 @@ var CommonGoods = function CommonGoods(props) {
   var getGoodDetails = function getGoodDetails(_ref2) {
     var mode = _ref2.mode;
     var updateHandle = componentMap$1[compType].eventNameMap['updateGoodsHandle'];
-    var goodDetails = updateHandle(value.orders || []);
+    var goodDetails = updateHandle(value.orders || [], {
+      orderBackGoodsLevel: props.orderBackGoodsLevel
+    });
     var orderNo = value.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       var _componentMap$compTyp;
@@ -17909,7 +19023,8 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    compType = props.type;
+    compType = props.type,
+    isSettingConfig = props.isSettingConfig;
   var valueRef = useRef({});
   useEffect(function () {
     var subscription = pubsub.subscribe(componentMap$2[compType].eventNameMap.exchangeCopyGood, function () {
@@ -18001,7 +19116,7 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     var newValue = _objectSpread2({}, value);
     newValue[componentMap$2[compType].returnTypeKey] = val;
     newValue[componentMap$2[compType].valueKey] = [];
-    if (['2'].includes(val[0])) {
+    if (isSettingConfig || ['2'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       valueRef.current = newValue;
     }
@@ -18023,7 +19138,7 @@ var CommonReturnGoods = function CommonReturnGoods(props) {
     style: {
       marginBottom: '8px'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value[componentMap$2[compType].returnTypeKey],
@@ -18205,7 +19320,7 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   })));
 };
 
-var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$i = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$1 = {
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
@@ -18226,13 +19341,14 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s5, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _value$wdtSystemOrder, _typeMap$type23, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s5, _typeMap$type27, _typeMap$type28, _typeMap$type29;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
+    isSettingConfig = props.isSettingConfig,
     other = _objectWithoutProperties(props, _excluded$i);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$wdtSystemOrder = value.wdtSystemOrder) === null || _value$wdtSystemOrder === void 0 ? void 0 : _value$wdtSystemOrder.orders) || []).some(function (order) {
     var _order$srcTid;
@@ -18296,11 +19412,13 @@ var wdtReissue = function wdtReissue(props) {
               var showOrderInfo = orders.map(function (_ref2) {
                 var billNo = _ref2.billNo,
                   billType = _ref2.billType,
-                  billTag = _ref2.billTag;
+                  billTag = _ref2.billTag,
+                  tradeStatusValue = _ref2.tradeStatusValue;
                 return {
                   billNo: billNo,
                   billType: billType,
-                  billTag: billTag
+                  billTag: billTag,
+                  tradeStatusValue: tradeStatusValue
                 };
               });
               onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) || {}), {}, {
@@ -18383,7 +19501,7 @@ var wdtReissue = function wdtReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type21, _typeMap$type22, _uniqBy, _typeMap$type23;
+    var _typeMap$type21, _typeMap$type22, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -18394,14 +19512,14 @@ var wdtReissue = function wdtReissue(props) {
     newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)], isStrict]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _typeMap$type25;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]]);
+    var _typeMap$type24;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
@@ -18415,16 +19533,17 @@ var wdtReissue = function wdtReissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -18440,12 +19559,13 @@ var wdtReissue = function wdtReissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -18457,7 +19577,7 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -18473,7 +19593,7 @@ var wdtReissue = function wdtReissue(props) {
   })));
 };
 
-var _excluded$j = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$j = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$2 = {
   JST_REISSUE_GOODS: {
     compType: '补发',
@@ -18488,7 +19608,9 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'oId',
     outerOiIdKey: '',
-    goodDetailsKey: 'items'
+    goodDetailsKey: 'items',
+    mergeIdenticalGoods: jstMergeIdenticalGoods,
+    uniqueKey: 'uuid'
   },
   JST_RETURN_GOODS: {
     compType: '退货',
@@ -18504,6 +19626,8 @@ var typeMap$2 = {
     oIdKey: 'oId',
     outerOiIdKey: '',
     goodDetailsKey: 'items',
+    mergeIdenticalGoods: jstMergeIdenticalGoods,
+    uniqueKey: 'uuid',
     eventNameMap: {
       // pubsub 事件
       exchangeCopyGood: 'jstExchangeCopyGood',
@@ -18511,16 +19635,32 @@ var typeMap$2 = {
       returnGoodsSysorder: 'jstReturnGoodsSysorder',
       returnGoodsSysorderBack: 'jstReturnGoodsSysorderBack'
     }
+  },
+  KM_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'kmReissueGoods',
+    typeName: 'kmReissueType',
+    systemOrder: 'kmSystemOrder',
+    systemOrderNo: 'kmSystemOrderNo',
+    getOrderList: kmUtils.getOrderListSingleton,
+    updateGoodsHandle: updateKmGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'billNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'subOrders',
+    uniqueKey: 'id'
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type31, _typeMap$type34, _typeMap$type35, _typeMap$type36, _typeMap$type37, _value$typeMap$type$s6, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44;
+  var _typeMap$type32, _typeMap$type37, _typeMap$type38, _typeMap$type39, _typeMap$type40, _value$typeMap$type$s6, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
+    isSettingConfig = props.isSettingConfig,
     other = _objectWithoutProperties(props, _excluded$j);
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -18627,7 +19767,7 @@ var PublicReissue = function PublicReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19;
+    var _typeMap$type17, _typeMap$type18, _order$typeMap$type$g, _typeMap$type19, _typeMap$type20;
     var mode = _ref4.mode,
       sysOrderNo = _ref4.sysOrderNo;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrder];
@@ -18635,63 +19775,74 @@ var PublicReissue = function PublicReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[typeMap$2[type].oIdKey] === systemOrderNo;
     });
-    var goodDetails = jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? (_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], true) : []);
+    var orderRest = undefined;
+    if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
+      orderRest = true;
+    } else if (type === 'KM_REISSUE_GOODS') {
+      orderRest = {
+        orderBackGoodsLevel: props.orderBackGoodsLevel,
+        canEdit: true
+      };
+    }
+    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.updateGoodsHandle([order], orderRest)) : (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    var list = mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
     }) : goodDetails;
+    return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type20;
+    var _typeMap$type21;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type21, _typeMap$type22, _value$typeMap$type$t2, _typeMap$type27, _value$typeMap$type$t3, _typeMap$type29;
+    var _typeMap$type22, _typeMap$type23, _value$typeMap$type$t2, _typeMap$type28, _value$typeMap$type$t3, _typeMap$type30;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderBillType) {
-      var _value$typeMap$type$s5, _typeMap$type23, _typeMap$type25, _typeMap$type26;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orders) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderBillType) {
+      var _value$typeMap$type$s5, _typeMap$type24, _typeMap$type26, _typeMap$type27;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type24;
-        return oItem[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.oIdKey] === val;
+        var _typeMap$type25;
+        return oItem[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.oIdKey] === val;
       });
-      newValue[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type28;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type30;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = getGoodDetails({
+      newValue[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type29;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type31;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo]);
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type32, _typeMap$type33, _uniqBy;
+    var _typeMap$type33, _typeMap$type34, _uniqBy, _typeMap$type35;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      return skuList.includes(item.uuid);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type36;
+      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey]);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)], isStrict]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key) || "".concat(Date.now())
   }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
@@ -18702,16 +19853,17 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -18727,16 +19879,17 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderBillType) && /*#__PURE__*/React.createElement(Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -18745,7 +19898,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React.createElement(Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -18755,10 +19908,10 @@ var PublicReissue = function PublicReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.alwaysShowChooseErpGoodsBtn,
+    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.showErpGoodsBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -18769,6 +19922,7 @@ var PublicReissue = function PublicReissue(props) {
       originDataSource: getGoodDetails({
         mode: isStrict
       }),
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -19307,6 +20461,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
+    onBlur = props.onBlur,
     disabled = props.disabled,
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type;
@@ -19388,6 +20543,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'billNo');
     },
+    onBlur: onBlur,
     value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.billNo
   })) : null) : null);
 };
@@ -19529,6 +20685,64 @@ var MsgStatus = function MsgStatus(props) {
   }, "\u5931\u8D25\u539F\u56E0\uFF1A", (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reason) : null) : null);
 };
 
+var _excluded$n = ["mode", "maxSelectCount", "showOnly", "getOptionsAsync", "onChange"];
+var AsyncSelect = function AsyncSelect(props) {
+  var mode = props.mode,
+    maxSelectCount = props.maxSelectCount,
+    _props$showOnly = props.showOnly,
+    showOnly = _props$showOnly === void 0 ? false : _props$showOnly,
+    getOptionsAsync = props.getOptionsAsync,
+    _onChange = props.onChange,
+    otherProps = _objectWithoutProperties(props, _excluded$n);
+  var _React$useState = React.useState([]),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    data = _React$useState2[0],
+    setData = _React$useState2[1];
+  React.useEffect(function () {
+    getOptionsAsync === null || getOptionsAsync === void 0 ? void 0 : getOptionsAsync().then(function (list) {
+      setData(list);
+    });
+  }, []);
+  var options = [].concat(_toConsumableArray(props.options || []), _toConsumableArray(data || []));
+  var getValueString = function getValueString(value) {
+    var list = options;
+    if (mode === 'multiple' && Array.isArray(value)) {
+      var _list$filter$map$join;
+      return (_list$filter$map$join = list.filter(function (item) {
+        return value.includes(item.value);
+      }).map(function (item) {
+        return item.label;
+      }).join('，')) !== null && _list$filter$map$join !== void 0 ? _list$filter$map$join : '--';
+    } else {
+      var selectedItem = list.find(function (item) {
+        return item.value === value;
+      });
+      return selectedItem ? selectedItem.label : value !== null && value !== void 0 ? value : '--';
+    }
+  };
+  if (showOnly) {
+    return getValueString(props.value);
+  }
+  return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+    showArrow: true,
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    },
+    notFoundContent: null
+  }, otherProps), {}, {
+    options: options,
+    mode: mode,
+    onChange: function onChange(value, option) {
+      if (mode === 'multiple' && maxSelectCount && maxSelectCount < value.length) {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value.slice(-maxSelectCount), option);
+      } else {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value, option);
+      }
+    }
+  }));
+};
+
 var CalculationInput = function CalculationInput(props) {
   var _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config;
@@ -19547,7 +20761,7 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-var _excluded$n = ["value", "onChange", "reasonList", "disabled", "type"];
+var _excluded$o = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"];
 var typeMap$3 = {
   BS_E3_REISSUE_GOODS: {
     key: 'bsE3ReissueGoods',
@@ -19565,7 +20779,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$n);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$o);
   var getOrderFlag = useRef(false);
   var valueRef = useRef(null);
   var _useState = useState(false),
@@ -19725,7 +20940,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
@@ -19750,9 +20966,10 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type27 = typeMap$3[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
@@ -19783,7 +21000,11 @@ var bsE3Reissue = function bsE3Reissue(props) {
   })));
 };
 
-var _excluded$o = ["value", "onChange", "reasonList", "disabled", "type"],
+var css_248z$c = ".index-module_systemNoDisabled__1s7aJ.ant-select-item-option-disabled {\n  color: #dadada !important;\n}\n";
+var styles$5 = {"systemNoDisabled":"index-module_systemNoDisabled__1s7aJ"};
+styleInject(css_248z$c);
+
+var _excluded$p = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
   _excluded2 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$4 = {
   GY_REISSUE_GOODS: {
@@ -19805,17 +21026,19 @@ var typeMap$4 = {
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
+  var _typeMap$type29, _typeMap$type30, _typeMap$type31, _systemOrder$orders, _typeMap$type32, _value$typeMap$type$s7, _typeMap$type33, _typeMap$type34, _typeMap$type35;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$o);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$p);
   // const showModeBtn = (value?.gySystemOrder?.orders || []).some((order: any) =>
   //   order?.platformCode?.includes(';'),
   // );
+  var getVipCodeFlag = useRef(false);
   var getOrderFlag = useRef(false);
   var valueRef = useRef(null);
   var _useState = useState(false),
@@ -19823,23 +21046,27 @@ var GyReissue = function GyReissue(props) {
     isStrict = _useState2[0],
     setIsStrict = _useState2[1];
   useEffect(function () {
-    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2;
+    var _value$typeMap$type$s, _value$typeMap$type$s2, _typeMap$type, _value$typeMap$type$s3, _typeMap$type2, _typeMap$type4, _value$typeMap$type$s5, _typeMap$type5;
     valueRef.current = value;
     if (!getOrderFlag.current && !(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type = typeMap$4[type]) === null || _typeMap$type === void 0 ? void 0 : _typeMap$type.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : (_value$typeMap$type$s2 = _value$typeMap$type$s.orders) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.length) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s3 = value[(_typeMap$type2 = typeMap$4[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.systemOrder]) === null || _value$typeMap$type$s3 === void 0 ? void 0 : _value$typeMap$type$s3.orderNo)) {
       var _value$typeMap$type$s4, _typeMap$type3;
       getOrderFlag.current = true;
       getOrderList(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s4 = value[(_typeMap$type3 = typeMap$4[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.systemOrder]) === null || _value$typeMap$type$s4 === void 0 ? void 0 : _value$typeMap$type$s4.orderNo);
+    } else if (!getVipCodeFlag.current && (value === null || value === void 0 ? void 0 : value[(_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.systemOrderNo]) && !(value === null || value === void 0 ? void 0 : value.vipCode) && (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.orderNo)) {
+      var _value$typeMap$type$s6, _typeMap$type6;
+      getVipCodeFlag.current = true;
+      getVipCode(value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orderNo);
     }
     return;
   }, [value]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
-      var _typeMap$type4;
+      var _typeMap$type7;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            (_typeMap$type4 = typeMap$4[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
-              var _typeMap$type5, _ref3, _typeMap$type6, _typeMap$type7, _ref4, _typeMap$type8;
+            (_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.getOrderList(orderNo).then(function (data) {
+              var _typeMap$type8, _ref3, _typeMap$type9, _orders$, _orders$2, _objectSpread2$1;
               var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
               var showOrderInfo = orders.map(function (_ref2) {
                 var billNo = _ref2.billNo,
@@ -19861,17 +21088,15 @@ var GyReissue = function GyReissue(props) {
                   shopCode: shopCode
                 });
               });
+              var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, (_objectSpread2$1 = {}, _defineProperty(_objectSpread2$1, (_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.systemOrder]) || {}), {}, {
+                showOrderInfo: showOrderInfo,
+                orders: orders
+              })), _defineProperty(_objectSpread2$1, "shopCode", (valueRef.current || {}).shopCode || (orders === null || orders === void 0 ? void 0 : (_orders$ = orders[0]) === null || _orders$ === void 0 ? void 0 : _orders$.shopCode)), _defineProperty(_objectSpread2$1, "vipCode", (valueRef.current || {}).vipCode || (orders === null || orders === void 0 ? void 0 : (_orders$2 = orders[0]) === null || _orders$2 === void 0 ? void 0 : _orders$2.vipCode)), _objectSpread2$1));
               pushGyLog('getOrderList', {
                 before: valueRef.current,
-                after: _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$4[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$4[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) || {}), {}, {
-                  showOrderInfo: showOrderInfo,
-                  orders: orders
-                })))
+                after: newValue
               });
-              onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type7 = typeMap$4[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref4 = valueRef.current || {}) === null || _ref4 === void 0 ? void 0 : _ref4[(_typeMap$type8 = typeMap$4[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.systemOrder]) || {}), {}, {
-                showOrderInfo: showOrderInfo,
-                orders: orders
-              }))));
+              onChange(newValue);
             });
           case 1:
           case "end":
@@ -19883,42 +21108,71 @@ var GyReissue = function GyReissue(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getVipCode = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      var _typeMap$type10;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", (_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.getOrderList(orderNo).then(function (data) {
+              var _orders$3, _orders$4;
+              var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
+              var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
+                shopCode: (valueRef.current || {}).shopCode || (orders === null || orders === void 0 ? void 0 : (_orders$3 = orders[0]) === null || _orders$3 === void 0 ? void 0 : _orders$3.shopCode),
+                vipCode: (valueRef.current || {}).vipCode || (orders === null || orders === void 0 ? void 0 : (_orders$4 = orders[0]) === null || _orders$4 === void 0 ? void 0 : _orders$4.vipCode)
+              });
+              pushGyLog('getVipCode', {
+                before: valueRef.current,
+                after: newValue
+              });
+              onChange(newValue);
+            }));
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getVipCode(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _ref5, _ref5$typeMap$type$ty, _typeMap$type9, _typeMap$type10;
+    var _ref5, _ref5$typeMap$type$ty, _typeMap$type11, _typeMap$type12;
     pushGyLog('beforeChangeType', valueRef.current || {});
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === ((_ref5 = valueRef.current || {}) === null || _ref5 === void 0 ? void 0 : (_ref5$typeMap$type$ty = _ref5[(_typeMap$type9 = typeMap$4[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName]) === null || _ref5$typeMap$type$ty === void 0 ? void 0 : _ref5$typeMap$type$ty[0])) return;
+    if (typeName === ((_ref5 = valueRef.current || {}) === null || _ref5 === void 0 ? void 0 : (_ref5$typeMap$type$ty = _ref5[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _ref5$typeMap$type$ty === void 0 ? void 0 : _ref5$typeMap$type$ty[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, valueRef.current || {});
-    newValue[(_typeMap$type10 = typeMap$4[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName] = val;
+    newValue[(_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type11;
-      newValue[(_typeMap$type11 = typeMap$4[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key] = getGoodDetails({
+      var _typeMap$type13;
+      newValue[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type12;
+      var _typeMap$type14;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type12 = typeMap$4[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = [];
+      newValue[(_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key] = [];
     }
     pushGyLog('afterChangeType', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _ref6, _ref6$typeMap$type$ty, _typeMap$type13, _typeMap$type14;
-    var isOriginalOrder = ((_ref6 = valueRef.current || {}) === null || _ref6 === void 0 ? void 0 : (_ref6$typeMap$type$ty = _ref6[(_typeMap$type13 = typeMap$4[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName]) === null || _ref6$typeMap$type$ty === void 0 ? void 0 : _ref6$typeMap$type$ty[0]) === '1';
+    var _ref6, _ref6$typeMap$type$ty, _typeMap$type15, _typeMap$type16;
+    var isOriginalOrder = ((_ref6 = valueRef.current || {}) === null || _ref6 === void 0 ? void 0 : (_ref6$typeMap$type$ty = _ref6[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName]) === null || _ref6$typeMap$type$ty === void 0 ? void 0 : _ref6$typeMap$type$ty[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type14 = typeMap$4[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key, getGoodDetails({
       mode: mode
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref7) {
-    var _ref8, _typeMap$type15, _ref9, _typeMap$type16, _order$details;
+    var _ref8, _typeMap$type17, _ref9, _typeMap$type18, _order$details;
     var mode = _ref7.mode,
       sysOrderNo = _ref7.sysOrderNo;
-    var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type15 = typeMap$4[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type16 = typeMap$4[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.systemOrderNo];
+    var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
@@ -19929,29 +21183,29 @@ var GyReissue = function GyReissue(props) {
     }) : goodDetails;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type17;
+    var _typeMap$type19;
     pushGyLog('beforeChangeGood', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type17 = typeMap$4[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.key)] = (val || []).map(function (item) {
-      var _typeMap$type18, _typeMap$type19;
-      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type18 = typeMap$4[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.formatDefaultField.share)] = 0;
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)] = (val || []).map(function (item) {
+      var _typeMap$type20, _typeMap$type21;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.formatDefaultField.share)] = 0;
       return item;
     });
     pushGyLog('afterChangeGood', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type20, _ref10, _ref10$typeMap$type$t, _typeMap$type21, _ref11, _ref11$typeMap$type$t, _typeMap$type23;
+    var _typeMap$type22, _ref10, _ref10$typeMap$type$t, _typeMap$type23, _ref11, _ref11$typeMap$type$t, _typeMap$type25;
     pushGyLog('beforeChangeSystemOrder', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo)] = val;
-    if (['2'].includes((_ref10 = valueRef.current || {}) === null || _ref10 === void 0 ? void 0 : (_ref10$typeMap$type$t = _ref10[(_typeMap$type21 = typeMap$4[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _ref10$typeMap$type$t === void 0 ? void 0 : _ref10$typeMap$type$t[0])) {
-      var _typeMap$type22;
-      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = [];
-    } else if (['1'].includes((_ref11 = valueRef.current || {}) === null || _ref11 === void 0 ? void 0 : (_ref11$typeMap$type$t = _ref11[(_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _ref11$typeMap$type$t === void 0 ? void 0 : _ref11$typeMap$type$t[0])) {
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type22 = typeMap$4[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo)] = val;
+    if (['2'].includes((_ref10 = valueRef.current || {}) === null || _ref10 === void 0 ? void 0 : (_ref10$typeMap$type$t = _ref10[(_typeMap$type23 = typeMap$4[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _ref10$typeMap$type$t === void 0 ? void 0 : _ref10$typeMap$type$t[0])) {
       var _typeMap$type24;
-      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = getGoodDetails({
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type24 = typeMap$4[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = [];
+    } else if (['1'].includes((_ref11 = valueRef.current || {}) === null || _ref11 === void 0 ? void 0 : (_ref11$typeMap$type$t = _ref11[(_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.typeName]) === null || _ref11$typeMap$type$t === void 0 ? void 0 : _ref11$typeMap$type$t[0])) {
+      var _typeMap$type26;
+      newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -19960,7 +21214,7 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _ref12, _typeMap$type25, _typeMap$type26, _uniqBy, _typeMap$type27;
+    var _ref12, _typeMap$type27, _typeMap$type28, _uniqBy;
     pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
@@ -19968,68 +21222,66 @@ var GyReissue = function GyReissue(props) {
       mode: isStrict
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type25 = typeMap$4[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]) || [];
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type26 = typeMap$4[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type27 = typeMap$4[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var showChangeBtn = useMemo(function () {
-    var _typeMap$type29;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
-  return /*#__PURE__*/React.createElement("div", {
-    id: "TEST_GY",
-    onClick: function onClick() {
-      console.log('TEST_GY', value);
-    }
-  }, /*#__PURE__*/React.createElement(Row, {
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder];
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo]);
+  var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
   }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
-      span: 6
+      span: 8
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
+      className: styles$5.systemNoDisabled,
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', item.billNo);
   }))), /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -20040,8 +21292,10 @@ var GyReissue = function GyReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
+    showErpGoodsBtn: showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
@@ -20056,7 +21310,7 @@ var GyReissue = function GyReissue(props) {
   })));
 };
 
-var _excluded$p = ["value", "onChange", "reasonList", "disabled", "type"],
+var _excluded$q = ["value", "onChange", "reasonList", "disabled", "type", "isSettingConfig"],
   _excluded2$1 = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
 var typeMap$5 = {
   GY_RETURN_GOODS: {
@@ -20078,14 +21332,15 @@ var typeMap$5 = {
   }
 };
 var GyReturnGoods = function GyReturnGoods(props) {
-  var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
+  var _typeMap$type9, _typeMap$type26, _systemOrder$orders, _typeMap$type27, _typeMap$type28, _value$typeMap$type$s5, _typeMap$type29, _typeMap$type30, _typeMap$type31;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     type = props.type,
-    other = _objectWithoutProperties(props, _excluded$p);
+    isSettingConfig = props.isSettingConfig,
+    other = _objectWithoutProperties(props, _excluded$q);
   var valueRef = useRef({});
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -20148,7 +21403,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             (_typeMap$type4 = typeMap$5[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.getOrderList(orderNo).then(function (data) {
-              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6;
+              var _valueRef$current, _typeMap$type5, _typeMap$type$systemO, _ref3, _valueRef$current2, _typeMap$type6, _orders$, _objectSpread2$1;
               var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
               var showOrderInfo = orders.map(function (_ref2) {
                 var billNo = _ref2.billNo,
@@ -20170,10 +21425,10 @@ var GyReturnGoods = function GyReturnGoods(props) {
                   shopCode: shopCode
                 });
               });
-              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, _defineProperty({}, (_typeMap$type5 = typeMap$5[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$5[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, (_valueRef$current = valueRef.current) !== null && _valueRef$current !== void 0 ? _valueRef$current : {}), {}, (_objectSpread2$1 = {}, _defineProperty(_objectSpread2$1, (_typeMap$type5 = typeMap$5[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, (_typeMap$type$systemO = (_ref3 = (_valueRef$current2 = valueRef.current) !== null && _valueRef$current2 !== void 0 ? _valueRef$current2 : {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type6 = typeMap$5[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]) !== null && _typeMap$type$systemO !== void 0 ? _typeMap$type$systemO : {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
-              }))));
+              })), _defineProperty(_objectSpread2$1, "shopCode", (valueRef.current || {}).shopCode || (orders === null || orders === void 0 ? void 0 : (_orders$ = orders[0]) === null || _orders$ === void 0 ? void 0 : _orders$.shopCode)), _objectSpread2$1)));
             });
           case 1:
           case "end":
@@ -20186,7 +21441,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
     };
   }();
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _typeMap$type7, _typeMap$type8, _uniqBy, _typeMap$type9;
+    var _typeMap$type7, _typeMap$type8, _uniqBy;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
@@ -20197,49 +21452,49 @@ var GyReturnGoods = function GyReturnGoods(props) {
     newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type8 = typeMap$5[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
-    console.log('商品发生变化', newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type9 = typeMap$5[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)]);
+    // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type10 = typeMap$5[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type9 = typeMap$5[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.key)], isStrict]);
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _value$typeMap$type$t, _typeMap$type11, _typeMap$type12;
+    var _value$typeMap$type$t, _typeMap$type10, _typeMap$type11;
     var typeName = val === null || val === void 0 ? void 0 : val[0];
-    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type11 = typeMap$5[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
+    if (typeName === (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type10 = typeMap$5[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) return;
     // const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
     var newValue = _objectSpread2({}, value);
-    newValue[(_typeMap$type12 = typeMap$5[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.typeName] = val;
+    newValue[(_typeMap$type11 = typeMap$5[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.typeName] = val;
     if (typeName === '1') {
-      var _typeMap$type13;
-      newValue[(_typeMap$type13 = typeMap$5[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = getGoodDetails({
+      var _typeMap$type12;
+      newValue[(_typeMap$type12 = typeMap$5[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key] = getGoodDetails({
         mode: isStrict
       });
     } else if (typeName === '2') {
-      var _typeMap$type14;
+      var _typeMap$type13;
       // 切换到非原单，清空列表
-      newValue[(_typeMap$type14 = typeMap$5[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key] = [];
+      newValue[(_typeMap$type13 = typeMap$5[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.key] = [];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type15;
+    var _typeMap$type14;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type15 = typeMap$5[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key)] = (val || []).map(function (item) {
-      var _typeMap$type16, _typeMap$type17;
-      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type16 = typeMap$5[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.money)] = 0;
-      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type17 = typeMap$5[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.share)] = 0;
+    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type14 = typeMap$5[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = (val || []).map(function (item) {
+      var _typeMap$type15, _typeMap$type16;
+      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type15 = typeMap$5[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.formatDefaultField.money)] = 0;
+      item["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type16 = typeMap$5[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type18, _value$typeMap$type$t2, _typeMap$type19, _value$typeMap$type$t3, _typeMap$type21;
+    var _typeMap$type17, _value$typeMap$type$t2, _typeMap$type18, _value$typeMap$type$t3, _typeMap$type20;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type18 = typeMap$5[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrderNo)] = val;
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type19 = typeMap$5[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type20;
-      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type20 = typeMap$5[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type21 = typeMap$5[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type22;
-      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type22 = typeMap$5[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = getGoodDetails({
+    newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type17 = typeMap$5[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.systemOrderNo)] = val;
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type18 = typeMap$5[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type19;
+      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type19 = typeMap$5[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type20 = typeMap$5[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type21;
+      newValue["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type21 = typeMap$5[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -20247,11 +21502,11 @@ var GyReturnGoods = function GyReturnGoods(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type23, _typeMap$type24, _order$details;
+    var _typeMap$type22, _typeMap$type23, _order$details;
     var mode = _ref4.mode,
       sysOrderNo = _ref4.sysOrderNo;
-    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$5[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrder];
-    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$5[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo];
+    var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$5[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrder];
+    var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$5[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
@@ -20262,63 +21517,66 @@ var GyReturnGoods = function GyReturnGoods(props) {
     }) : goodDetails;
   };
   var handleModeChange = function handleModeChange(mode) {
-    var _value$typeMap$type$t4, _typeMap$type25, _typeMap$type26;
-    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type25 = typeMap$5[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0]) === '1';
+    var _value$typeMap$type$t4, _typeMap$type24, _typeMap$type25;
+    var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type24 = typeMap$5[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0]) === '1';
     setIsStrict(mode);
     if (!isOriginalOrder) return;
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type26 = typeMap$5[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key, getGoodDetails({
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type25 = typeMap$5[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key, getGoodDetails({
       mode: mode
     }))));
   };
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var showChangeBtn = useMemo(function () {
-    var _typeMap$type27;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$5[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder];
+  var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8,
     wrap: true
   }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
-      span: 6
+      span: 8
     }
   }, /*#__PURE__*/React.createElement(Select, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type29 = typeMap$5[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u9000\u8D27\u7684\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$5[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type29 = typeMap$5[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
+      className: styles$5.systemNoDisabled,
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item === null || item === void 0 ? void 0 : item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', " ", item.billNo);
   }))), /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
-      marginBottom: '8px'
+      marginBottom: '8px',
+      width: '100%'
     },
-    disabled: disabled,
+    disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type31 = typeMap$5[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type30 = typeMap$5[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -20330,13 +21588,14 @@ var GyReturnGoods = function GyReturnGoods(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type32 = typeMap$5[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$5 === null || typeMap$5 === void 0 ? void 0 : (_typeMap$type31 = typeMap$5[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     isStrict: isStrict,
-    showErpGoodsBtn: false,
+    showErpGoodsBtn: showErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict
@@ -20346,4 +21605,247 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-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, 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, 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, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };
+var css_248z$d = ".index-module_imageBox__1f2AI {\n  display: flex;\n  flex-wrap: wrap;\n}\n.index-module_imageBox__1f2AI .ant-upload {\n  padding: 0;\n  height: 80px;\n  width: 80px;\n  border: none;\n  border-radius: 2px;\n  background: #F2F3F5;\n  text-align: center;\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI .ant-upload .index-module_addBtn__1DY59 {\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI > span {\n  max-width: 100%;\n}\n.index-module_tips__1XQjf {\n  color: #4E5969;\n  font-size: 12px;\n}\n";
+var styles$6 = {"imageBox":"index-module_imageBox__1f2AI","addBtn":"index-module_addBtn__1DY59","tips":"index-module_tips__1XQjf"};
+styleInject(css_248z$d);
+
+var _excluded$r = ["maxCount", "maxSize", "onChange", "value", "disabled", "hostUrl", "canDownload", "actionUrl"];
+var Dragger$1 = Upload.Dragger;
+var fn$4 = function fn() {
+  return void 0;
+};
+var videoSuffixList = ['mp4', 'avi', 'mpeg', 'asf', 'mov', '3gp', 'wmv', 'rmvb'];
+var KmVideo = function KmVideo(_ref) {
+  var _ref$maxCount = _ref.maxCount,
+    maxCount = _ref$maxCount === void 0 ? 20 : _ref$maxCount,
+    _ref$maxSize = _ref.maxSize,
+    maxSize = _ref$maxSize === void 0 ? 500 : _ref$maxSize,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? fn$4 : _ref$onChange,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$hostUrl = _ref.hostUrl,
+    hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
+    _ref$canDownload = _ref.canDownload,
+    canDownload = _ref$canDownload === void 0 ? false : _ref$canDownload,
+    _ref$actionUrl = _ref.actionUrl,
+    actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
+    resetProps = _objectWithoutProperties(_ref, _excluded$r);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    fileUrl = _useState4[0],
+    setFileUrl = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    fileType = _useState6[0],
+    setFileType = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fileName = _useState8[0],
+    setFileName = _useState8[1];
+  var valueRef = useRef(value);
+  var uploadCount = useRef(0);
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    uploading = _useState10[0],
+    setUploading = _useState10[1];
+  var fileList = useMemo(function () {
+    return value.map(function (t, i) {
+      return _objectSpread2(_objectSpread2({}, t), {}, {
+        percent: 100,
+        uid: i + ''
+      });
+    });
+  }, [value]);
+  useEffect(function () {
+    valueRef.current = value;
+  }, [value]);
+  var asyncUpload = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+      var formData, fileName, _yield$request, success, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setUploading(true);
+            uploadCount.current++;
+            formData = new FormData();
+            formData.append('file', file);
+            fileName = "".concat(hooks(new Date().getTime()).format('YYYY-MM-DD hh:mm:ss'), "_").concat(file.name);
+            formData.append('fileName', fileName);
+            _context.prev = 6;
+            _context.next = 9;
+            return request(actionUrl, {
+              method: 'post',
+              body: formData
+            });
+          case 9:
+            _yield$request = _context.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            if (success) {
+              handleChange([].concat(_toConsumableArray(valueRef.current), [{
+                kmVideoName: file.name,
+                kmVideoUrl: "".concat(hostUrl, "/").concat(data)
+              }]));
+            }
+            _context.next = 18;
+            break;
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](6);
+            message.error('文件上传失败');
+          case 18:
+            _context.prev = 18;
+            uploadCount.current--;
+            if (uploadCount.current < 1) {
+              setUploading(false);
+            }
+            return _context.finish(18);
+          case 22:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[6, 15, 18, 22]]);
+    }));
+    return function asyncUpload(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var download = function download(url, name) {
+    if (url === null || url === void 0 ? void 0 : url.startsWith('https://erp-storage-video.oss-cn-beijing.aliyuncs.com')) {
+      window.open(url);
+      return;
+    }
+    fetch(url).then(function (res) {
+      return res.blob();
+    }).then(function (blob) {
+      var a = document.createElement('a');
+      document.body.appendChild(a);
+      a.style.display = 'none';
+      var url = window.URL.createObjectURL(blob);
+      a.href = url;
+      a.download = name;
+      a.click();
+      document.body.removeChild(a);
+      window.URL.revokeObjectURL(url);
+    });
+  };
+  var handleChange = function handleChange(list) {
+    valueRef.current = list;
+    onChange(list);
+  };
+  // 手动上传模式, 一直返回false
+  var beforeUpload = function beforeUpload(file, fileList) {
+    // console.log('beforeUpload', file);
+    var size = file.size / 1024 / 1024 < maxSize;
+    // TODO: 批量提交的时候
+    if ((fileList === null || fileList === void 0 ? void 0 : fileList.length) + value.length > maxCount) {
+      message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
+      return Upload.LIST_IGNORE;
+    }
+    if (!size) {
+      message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
+      return Upload.LIST_IGNORE;
+    }
+    asyncUpload(file);
+    return Upload.LIST_IGNORE;
+  };
+  var onRemove = function onRemove(file) {
+    var newValue = value.filter(function (item) {
+      return item.kmVideoUrl !== file.kmVideoUrl;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var onPreview = function onPreview(file) {
+    var _file$url;
+    var fileArr = file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('.');
+    var fileType = fileArr[fileArr.length - 1];
+    if (videoSuffixList.includes(fileType.toLowerCase())) {
+      setFileUrl(file === null || file === void 0 ? void 0 : file.url);
+      setFileName(file === null || file === void 0 ? void 0 : file.name);
+      setFileType('video');
+      setVisible(true);
+    } else {
+      window.open(file === null || file === void 0 ? void 0 : file.url);
+    }
+  };
+  var handleCancel = function handleCancel() {
+    setFileUrl('');
+    setFileName('');
+    setVisible(false);
+  };
+  return /*#__PURE__*/React.createElement(Spin, {
+    spinning: uploading
+  }, /*#__PURE__*/React.createElement("p", {
+    className: styles$6.tips
+  }, "\u5141\u8BB8\u4E0A\u4F20", maxCount, "\u4E2A\u6587\u4EF6\uFF0C\u652F\u6301", videoSuffixList.join('/'), "\u683C\u5F0F\u6587\u4EF6"), /*#__PURE__*/React.createElement("div", {
+    className: styles$6.imageBox
+  }, /*#__PURE__*/React.createElement(Dragger$1, _objectSpread2({
+    disabled: disabled,
+    multiple: true,
+    name: "file",
+    maxCount: maxCount,
+    beforeUpload: beforeUpload,
+    onPreview: onPreview,
+    fileList: fileList.map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        url: item.kmVideoUrl,
+        name: item.kmVideoName
+      });
+    }),
+    onRemove: onRemove,
+    accept: ".".concat(videoSuffixList.join(',.')),
+    iconRender: function iconRender(file) {
+      return /*#__PURE__*/React.createElement(Space, {
+        align: "center"
+      }, /*#__PURE__*/React.createElement(VideoCameraTwoTone, {
+        style: {
+          fontSize: 16
+        }
+      }), file.kmVideoType && "".concat(file.kmVideoType));
+    }
+  }, resetProps), /*#__PURE__*/React.createElement("span", {
+    className: styles$6.addBtn
+  }, "+"), /*#__PURE__*/React.createElement("p", {
+    className: styles$6.addBtn
+  }, "\u9009\u62E9\u6587\u4EF6")), /*#__PURE__*/React.createElement(Modal, {
+    visible: visible,
+    title: fileName,
+    footer: null,
+    onCancel: handleCancel
+  }, canDownload ? /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: function onClick() {
+      return download(fileUrl, fileName);
+    }
+  }, "\u4E0B\u8F7D") : /*#__PURE__*/React.createElement(CopyToClipboard, {
+    text: fileUrl,
+    onCopy: function onCopy() {
+      message.success('复制成功');
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "link"
+  }, "\u4E0B\u8F7D\u5730\u5740")), fileType === 'pic' ? /*#__PURE__*/React.createElement("img", {
+    alt: "example",
+    style: {
+      width: '100%'
+    },
+    src: fileUrl
+  }) : /*#__PURE__*/React.createElement("video", {
+    style: {
+      width: '100%',
+      height: '100%'
+    },
+    autoPlay: true,
+    controls: true,
+    src: fileUrl
+  }))));
+};
+
+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$6 as getKmColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };