@kmkf-fe-packages/kmkf-utils 2.2.44-beta.32 → 2.2.44-beta.38

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

@@ -7,16 +7,13 @@ export declare const JKY_SYSTEM_ORDER_CONFIG: {
         title: string;
         width: number;
         render?: undefined;
-        headerMapping?: undefined;
+        renderExport?: undefined;
     } | {
         dataIndex: string;
         title: string;
         width: number;
         render: (val: number) => "否" | "是";
-        headerMapping: {
-            transformValue: (val: number) => "否" | "是";
-            renderExport: (val: number) => "否" | "是";
-        };
+        renderExport: (val: number) => "否" | "是";
     })[];
 };
 export declare const JKY_ORDER_FROM_MAP: {
@@ -109,7 +106,7 @@ export declare const updateJkyGoodsHandle: (orders?: any[], config?: {
     orderBackGoodsLevel?: string;
     canEdit?: boolean;
 }) => any[];
-export declare const getJkyLogisticInfo: (packageDetail: any[], typeKey: string) => any;
+export declare const getJkyLogisticInfo: (item: any, typeKey: string) => any;
 export declare const jkyOrderTransform: (detail: any, form: any) => {
     jkySystemOrder: {
         orderNo: any;

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -40,13 +40,8 @@ export var JKY_SYSTEM_ORDER_CONFIG = {
     render: function render(val) {
       return val == 0 ? "否" : "是";
     },
-    headerMapping: {
-      transformValue: function transformValue(val) {
-        return val == 0 ? "否" : "是";
-      },
-      renderExport: function renderExport(val) {
-        return val == 0 ? "否" : "是";
-      }
+    renderExport: function renderExport(val) {
+      return val == 0 ? "否" : "是";
     }
   }, {
     dataIndex: "flagNames",
@@ -279,8 +274,15 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
       };
     });
     if (type === "logistics") {
+      var _next$packageDetail;
       // 吉客云单个系统子订单存在拆单，会包含多个物流信息
-      var packageDetails = ((next === null || next === void 0 ? void 0 : next.packageDetail) || []).map(function (t) {
+      var packageDetailList = next !== null && next !== void 0 && next.packageDetail && (next === null || next === void 0 ? void 0 : (_next$packageDetail = next.packageDetail) === null || _next$packageDetail === void 0 ? void 0 : _next$packageDetail.length) > 1 ? next === null || next === void 0 ? void 0 : next.packageDetail : [{
+        logisticName: next === null || next === void 0 ? void 0 : next.logisticName,
+        logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
+        logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
+      }];
+      console.log("packageDetailList", next, next.logisticCode, packageDetailList);
+      var packageDetails = (packageDetailList || []).map(function (t) {
         return {
           items: items,
           logisticsCompanyName: t === null || t === void 0 ? void 0 : t.logisticName,
@@ -288,6 +290,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
           logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
         };
       });
+      console.log("packageDetails", packageDetails);
       prv.push.apply(prv, _toConsumableArray(packageDetails));
     } else if (type === "send") {
       var params = {
@@ -324,8 +327,13 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
   }
   return newList;
 };
-export var getJkyLogisticInfo = function getJkyLogisticInfo(packageDetail, typeKey) {
-  var _packageDetail$map, _packageDetail$;
+export var getJkyLogisticInfo = function getJkyLogisticInfo(item, typeKey) {
+  var _item$packageDetail, _packageDetail$map, _packageDetail$;
+  var packageDetail = item !== null && item !== void 0 && item.packageDetail && (item === null || item === void 0 ? void 0 : (_item$packageDetail = item.packageDetail) === null || _item$packageDetail === void 0 ? void 0 : _item$packageDetail.length) > 1 ? item === null || item === void 0 ? void 0 : item.packageDetail : [{
+    logisticName: item === null || item === void 0 ? void 0 : item.logisticName,
+    logisticCode: item === null || item === void 0 ? void 0 : item.logisticCode,
+    logisticNo: item === null || item === void 0 ? void 0 : item.mainPostid
+  }];
   return (packageDetail === null || packageDetail === void 0 ? void 0 : packageDetail.length) > 1 ? packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$map = packageDetail.map(function (logistic, index) {
     return "\u5305\u88F9".concat(index + 1, ":").concat(logistic === null || logistic === void 0 ? void 0 : logistic[typeKey]);
   })) === null || _packageDetail$map === void 0 ? void 0 : _packageDetail$map.join(",") : (packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$ = packageDetail[0]) === null || _packageDetail$ === void 0 ? void 0 : _packageDetail$[typeKey]) || "";
@@ -364,9 +372,9 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
       tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
       tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
       tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus],
-      logisticName: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticName"),
-      logisticCode: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticCode"),
-      logisticNo: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, "logisticNo")
+      logisticName: getJkyLogisticInfo(item, "logisticName"),
+      logisticCode: getJkyLogisticInfo(item, "logisticCode"),
+      logisticNo: getJkyLogisticInfo(item, "logisticNo")
     });
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.44-beta.32",
+  "version": "2.2.44-beta.38",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22fe8812740ec9104f16deed222a404065771081",
+  "gitHead": "2b6a9bd546691338d24d5ce9351ec153cac547f9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }