@kmkf-fe-packages/kmkf-utils 2.7.3-beta.0 → 2.7.3-beta.10

package/README.md

@@ -1 +1 @@
-1123111123
+112311112311

package/dist/esm/utils/SendData.js

@@ -90,6 +90,7 @@ export var SendDataCenter = /*#__PURE__*/function () {
       if (platform === "JST_SEND_GOOD") platform = "jst";
       if (platform === "JY_SEND_GOOD") platform = "jy";
       if (platform === "JKY_SEND_GOOD") platform = "jky";
+      if (platform === "WLN_SEND_GOOD") platform = "wln";
       if (!this.instanceMap.has(platform)) {
         this.instanceMap.set(platform, new SendData(platform));
       }

package/dist/esm/utils/index.d.ts

@@ -11,7 +11,7 @@ export * from "./finalFormData";
 export * from "./transformList";
 export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, } from "./bsOrderBackFormValues";
 export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG, } from "./bsE3OrderBackFormValues";
-export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, } from "./wlnOrderBackFormValues";
+export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, updateWlnGoodsHandle, } from "./wlnOrderBackFormValues";
 export { WDT_RETURN_BILL_NO_CONFIG, WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, updateWdtAftersaleGoodsHandle, tradeStatusMap, } from "./wdtOrderBackFormValues";
 export * from "./jstOrderBackFormValues";
 export * from './platformAfterSalesOrderBackFormValues';
@@ -22,7 +22,6 @@ export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SY
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues, } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform, } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues, } from "./skxReturnOrderBackFormValues";
-export { updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
 export { default as uuid } from "./getUUid";
 export * as filterFn from "./filterFn";
 export * as templateFn from "./template";

package/dist/esm/utils/index.js

@@ -11,7 +11,7 @@ export * from "./finalFormData";
 export * from "./transformList";
 export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform } from "./bsOrderBackFormValues";
 export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG } from "./bsE3OrderBackFormValues";
-export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform } from "./wlnOrderBackFormValues";
+export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
 export { WDT_RETURN_BILL_NO_CONFIG, WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, updateWdtAftersaleGoodsHandle, tradeStatusMap } from "./wdtOrderBackFormValues";
 // export { default as jstOrderBackFormValues } from "./jstOrderBackFormValues";
 export * from "./jstOrderBackFormValues";
@@ -23,7 +23,6 @@ export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SY
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues } from "./skxReturnOrderBackFormValues";
-export { updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
 export { default as uuid } from "./getUUid";
 import * as _filterFn from "./filterFn";
 export { _filterFn as filterFn };

package/dist/esm/utils/kmOrderBackFormValues.d.ts

@@ -132,6 +132,7 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
         orderNo: any;
         orders: any;
         selectIds: any;
+        selectedRows: any;
         showOrderInfo: any;
     };
     kmLogistics: any;

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -401,11 +401,12 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
 
 //km订单信息转换
 export var kmOrderTransform = function kmOrderTransform(detail, form) {
-  var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
+  var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _selectedSystemOrders, _postingComponent$com, _orderBackTrades$find, _orderBackTrades$find2;
   var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
   var _ref = detail || {},
     orderNo = _ref.orderNo,
-    componentList = _ref.componentList;
+    componentList = _ref.componentList,
+    matchLogisticsNo = _ref.matchLogisticsNo;
   var kmGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "KM_GOODS";
   });
@@ -434,13 +435,24 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   });
   var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
   var kmPosting;
-  if (onlyOneSystemOrder && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
-    kmPosting = handleKmAddressIdentify(trades[0]);
+  var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
+  var matchedSystemOrders = matchLogisticsNo ? trades.filter(function (item) {
+    return "".concat((item === null || item === void 0 ? void 0 : item.outSid) || (item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
+  }) : [];
+  var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
+    return item.sid;
+  });
+  var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
+  var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
+  var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : trades;
+  var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.sid;
+  var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
+  if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
+    kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
     console.log("kmPosting", kmPosting);
   }
