@kmkf-fe-packages/basic-components 2.0.54-beta.42 → 2.0.54-beta.44

package/dist/index.esm.js

@@ -3,8 +3,8 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled } 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, tradeStatusMap, 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, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isBoolean, 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';
@@ -8131,17 +8131,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]);
@@ -8329,7 +8328,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'
       }
@@ -8340,7 +8339,7 @@ var SubForm = function SubForm(props) {
       size: "small",
       pagination: false,
       scroll: {
-        x: '100%'
+        x: 'max-content'
       },
       locale: {
         emptyText: '暂无数据'
@@ -8713,7 +8712,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],
@@ -8726,10 +8727,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;
@@ -8749,7 +8754,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: '',
@@ -8761,30 +8766,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'
     }, {
@@ -8794,10 +8799,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'
     }, {
@@ -8807,13 +8812,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), {}, {
@@ -9086,8 +9091,108 @@ 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 = 24;
+            break;
+          case 20:
+            _pageNo = params.pageNo, _pageSize = params.pageSize, title = params.title;
+            _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 24:
+          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: '确认',
@@ -9121,7 +9226,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), {}, {
@@ -9137,7 +9242,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) {
@@ -9152,7 +9257,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search, {
-    placeholder: platform === 'taobao' ? '宝贝链接，标题' : '商品ID',
+    placeholder: platform === 'taobao' ? searchParams.type === 'orderProduct' ? '宝贝标题' : '宝贝链接，标题' : '商品ID',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -9775,7 +9880,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),
@@ -9866,7 +9973,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:
@@ -9888,7 +9995,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) {
@@ -9907,7 +10018,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();
@@ -10164,6 +10277,8 @@ var GoodItem = function GoodItem(props) {
     shopId: shopId,
     maxLength: maxLength,
     changeSku: changeSku,
+    form: form,
+    isPriorityDisplayOfOrderNo: isPriorityDisplayOfOrderNo,
     onCancel: function onCancel() {
       setVisible(false);
     }
@@ -16098,10 +16213,6 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
       width: 150
-    }, {
-      dataIndex: 'outerId',
-      title: "\u5546\u5BB6\u7F16\u7801",
-      width: 150
     }, {
       dataIndex: 'skuSysId',
       title: "\u7CFB\u7EDF\u89C4\u683CID",
@@ -16176,7 +16287,7 @@ var getColumns$6 = function getColumns(_ref) {
       });
     }),
     KM_REISSUE_GOODS: [{
-      dataIndex: 'sysSkuPropertiesName',
+      dataIndex: 'skuPropertiesName',
       title: "\u89C4\u683C\u540D\u79F0",
       width: 250
     }, {
@@ -16191,10 +16302,6 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'title',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150
-    }, {
-      dataIndex: 'outerId',
-      title: "\u5546\u5BB6\u7F16\u7801",
-      width: 150
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -16207,6 +16314,10 @@ var getColumns$6 = function getColumns(_ref) {
       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",
@@ -16257,7 +16368,10 @@ var getColumns$6 = function getColumns(_ref) {
     }, {
       dataIndex: 'price',
       title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
     }, {
       dataIndex: 'payment',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -16273,7 +16387,7 @@ var getColumns$6 = function getColumns(_ref) {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val);
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
       dataIndex: 'type',

package/dist/index.js

@@ -8143,17 +8143,16 @@ var SubForm = function SubForm(props) {
     return [{
       dataIndex: 'index',
       title: '序号',
+      fixed: 'left',
+      width: 20,
       render: function render(val, record, index) {
-        return /*#__PURE__*/React__default['default'].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]);
@@ -8341,7 +8340,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'
       }
@@ -8352,7 +8351,7 @@ var SubForm = function SubForm(props) {
       size: "small",
       pagination: false,
       scroll: {
-        x: '100%'
+        x: 'max-content'
       },
       locale: {
         emptyText: '暂无数据'
@@ -8725,7 +8724,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 = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -8738,10 +8739,14 @@ var GoodsModal = function GoodsModal(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     goodList = _useState6[0],
     setGoodList = _useState6[1];
-  var _useState7 = React.useState(false),
+  var _useState7 = React.useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
+    orderNoItems = _useState8[0],
+    setOrderNoItems = _useState8[1];
+  var _useState9 = React.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;
@@ -8761,7 +8766,7 @@ var GoodsModal = function GoodsModal(props) {
   var handleSetGoodList = function handleSetGoodList(list) {
     return setGoodList(list.map(transformType));
   };
-  var _useState9 = React.useState({
+  var _useState11 = React.useState({
       apiName: 'queryItems',
       desc: true,
       numIids: '',
@@ -8773,30 +8778,30 @@ var GoodsModal = function GoodsModal(props) {
       cids: '',
       title: ''
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    searchParams = _useState10[0],
-    setSearch = _useState10[1];
-  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    total = _useState12[0],
-    setTotal = _useState12[1];
-  var _useState13 = React.useState(''),
+    searchParams = _useState12[0],
+    setSearch = _useState12[1];
+  var _useState13 = React.useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    platform = _useState14[0],
-    setPlatform = _useState14[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState15 = React.useState({}),
+    total = _useState14[0],
+    setTotal = _useState14[1];
+  var _useState15 = React.useState(''),
     _useState16 = _slicedToArray(_useState15, 2),
-    shopInfo = _useState16[0],
-    setShopInfo = _useState16[1]; //店铺信息
-  var _useState17 = React.useState(true),
+    platform = _useState16[0],
+    setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
+  var _useState17 = React.useState({}),
     _useState18 = _slicedToArray(_useState17, 2),
-    canSearch = _useState18[0],
-    setCanSearch = _useState18[1];
-  var _useState19 = React.useState([null]),
+    shopInfo = _useState18[0],
+    setShopInfo = _useState18[1]; //店铺信息
+  var _useState19 = React.useState(true),
     _useState20 = _slicedToArray(_useState19, 2),
-    nextKeyList = _useState20[0],
-    setNextKeyList = _useState20[1];
-  var _useState21 = React.useState([{
+    canSearch = _useState20[0],
+    setCanSearch = _useState20[1];
+  var _useState21 = React.useState([null]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    nextKeyList = _useState22[0],
+    setNextKeyList = _useState22[1];
+  var _useState23 = React.useState([{
       tab: '出售中',
       key: 'onSale'
     }, {
@@ -8806,10 +8811,10 @@ var GoodsModal = function GoodsModal(props) {
       tab: '已选择',
       key: 'select'
     }]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    tabs = _useState22[0],
-    setTabs = _useState22[1];
-  var _useState23 = React.useState([{
+    _useState24 = _slicedToArray(_useState23, 2),
+    tabs = _useState24[0],
+    setTabs = _useState24[1];
+  var _useState25 = React.useState([{
       name: '上架时间',
       value: 'list_time'
     }, {
@@ -8819,13 +8824,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 = React.useState([]),
-    _useState26 = _slicedToArray(_useState25, 2),
-    shell = _useState26[0],
-    setShell = _useState26[1];
+  var _useState27 = React.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), {}, {
@@ -9098,8 +9103,108 @@ var GoodsModal = function GoodsModal(props) {
     }
   }, [platform]);
   React.useEffect(function () {
-    platform && canSearch && getItem(searchParams, platform);
+    if (platform && canSearch) {
+      if (searchParams.type === 'orderProduct') {
+        getOrderProductItem(searchParams);
+      } else {
+        getItem(searchParams, platform);
+      }
+    }
   }, [searchParams, platform]);
+  React.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 lodash.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 kmkfUtils.servers.orderDetail({
+              shopId: shopId,
+              orderNo: orderNo
+            });
+          case 9:
+            res = _context2.sent;
+            if (res.success) {
+              _context2.next = 14;
+              break;
+            }
+            handleSetGoodList([]);
+            antd.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 = 24;
+            break;
+          case 20:
+            _pageNo = params.pageNo, _pageSize = params.pageSize, title = params.title;
+            _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 24:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[5,, 15, 18]]);
+    }));
+    return function getOrderProductItem(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: '选择宝贝',
     okText: '确认',
@@ -9133,7 +9238,7 @@ var GoodsModal = function GoodsModal(props) {
     style: {
       display: searchParams.type === 'select' ? 'none' : ''
     }
-  }, platform === 'taobao' && /*#__PURE__*/React__default['default'].createElement(antd.Radio.Group, {
+  }, /*#__PURE__*/React__default['default'].createElement("div", null, platform === 'taobao' && searchParams.type !== 'orderProduct' && /*#__PURE__*/React__default['default'].createElement(antd.Radio.Group, {
     value: searchParams.orderBy,
     onChange: function onChange(e) {
       setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9149,7 +9254,7 @@ var GoodsModal = function GoodsModal(props) {
       },
       key: sort.value
     }, sort.name, sort.value === searchParams.orderBy ? searchParams.desc ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u21BE") : /*#__PURE__*/React__default['default'].createElement("span", null, "\u21C2") : /*#__PURE__*/React__default['default'].createElement("span", null, "\u21C5"));
-  })), /*#__PURE__*/React__default['default'].createElement("div", null, platform === 'taobao' && /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+  }))), /*#__PURE__*/React__default['default'].createElement("div", null, platform === 'taobao' && searchParams.type !== 'orderProduct' && /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     className: "classify",
     value: searchParams.cids,
     onChange: function onChange(value) {
@@ -9164,7 +9269,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React__default['default'].createElement(Search, {
-    placeholder: platform === 'taobao' ? '宝贝链接，标题' : '商品ID',
+    placeholder: platform === 'taobao' ? searchParams.type === 'orderProduct' ? '宝贝标题' : '宝贝链接，标题' : '商品ID',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -9787,7 +9892,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 = React.useState(false),
@@ -9878,7 +9985,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:
@@ -9900,7 +10007,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) {
@@ -9919,7 +10030,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();
@@ -10176,6 +10289,8 @@ var GoodItem = function GoodItem(props) {
     shopId: shopId,
     maxLength: maxLength,
     changeSku: changeSku,
+    form: form,
+    isPriorityDisplayOfOrderNo: isPriorityDisplayOfOrderNo,
     onCancel: function onCancel() {
       setVisible(false);
     }
@@ -16110,10 +16225,6 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
       width: 150
-    }, {
-      dataIndex: 'outerId',
-      title: "\u5546\u5BB6\u7F16\u7801",
-      width: 150
     }, {
       dataIndex: 'skuSysId',
       title: "\u7CFB\u7EDF\u89C4\u683CID",
@@ -16188,7 +16299,7 @@ var getColumns$6 = function getColumns(_ref) {
       });
     }),
     KM_REISSUE_GOODS: [{
-      dataIndex: 'sysSkuPropertiesName',
+      dataIndex: 'skuPropertiesName',
       title: "\u89C4\u683C\u540D\u79F0",
       width: 250
     }, {
@@ -16203,10 +16314,6 @@ var getColumns$6 = function getColumns(_ref) {
       dataIndex: 'title',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150
-    }, {
-      dataIndex: 'outerId',
-      title: "\u5546\u5BB6\u7F16\u7801",
-      width: 150
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -16219,6 +16326,10 @@ var getColumns$6 = function getColumns(_ref) {
       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",
@@ -16269,7 +16380,10 @@ var getColumns$6 = function getColumns(_ref) {
     }, {
       dataIndex: 'price',
       title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
     }, {
       dataIndex: 'payment',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -16285,7 +16399,7 @@ var getColumns$6 = function getColumns(_ref) {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
     }, {
       dataIndex: 'type',

package/dist/src/common/Goods/RichItem.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FormInstance } from 'antd';
 import './richItem.less';
 type ShowHeaderObjType = {
     title: string;
@@ -26,6 +27,8 @@ export interface RichGoodProps {
     disabled?: boolean;
     changeSku?: boolean;
     width?: string | number;
+    form?: FormInstance;
+    isPriorityDisplayOfOrderNo?: boolean;
 }
 declare const GoodItem: (props: Partial<RichGoodProps>) => React.JSX.Element;
 export default GoodItem;

package/dist/src/common/Goods/goodModel.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FormInstance } from 'antd';
 import './index.less';
 interface GoodModelProps {
     visible: boolean;
@@ -10,6 +11,8 @@ interface GoodModelProps {
     changeSku?: boolean;
     width?: string | number;
     numIidType?: 'string' | 'number';
+    form?: FormInstance;
+    isPriorityDisplayOfOrderNo?: boolean;
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.54-beta.42",
+  "version": "2.0.54-beta.44",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.39",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.44",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "342798c257d1bb3c065e83ad52c47ef0a590041a"
+  "gitHead": "4dd27c75c1adbfe22938d0bd0f190ff3db278c58"
 }