@kmkf-fe-packages/basic-components 2.5.0-rc.0 → 2.8.0-rc.0

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, 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, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, updateSkxGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+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, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject, intersection, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -16673,7 +16673,21 @@ var getColumns$7 = function getColumns(_ref) {
         align: 'center',
         ellipsis: true
       });
-    })
+    }),
+    //[SKX]退货商品信息(TH)
+    SKX_RETURN_GOODS: [{
+      dataIndex: 'returnSkuEcode',
+      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
+      width: 200
+    }, {
+      dataIndex: 'returnSubOrderId',
+      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'returnBillNo',
+      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
+      width: 200
+    }]
   };
 };
 
@@ -17268,7 +17282,8 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     onChange: handleChangeSelectedKeys
   };
   var buttonTextMapping = {
-    SKX_GOODS: '选择发货单商品'
+    SKX_GOODS: '选择发货单商品',
+    SKX_RETURN_GOODS: '选择退货单商品'
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     type: "link",
@@ -17471,6 +17486,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'SKX_GOODS':
+        case 'SKX_RETURN_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -19493,7 +19509,8 @@ var OrderSubForm = function OrderSubForm(props) {
     onChange = props.onChange,
     _props$tableHeader = props.tableHeader,
     tableHeader = _props$tableHeader === void 0 ? [] : _props$tableHeader,
-    disabled = props.disabled,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
     maxCount = props.maxCount,
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
@@ -19542,7 +19559,7 @@ var OrderSubForm = function OrderSubForm(props) {
         isShow: true,
         isEdit: false,
         isRequired: false,
-        width: Number(next === null || next === void 0 ? void 0 : next.width) || 150
+        width: (next === null || next === void 0 ? void 0 : next.width) ? Number(next === null || next === void 0 ? void 0 : next.width) : 150
       };
       if (t && t.isShow) {
         prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, next), t), {}, {
@@ -19553,10 +19570,11 @@ var OrderSubForm = function OrderSubForm(props) {
     }, []);
   }, [orderSubformColumns, tableHeader]);
   var column = useMemo(function () {
-    return [{
+    var list = [{
       dataIndex: 'index',
       title: '序号',
       width: 80,
+      ellipsis: true,
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
@@ -19565,17 +19583,17 @@ var OrderSubForm = function OrderSubForm(props) {
             return deleteHandle(record.uuid);
           }
         });
-        // return <div style={{ width: 25 }}>{index + 1}</div>;
       }
     }].concat(_toConsumableArray(newTableHeader.map(function (t) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        ellipsis: true,
         dataIndex: t === null || t === void 0 ? void 0 : t.dataIndex,
         title: /*#__PURE__*/React.createElement("span", null, t.isRequired ? /*#__PURE__*/React.createElement("span", {
           style: {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        width: Number(t.width),
+        width: (t === null || t === void 0 ? void 0 : t.width) ? Number(t === null || t === void 0 ? void 0 : t.width) : 150,
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
           var isDisabled = t.isEdit || disabled;
@@ -19589,35 +19607,40 @@ var OrderSubForm = function OrderSubForm(props) {
           });
         }
       });
-    })), [disabled ? {} : {
-      dataIndex: 'operation',
-      title: '操作',
-      width: 70,
-      fixed: 'right',
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u6DFB\u52A0"
-        }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
-          style: {
-            fontSize: 18,
-            color: '#1890ff'
-          },
-          onClick: function onClick() {
-            return addHandle(index + 1);
-          }
-        })), /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u5220\u9664"
-        }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
-          style: {
-            fontSize: 18
-          },
-          onClick: function onClick() {
-            return deleteHandle(record.uuid);
-          }
-        })));
-      }
-    }]);
+    })));
+    if (!disabled) {
+      list.push({
+        dataIndex: 'operation',
+        title: '操作',
+        width: 70,
+        fixed: 'right',
+        render: function render(val, record, index) {
+          return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
+            title: "\u6DFB\u52A0"
+          }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
+            style: {
+              fontSize: 18,
+              color: '#1890ff'
+            },
+            onClick: function onClick() {
+              return addHandle(index + 1);
+            }
+          })), /*#__PURE__*/React.createElement(Tooltip, {
+            title: "\u5220\u9664"
+          }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
+            style: {
+              fontSize: 18
+            },
+            onClick: function onClick() {
+              return deleteHandle(record.uuid);
+            }
+          })));
+        }
+      });
+    }
+    return list;
   }, [newTableHeader, disabled, updateHandle]);