-  var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
   return {
-    kmSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
+    kmSystemOrderNo: selectedSystemOrderNo,
     kmSystemOrder: {
       //标记通过请求获取的值
       isRequest: true,
@@ -453,9 +465,17 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
           billTag: item.tags
         });
       }),
-      selectIds: onlyOneSystemOrder ? trades.map(function (item) {
+      selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? trades.map(function (item) {
         return item.sid;
       }) : [],
+      selectedRows: selectedRows.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          billNo: item.sid,
+          sysStatus: item.sysStatus,
+          billType: item.type,
+          billTag: item.tags
+        });
+      }),
       showOrderInfo: trades.map(function (item) {
         return {
           billNo: item.sid,
@@ -465,35 +485,35 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
         };
       })
     },
-    kmLogistics: updateKmItemListHandle(trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    kmSendGood: updateKmItemListHandle(trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    kmLogistics: updateKmItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    kmSendGood: updateKmItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
     kmGoods: {
       //标记通过请求获取的值
       isRequest: true,
       allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders,
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: trades,
+      orders: orderBackTrades,
       orderNo: orderNo,
-      shopCode: (trades === null || trades === void 0 ? void 0 : (_trades$find = trades.find) === null || _trades$find === void 0 ? void 0 : (_trades$find$call = _trades$find.call(trades, function (item) {
+      shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
         return item.shopCode;
-      })) === null || _trades$find$call === void 0 ? void 0 : _trades$find$call.shopCode) || null,
-      kmGoods: updateKmGoodsHandle(trades, {
+      })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopCode) || null,
+      kmGoods: updateKmGoodsHandle(orderBackTrades, {
         orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
       })
     },
-    kmReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateKmGoodsHandle(defaultOrder, {
+    kmReissueGoods: selectedSystemOrders.length ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {
       return !isStrict || !orderNo || good.sid === orderNo;
     }) : [],
-    kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
+    kmReturnGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
       canEdit: true
     }, "KM_RETURN_GOODS").filter(function (good) {
       return !isStrict || !orderNo || good.sid === orderNo;
     }) : [],
-    kmExchangeGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
+    kmExchangeGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {

package/dist/esm/utils/wdtOrderBackFormValues.d.ts

@@ -58,6 +58,7 @@ export declare const wdtOrderTransform: (detail: any, form: any) => {
         orderNo: any;
         orders: any;
         selectIds: any;
+        selectedRows: any;
         showOrderInfo: any;
     };
     wdtReturnSystemOrder: {

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -513,7 +513,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
 };
 //wdt订单信息转换
 export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
-  var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _wdtReturnOrders$find, _wdtReturnOrders$find2, _currentTrades$2;
+  var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _selectedSystemOrders, _orderBackTrades$find, _orderBackTrades$find2, _wdtReturnOrders$find, _wdtReturnOrders$find2, _orderBackTrades$;
   var orderNo = detail.orderNo,
     _detail$trades = detail.trades,
     currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -533,11 +533,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
   var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
   var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
-  var matchedSystemOrderIds = matchLogisticsNo ? currentTrades.filter(function (item) {
+  var matchedSystemOrders = matchLogisticsNo ? currentTrades.filter(function (item) {
     return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
-  }).map(function (item) {
-    return item.tradeNo;
   }) : [];
+  var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
+    return item.tradeNo;
+  });
+  var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
+  var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
+  var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : currentTrades;
+  var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.tradeNo;
   return {
     wdtSystemOrder: {
       //标记通过请求获取的值
@@ -555,6 +560,15 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
+      selectedRows: selectedRows.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          billNo: item.tradeNo,
+          billType: WDT_ORDER_TYPE_MAP[item.tradeType],
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
+          logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
+        });
+      }),
       showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
@@ -575,8 +589,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       }) : [],
       showOrderInfo: wdtReturnOrders || []
     },
-    wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
-    wdtReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWdtGoodsHandle(defaultOrder).filter(function (good) {
+    wdtSystemOrderNo: selectedSystemOrderNo,
+    wdtReissueGoods: selectedSystemOrders.length ? updateWdtGoodsHandle(selectedSystemOrders).filter(function (good) {
       return !isStrict || !orderNo || good.srcTid === orderNo;
     }) : [],
     wdtGoods: {
@@ -584,12 +598,12 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       isRequest: true,
       allOrders: allOrders,
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
+      orders: orderBackTrades,
       orderNo: orderNo,
-      shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
+      shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
         return item.shopNo;
-      })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopNo) || null,
-      wdtGoods: updateWdtGoodsHandle(currentTrades).filter(function (good) {
+      })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopNo) || null,
+      wdtGoods: updateWdtGoodsHandle(orderBackTrades).filter(function (good) {
         return !isStrict || !orderNo || good.srcTid === orderNo;
       })
     },
@@ -602,9 +616,9 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       })) === null || _wdtReturnOrders$find2 === void 0 ? void 0 : _wdtReturnOrders$find2.shopNo) || null,
       wdtAftersaleGoods: updateWdtAftersaleGoodsHandle(wdtReturnOrders)
     },
-    wdtLogistics: updateWdtItemListHandle(currentTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    wdtSendGood: updateWdtItemListHandle(currentTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    shopCode: (_currentTrades$2 = currentTrades[0]) === null || _currentTrades$2 === void 0 ? void 0 : _currentTrades$2.shopNo
+    wdtLogistics: updateWdtItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    wdtSendGood: updateWdtItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    shopCode: (_orderBackTrades$ = orderBackTrades[0]) === null || _orderBackTrades$ === void 0 ? void 0 : _orderBackTrades$.shopNo
     // wdtSingingTime: detail?.receiptDate,
     // wdtSendTime:
     //   detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,

package/dist/esm/utils/wlnOrderBackFormValues.d.ts

@@ -3,15 +3,29 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
     name: string;
     selectId: string;
     orderNo: string;
-    columns: {
+    columns: ({
         title: string;
         dataIndex: string;
         width: number;
-    }[];
+        render?: undefined;
+        renderExport?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        render: (val: any, record: any) => any;
+        renderExport: (val: any, record: any) => any;
+    })[];
 };
-export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
+export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
+export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
+    canEdit?: boolean;
+    orderBackGoodsLevel?: string;
+}) => any;
 export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
 export declare const wlnOrderTransform: (detail: any, form: any) => {
+    wlnSystemOrderNo: any;
+    wlnReissueGoods: any;
     wlnSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -13,8 +13,33 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React from 'react';
 import ExpressData from "../expressData";
 import uuid from "./getUUid";
+import isNull from "./isNull";
+var renderPackageInfos = function renderPackageInfos(val, record, key) {
+  var _record$packageInfos;
+  var isExport = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var res = val;
+  if (((_record$packageInfos = record.packageInfos) === null || _record$packageInfos === void 0 ? void 0 : _record$packageInfos.length) > 1) {
+    if (isExport) {
+      res = record.packageInfos.map(function (packageInfo, index) {
+        return "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key], ";");
+      }).join('\n');
+    } else {
+      res = record.packageInfos.map(function (packageInfo, index) {
+        return /*#__PURE__*/React.createElement('div', {
+          key: index
+        }, "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key]));
+      });
+    }
+  }
+  // console.log(`**** renderPackageInfos ${key}, ${isExport ? '导出' : '不是导出'}`, {
+  //   record,
+  //   res,
+  // })
+  return res;
+};
 export var WLN_SYSTEM_ORDER_CONFIG = {
   key: "wlnSystemShowOrder",
   name: "万里牛",
@@ -55,15 +80,33 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
   }, {
     title: "快递公司名称",
     dataIndex: "logisticName",
-    width: 150
+    width: 150,
+    render: function render(val, record) {
+      return renderPackageInfos(val, record, 'logisticName');
+    },
+    renderExport: function renderExport(val, record) {
+      return renderPackageInfos(val, record, 'logisticName', true);
+    }
   }, {
     title: "快递公司编码",
     dataIndex: "logisticCode",
-    width: 150
+    width: 150,
+    render: function render(val, record) {
+      return renderPackageInfos(val, record, 'logisticCode');
+    },
+    renderExport: function renderExport(val, record) {
+      return renderPackageInfos(val, record, 'logisticCode', true);
+    }
   }, {
     title: "快递单号",
     dataIndex: "expressCode",
-    width: 150
+    width: 150,
+    render: function render(val, record) {
+      return renderPackageInfos(val, record, 'expressCode');
+    },
+    renderExport: function renderExport(val, record) {
+      return renderPackageInfos(val, record, 'expressCode', true);
+    }
   }, {
     title: "发货仓名称",
     dataIndex: "storageName",
@@ -82,36 +125,84 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
     width: 150
   }]
 };