+  console.log('column', column);
   var orderModalColumns = useMemo(function () {
     return [{
       dataIndex: '',
@@ -19727,8 +19750,9 @@ var OrderSubForm = function OrderSubForm(props) {
     rowKey: 'uuid',
     size: "small",
     pagination: false,
+    tableLayout: "fixed",
     scroll: {
-      x: '100%'
+      x: 'max-content'
     },
     locale: {
       emptyText: !disabled && manual ? /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React.createElement(Button, {
@@ -23130,53 +23154,6 @@ var KmVideo = function KmVideo(_ref) {
   }))));
 };
 
-var singletonMap$8 = new Map();
-var getAllGoods = function getAllGoods(params, setLoading) {
-  var id = params.tid || params.onBillNo || '';
-  if (!singletonMap$8.has(id)) {
-    setLoading && setLoading(true);
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$8.delete(id);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/skxOrderDetail', {
-        method: 'post',
-        data: params
-      }).then(function (res) {
-        if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data, _res$data$orderDetail;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$orderDetail = _res$data.orderDetailInfoList) === null || _res$data$orderDetail === void 0 ? void 0 : _res$data$orderDetail.length) {
-            var orderDetailInfoList = res === null || res === void 0 ? void 0 : res.data.orderDetailInfoList;
-            res.data.trades = orderDetailInfoList[0].subOrderList.map(function (subItem) {
-              return {
-                onBillNo: orderDetailInfoList[0].onBillNo,
-                skuEcode: subItem.skuEcode,
-                subOrderId: subItem.subOrderId
-              };
-            });
-          }
-          resolve(res.data);
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$8.delete(id);
-          }, 1000 * 10);
-        } else {
-          doReject(res);
-        }
-      }).catch(doReject).finally(function () {
-        setLoading && setLoading(false);
-      });
-    });
-    singletonMap$8.set(id, p);
-  }
-  return singletonMap$8.get(id);
-};
-var skxUtils = {
-  getAllGoods: getAllGoods
-};
-
 var typeMap$6 = {
   SKX_OUTBOUND_NOTICE_NO: {
     key: 'onBillNo',
@@ -23200,10 +23177,10 @@ var typeMap$6 = {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              return _context.abrupt("return", skxUtils.getAllGoods({
+              return _context.abrupt("return", servers.SKX.querySkxOrderDetailSingleton({
                 tid: tradeId
-              }).then(function (data) {
-                var orderDetailInfoList = data.orderDetailInfoList || [];
+              }).then(function (res) {
+                var orderDetailInfoList = res.data.orderDetailInfoList || [];
                 return orderDetailInfoList;
               }));
             case 1:
@@ -23216,7 +23193,49 @@ var typeMap$6 = {
         return _asyncGetData.apply(this, arguments);
       }
       return asyncGetData;
-    }()
+    }(),
+    orderBack: skxSystemOrderBackValues
+  },
+  SKX_RETURN_BILL_NO: {
+    key: 'returnBillNo',
+    notDataText: '未获取到退换货单号',
+    placeholder: '请点击按钮选择或者输入TH退换货单号',
+    buttonText: '选择TH退换货单号',
+    columnHeaders: {
+      title: '退换货单号',
+      subListName: 'returnSubOrderList',
+      leftColumn: {
+        label: '[SKX]退货单明细-returnSkuEcode',
+        value: 'returnSkuEcode'
+      },
+      rightColumn: {
+        label: '[SKX]退货单-子订单号',
+        value: 'returnSubOrderId'
+      }
+    },
+    asyncGetData: function () {
+      var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tradeId) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", servers.SKX.queryReturnOrderDetailSingleton({
+                tid: tradeId
+              }).then(function (res) {
+                var skqReturnOrderDetailInfoDtos = res.data.skqReturnOrderDetailInfoDtos || [];
+                return skqReturnOrderDetailInfoDtos;
+              }));
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function asyncGetData(_x2) {
+        return _asyncGetData2.apply(this, arguments);
+      }
+      return asyncGetData;
+    }(),
+    orderBack: skxReturnSystemOrderBackValues
   }
 };
 var IdInputSelect = function IdInputSelect(props) {
@@ -23265,10 +23284,10 @@ var IdInputSelect = function IdInputSelect(props) {
     setInputValue(value);
   }, [value]);
   var asyncQueryData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var tradeId;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             tradeId = form.getFieldValue('m3ap1EvEyd');
             console.log('asyncQueryData---', {
@@ -23277,11 +23296,11 @@ var IdInputSelect = function IdInputSelect(props) {
               form: form
             });
             if (tradeId) {
-              _context2.next = 5;
+              _context3.next = 5;
               break;
             }
             setDataSource([]);
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 5:
             setSpinning(true);
             typeMap$6[type].asyncGetData(tradeId).then(function (data) {
@@ -23293,9 +23312,9 @@ var IdInputSelect = function IdInputSelect(props) {
             });
           case 7:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function asyncQueryData() {
       return _ref.apply(this, arguments);
@@ -23347,8 +23366,9 @@ var IdInputSelect = function IdInputSelect(props) {
         checked: value === group[typeMap$6[type].key],
         onChange: function onChange() {
           if (value !== group[typeMap$6[type].key]) {
+            var _typeMap$type$orderBa, _typeMap$type;
             handleChange(group[typeMap$6[type].key]);
-            skxSystemOrderBackValues({
+            (_typeMap$type$orderBa = (_typeMap$type = typeMap$6[type]).orderBack) === null || _typeMap$type$orderBa === void 0 ? void 0 : _typeMap$type$orderBa.call(_typeMap$type, {
               templateList: templateDetail,
               value: {
                 allOrders: [group]
@@ -23423,12 +23443,26 @@ var typeMap$7 = {
   SKX_GOODS: {
     key: 'skxGoods',
     uniqueKey: 'skuEcode',
+    formatTrade: formatTrade,
+    ordersKey: 'orderDetailInfoList',
     requestParams: {
       key: 'onBillNo',
       sourceUniqueKey: '78CADF2951',
-      request: skxUtils.getAllGoods
+      request: servers.SKX.querySkxOrderDetailSingleton
     },
     updateHandle: updateSkxGoodsHandle
+  },
+  SKX_RETURN_GOODS: {
+    key: 'skxReturnGoods',
+    uniqueKey: 'returnSkuEcode',
+    formatTrade: formatReturnTrade,
+    ordersKey: 'skqReturnOrderDetailInfoDtos',
+    requestParams: {
+      key: 'returnBillNo',
+      sourceUniqueKey: 'fe10d6f36b',
+      request: servers.SKX.queryReturnOrderDetailSingleton
+    },
+    updateHandle: updateSkxReturnGoodsHandle
   }
 };
 var SkxGoods = function SkxGoods(props) {
@@ -23463,9 +23497,11 @@ var SkxGoods = function SkxGoods(props) {
     if (!businessNo) {
       return Promise.resolve([]);
     }
-    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (data) {
+    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (_ref) {
+      var _data$typeMap$type$or, _data$typeMap$type$or2;
+      var data = _ref.data;
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+        allGoods: (data === null || data === void 0 ? void 0 : (_data$typeMap$type$or = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or === void 0 ? void 0 : _data$typeMap$type$or[0]) ? typeMap$7[type].updateHandle(typeMap$7[type].formatTrade(data === null || data === void 0 ? void 0 : (_data$typeMap$type$or2 = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or2 === void 0 ? void 0 : _data$typeMap$type$or2[0])) : []
       }));
     });
   };
@@ -23487,4 +23523,4 @@ var SkxGoods = function SkxGoods(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, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$6 as getKmColumns, getColumns$7 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, skxUtils };
+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, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$6 as getKmColumns, getColumns$7 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants };

package/dist/index.js

@@ -16685,7 +16685,21 @@ var getColumns$7 = function getColumns(_ref) {
         align: 'center',
         ellipsis: true
       });
-    })
+    }),
+    //[SKX]退货商品信息(TH)
+    SKX_RETURN_GOODS: [{
+      dataIndex: 'returnSkuEcode',
+      title: "[SKX]\u9000\u8D27\u5355\u660E\u7EC6-returnSkuEcode",
+      width: 200
+    }, {
+      dataIndex: 'returnSubOrderId',
+      title: "[SKX]\u9000\u8D27\u5355-\u5B50\u8BA2\u5355\u53F7",
+      width: 300
+    }, {
+      dataIndex: 'returnBillNo',
+      title: "[SKX]TH\u9000\u6362\u8D27\u5355\u53F7",
+      width: 200
+    }]
   };
 };
 
@@ -17280,7 +17294,8 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     onChange: handleChangeSelectedKeys
   };
   var buttonTextMapping = {
-    SKX_GOODS: '选择发货单商品'
+    SKX_GOODS: '选择发货单商品',
+    SKX_RETURN_GOODS: '选择退货单商品'
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
@@ -17483,6 +17498,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'SKX_GOODS':
+        case 'SKX_RETURN_GOODS':
           {
             columns = getColumnsMap$1({
               text: text,
@@ -19505,7 +19521,8 @@ var OrderSubForm = function OrderSubForm(props) {
     onChange = props.onChange,
     _props$tableHeader = props.tableHeader,
     tableHeader = _props$tableHeader === void 0 ? [] : _props$tableHeader,
-    disabled = props.disabled,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
     maxCount = props.maxCount,
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
@@ -19554,7 +19571,7 @@ var OrderSubForm = function OrderSubForm(props) {
         isShow: true,
         isEdit: false,
         isRequired: false,
-        width: Number(next === null || next === void 0 ? void 0 : next.width) || 150
+        width: (next === null || next === void 0 ? void 0 : next.width) ? Number(next === null || next === void 0 ? void 0 : next.width) : 150
       };
       if (t && t.isShow) {
         prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, next), t), {}, {
@@ -19565,10 +19582,11 @@ var OrderSubForm = function OrderSubForm(props) {
     }, []);
   }, [orderSubformColumns, tableHeader]);
   var column = React.useMemo(function () {
-    return [{
+    var list = [{
       dataIndex: 'index',
       title: '序号',
       width: 80,
+      ellipsis: true,
       render: function render(val, record, index) {
         return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
           index: index,
@@ -19577,17 +19595,17 @@ var OrderSubForm = function OrderSubForm(props) {
             return deleteHandle(record.uuid);
           }
         });
-        // return <div style={{ width: 25 }}>{index + 1}</div>;
       }
     }].concat(_toConsumableArray(newTableHeader.map(function (t) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        ellipsis: true,
         dataIndex: t === null || t === void 0 ? void 0 : t.dataIndex,
         title: /*#__PURE__*/React__default['default'].createElement("span", null, t.isRequired ? /*#__PURE__*/React__default['default'].createElement("span", {
           style: {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        width: Number(t.width),
+        width: (t === null || t === void 0 ? void 0 : t.width) ? Number(t === null || t === void 0 ? void 0 : t.width) : 150,
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
           var isDisabled = t.isEdit || disabled;
@@ -19601,35 +19619,40 @@ var OrderSubForm = function OrderSubForm(props) {
           });
         }
       });
-    })), [disabled ? {} : {
-      dataIndex: 'operation',
-      title: '操作',
-      width: 70,
-      fixed: 'right',
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Space, null, manual && /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          title: "\u6DFB\u52A0"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleFilled, {
-          style: {
-            fontSize: 18,
-            color: '#1890ff'
-          },
-          onClick: function onClick() {
-            return addHandle(index + 1);
-          }
-        })), /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          title: "\u5220\u9664"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
-          style: {
-            fontSize: 18
-          },
-          onClick: function onClick() {
-            return deleteHandle(record.uuid);
-          }
-        })));
-      }
-    }]);
+    })));
+    if (!disabled) {
+      list.push({
+        dataIndex: 'operation',
+        title: '操作',
+        width: 70,
+        fixed: 'right',
+        render: function render(val, record, index) {
+          return /*#__PURE__*/React__default['default'].createElement(antd.Space, null, manual && /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+            title: "\u6DFB\u52A0"
+          }, /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleFilled, {
+            style: {
+              fontSize: 18,
+              color: '#1890ff'
+            },
+            onClick: function onClick() {
+              return addHandle(index + 1);
+            }
+          })), /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+            title: "\u5220\u9664"
+          }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
+            style: {
+              fontSize: 18
+            },
+            onClick: function onClick() {
+              return deleteHandle(record.uuid);
+            }
+          })));
+        }
+      });
+    }
+    return list;
   }, [newTableHeader, disabled, updateHandle]);