+export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
+  var getSortedList = function getSortedList(str) {
+    try {
+      var parts = str.split(";");
+      var bigInts = parts.map(BigInt);
+      var sortedBigInts = bigInts.sort(function (a, b) {
+        if (a < b) return -1;
+        if (a > b) return 1;
+        return 0;
+      });
+      return sortedBigInts.map(String).join(";");
+    } catch (error) {
+      return "";
+    }
+  };
+  var platformCodesSortStr = getSortedList(platformCodes || "");
+  var orderNosSortStr = getSortedList(orderNos || "");
+  console.log("***** platformCodesSortStr", {
+    platformCodesSortStr: platformCodesSortStr,
+    orderNosSortStr: orderNosSortStr
+  });
+  return platformCodesSortStr.includes(orderNosSortStr);
+};
 export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    canEdit: false,
+    orderBackGoodsLevel: "1"
+  };
+  var wrapItem = function wrapItem(item, systemOrderNo) {
+    item.uuid = item.uuid || uuid();
+    item.systemOrderNo = systemOrderNo;
+    item.canDelete = true;
+    item.canEdit = !!options.canEdit;
+    var picPath = item.picPath,
+      itemId = item.itemId,
+      itemName = item.itemName,
+      skuId = item.skuId,
+      skuName = item.skuName,
+      isGift = item.isGift,
+      size = item.size,
+      payment = item.payment,
+      price = item.price,
+      others = _objectWithoutProperties(item, _excluded);
+    return _objectSpread(_objectSpread({}, others), {}, {
+      skuName: skuName,
+      pic: picPath,
+      name: itemName,
+      code: itemId,
+      sku: skuId,
+      money: payment || 0,
+      number: size,
+      share: price,
+      type: isGift
+    });
+  };
   var list = orders.reduce(function (prv, next) {
-    var goods = next.items.map(function (item) {
-      item.uuid = item.uuid || uuid();
-      item.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
-      var picPath = item.picPath,
-        itemId = item.itemId,
-        itemName = item.itemName,
-        skuId = item.skuId,
-        skuName = item.skuName,
-        isGift = item.isGift,
-        size = item.size,
-        payment = item.payment,
-        price = item.price,
-        others = _objectWithoutProperties(item, _excluded);
-      return _objectSpread(_objectSpread({}, others), {}, {
-        skuName: skuName,
-        pic: picPath,
-        name: itemName,
-        code: itemId,
-        sku: skuId,
-        money: payment || 0,
-        number: size,
-        share: price,
-        type: isGift,
-        canDelete: true
+    if (options.orderBackGoodsLevel !== "2") {
+      var _next$items;
+      // 反填子商品
+      next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
+        if (item.isPackage) {
+          item.subItems.forEach(function (subItem) {
+            var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
+            prv.push(newSubItem);
+          });
+        } else {
+          prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
+        }
       });
-    });
-    prv.push.apply(prv, _toConsumableArray(goods));
+    } else {
+      var _next$items2;
+      // 反填组合商品
+      var goods = (next === null || next === void 0 ? void 0 : (_next$items2 = next.items) === null || _next$items2 === void 0 ? void 0 : _next$items2.map(function (item) {
+        return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
+      })) || [];
+      prv.push.apply(prv, _toConsumableArray(goods));
+    }
     return prv;
   }, []);
   return list;