+  console.log('column', column);
   var orderModalColumns = React.useMemo(function () {
     return [{
       dataIndex: '',
@@ -19739,8 +19762,9 @@ var OrderSubForm = function OrderSubForm(props) {
     rowKey: 'uuid',
     size: "small",
     pagination: false,
+    tableLayout: "fixed",
     scroll: {
-      x: '100%'
+      x: 'max-content'
     },
     locale: {
       emptyText: !disabled && manual ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -23142,53 +23166,6 @@ var KmVideo = function KmVideo(_ref) {
   }))));
 };
 
-var singletonMap$8 = new Map();
-var getAllGoods = function getAllGoods(params, setLoading) {
-  var id = params.tid || params.onBillNo || '';
-  if (!singletonMap$8.has(id)) {
-    setLoading && setLoading(true);
-    var p = new Promise(function (resolve, reject) {
-      var doReject = function doReject(err) {
-        // 清空掉错误的请求记录
-        singletonMap$8.delete(id);
-        reject(err);
-      };
-      extendRequest('/qy/gdfw/order/skxOrderDetail', {
-        method: 'post',
-        data: params
-      }).then(function (res) {
-        if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data, _res$data$orderDetail;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$orderDetail = _res$data.orderDetailInfoList) === null || _res$data$orderDetail === void 0 ? void 0 : _res$data$orderDetail.length) {
-            var orderDetailInfoList = res === null || res === void 0 ? void 0 : res.data.orderDetailInfoList;
-            res.data.trades = orderDetailInfoList[0].subOrderList.map(function (subItem) {
-              return {
-                onBillNo: orderDetailInfoList[0].onBillNo,
-                skuEcode: subItem.skuEcode,
-                subOrderId: subItem.subOrderId
-              };
-            });
-          }
-          resolve(res.data);
-          // 延迟10秒清除,保证订单的时效性
-          setTimeout(function () {
-            singletonMap$8.delete(id);
-          }, 1000 * 10);
-        } else {
-          doReject(res);
-        }
-      }).catch(doReject).finally(function () {
-        setLoading && setLoading(false);
-      });
-    });
-    singletonMap$8.set(id, p);
-  }
-  return singletonMap$8.get(id);
-};
-var skxUtils = {
-  getAllGoods: getAllGoods
-};
-
 var typeMap$6 = {
   SKX_OUTBOUND_NOTICE_NO: {
     key: 'onBillNo',
@@ -23212,10 +23189,10 @@ var typeMap$6 = {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              return _context.abrupt("return", skxUtils.getAllGoods({
+              return _context.abrupt("return", kmkfUtils.servers.SKX.querySkxOrderDetailSingleton({
                 tid: tradeId
-              }).then(function (data) {
-                var orderDetailInfoList = data.orderDetailInfoList || [];
+              }).then(function (res) {
+                var orderDetailInfoList = res.data.orderDetailInfoList || [];
                 return orderDetailInfoList;
               }));
             case 1:
@@ -23228,7 +23205,49 @@ var typeMap$6 = {
         return _asyncGetData.apply(this, arguments);
       }
       return asyncGetData;
-    }()
+    }(),
+    orderBack: kmkfUtils.skxSystemOrderBackValues
+  },
+  SKX_RETURN_BILL_NO: {
+    key: 'returnBillNo',
+    notDataText: '未获取到退换货单号',
+    placeholder: '请点击按钮选择或者输入TH退换货单号',
+    buttonText: '选择TH退换货单号',
+    columnHeaders: {
+      title: '退换货单号',
+      subListName: 'returnSubOrderList',
+      leftColumn: {
+        label: '[SKX]退货单明细-returnSkuEcode',
+        value: 'returnSkuEcode'
+      },
+      rightColumn: {
+        label: '[SKX]退货单-子订单号',
+        value: 'returnSubOrderId'
+      }
+    },
+    asyncGetData: function () {
+      var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tradeId) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", kmkfUtils.servers.SKX.queryReturnOrderDetailSingleton({
+                tid: tradeId
+              }).then(function (res) {
+                var skqReturnOrderDetailInfoDtos = res.data.skqReturnOrderDetailInfoDtos || [];
+                return skqReturnOrderDetailInfoDtos;
+              }));
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function asyncGetData(_x2) {
+        return _asyncGetData2.apply(this, arguments);
+      }
+      return asyncGetData;
+    }(),
+    orderBack: kmkfUtils.skxReturnSystemOrderBackValues
   }
 };
 var IdInputSelect = function IdInputSelect(props) {
@@ -23277,10 +23296,10 @@ var IdInputSelect = function IdInputSelect(props) {
     setInputValue(value);
   }, [value]);
   var asyncQueryData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var tradeId;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             tradeId = form.getFieldValue('m3ap1EvEyd');
             console.log('asyncQueryData---', {
@@ -23289,11 +23308,11 @@ var IdInputSelect = function IdInputSelect(props) {
               form: form
             });
             if (tradeId) {
-              _context2.next = 5;
+              _context3.next = 5;
               break;
             }
             setDataSource([]);
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 5:
             setSpinning(true);
             typeMap$6[type].asyncGetData(tradeId).then(function (data) {
@@ -23305,9 +23324,9 @@ var IdInputSelect = function IdInputSelect(props) {
             });
           case 7:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function asyncQueryData() {
       return _ref.apply(this, arguments);
@@ -23359,8 +23378,9 @@ var IdInputSelect = function IdInputSelect(props) {
         checked: value === group[typeMap$6[type].key],
         onChange: function onChange() {
           if (value !== group[typeMap$6[type].key]) {
+            var _typeMap$type$orderBa, _typeMap$type;
             handleChange(group[typeMap$6[type].key]);
-            kmkfUtils.skxSystemOrderBackValues({
+            (_typeMap$type$orderBa = (_typeMap$type = typeMap$6[type]).orderBack) === null || _typeMap$type$orderBa === void 0 ? void 0 : _typeMap$type$orderBa.call(_typeMap$type, {
               templateList: templateDetail,
               value: {
                 allOrders: [group]
@@ -23435,12 +23455,26 @@ var typeMap$7 = {
   SKX_GOODS: {
     key: 'skxGoods',
     uniqueKey: 'skuEcode',
+    formatTrade: kmkfUtils.formatTrade,
+    ordersKey: 'orderDetailInfoList',
     requestParams: {
       key: 'onBillNo',
       sourceUniqueKey: '78CADF2951',
-      request: skxUtils.getAllGoods
+      request: kmkfUtils.servers.SKX.querySkxOrderDetailSingleton
     },
     updateHandle: kmkfUtils.updateSkxGoodsHandle
+  },
+  SKX_RETURN_GOODS: {
+    key: 'skxReturnGoods',
+    uniqueKey: 'returnSkuEcode',
+    formatTrade: kmkfUtils.formatReturnTrade,
+    ordersKey: 'skqReturnOrderDetailInfoDtos',
+    requestParams: {
+      key: 'returnBillNo',
+      sourceUniqueKey: 'fe10d6f36b',
+      request: kmkfUtils.servers.SKX.queryReturnOrderDetailSingleton
+    },
+    updateHandle: kmkfUtils.updateSkxReturnGoodsHandle
   }
 };
 var SkxGoods = function SkxGoods(props) {
@@ -23475,9 +23509,11 @@ var SkxGoods = function SkxGoods(props) {
     if (!businessNo) {
       return Promise.resolve([]);
     }
-    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (data) {
+    return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (_ref) {
+      var _data$typeMap$type$or, _data$typeMap$type$or2;
+      var data = _ref.data;
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+        allGoods: (data === null || data === void 0 ? void 0 : (_data$typeMap$type$or = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or === void 0 ? void 0 : _data$typeMap$type$or[0]) ? typeMap$7[type].updateHandle(typeMap$7[type].formatTrade(data === null || data === void 0 ? void 0 : (_data$typeMap$type$or2 = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or2 === void 0 ? void 0 : _data$typeMap$type$or2[0])) : []
       }));
     });
   };
@@ -23582,4 +23618,3 @@ exports.getSkxColumns = getColumns$7;
 exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;
 exports.orderSubFormConstants = orderSubFormConstants;
-exports.skxUtils = skxUtils;

package/dist/src/index.d.ts

@@ -72,6 +72,5 @@ export { default as KmVideo } from './km/KmVideo';
 export { default as OrderSubFormUtils } from './apaas/OrderSubForm/utils';
 export { default as SkxIdInputSelect } from './skx/IdInputSelect';
 export { default as SkxGoods } from './skx/Goods';
-export { skxUtils } from './skx/common';
 export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
 export { default as erpModalColumnsMap } from './bs/component/model/Columns';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.5.0-rc.0",
+  "version": "2.8.0-rc.0",
   "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.5.0-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.8.0-rc.0",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd823f96804157434b7aee9febe5b37f9ab6bea7"
+  "gitHead": "d934929b6c784f46f6b225ec37528c9d18b155ad"
 }

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

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