@@ -149,7 +240,14 @@ var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comLi
       return _currentValue2;
     }
   }
-  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
+  var packageInfos = [];
+  (list || []).map(function (item) {
+    item.packageInfos.forEach(function (packageInfo) {
+      packageInfos.push(_objectSpread(_objectSpread({}, item), packageInfo));
+    });
+  });
+  console.log('***** packageInfos', packageInfos);
+  var newList = packageInfos === null || packageInfos === void 0 ? void 0 : packageInfos.reduce(function (prv, next) {
     var items = (next.items || []).map(function (t) {
       return {
         title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
@@ -226,6 +324,17 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
       case "WLN_SYSTEM_ORDER":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
         break;
+      case "WLN_REISSUE_GOODS":
+        {
+          var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
+          prv[uniqueKey] = {
+            wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
+            wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
+            wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
+            wlnReissueType: [initReason]
+          };
+        }
+        break;
       case "WLN_GOODS":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
         break;
@@ -241,8 +350,7 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
 };
 //wln订单信息转换
 export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
-  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
-  console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
+  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _currentTrades$, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$, _wlnGoodsCom$componen2;
   var _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     orderNo = detail.orderNo,
@@ -258,19 +366,31 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
   var wlnReissueCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "WLN_REISSUE_GOODS";
   });
-  var isStrict = wlnGoodsCom ? (_form$getFieldValue = form.getFieldValue(wlnGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
+  var isStrict = wlnReissueCom ? (_form$getFieldValue = form.getFieldValue(wlnReissueCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
   var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
   var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
   var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
-  console.log('**** ', {
-    isStrict: isStrict,
-    onlyOneSystemOrder: onlyOneSystemOrder,
-    isReissueDefaultSelect: isReissueDefaultSelect,
-    wlnGoodsOrderBackGoodsLevel: wlnGoodsOrderBackGoodsLevel,
-    wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
+  var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
+    return _objectSpread({}, item);
   });
+  var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
+
+  // console.log("**** ", {
+  //   isStrict,
+  //   onlyOneSystemOrder,
+  //   isReissueDefaultSelect,
+  //   wlnGoodsOrderBackGoodsLevel,
+  //   wlnReissueGoodsOrderBackGoodsLevel,
+  // });
   return {
+    wlnSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
+    wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
+      canEdit: true
+    }).filter(function (good) {
+      return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
+    }) : [],
     wlnSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
       orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {
@@ -284,16 +404,18 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
         return item.tradeNo;
       }) : [],
       showOrderInfo: (_ref = (detail === null || detail === void 0 ? void 0 : detail.orders) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
-        return {
+        return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: item.tradeType,
           billTag: item.mark
-        };
+        });
       })
     },
     wlnGoods: {
       shopCode: (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$orders2 = detail.orders) === null || _detail$orders2 === void 0 ? void 0 : (_detail$orders2$ = _detail$orders2[0]) === null || _detail$orders2$ === void 0 ? void 0 : _detail$orders2$.shopNick),
-      wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
+      wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders, {
+        orderBackGoodsLevel: wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen2 = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen2 === void 0 ? void 0 : _wlnGoodsCom$componen2.orderBackGoodsLevel
+      }),
       allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
     },
     wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.7.3-beta.0",
+  "version": "2.7.3-beta.10",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c80641421cc67b5f77f17fbe4db443014610338",
+  "gitHead": "a3b928789d7e0dcdba730abd31155cdfbeeb1709",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }