@kmkf-fe-packages/kmkf-utils 2.2.13-beta.14 → 2.2.13-beta.16

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

@@ -16,7 +16,7 @@ export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT
 export * from "./jstOrderBackFormValues";
 export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, } from "./kmOrderBackFormValues";
 export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders, } from "./gyOrderBackFormValues";
-export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, } from "./jyOrderBackFormValues";
+export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, } from "./jyOrderBackFormValues";
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues, } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform, } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues, } from "./skxReturnOrderBackFormValues";

package/dist/esm/utils/index.js

@@ -17,7 +17,7 @@ export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT
 export * from "./jstOrderBackFormValues";
 export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify } from "./kmOrderBackFormValues";
 export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders } from "./gyOrderBackFormValues";
-export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG } from "./jyOrderBackFormValues";
+export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP } from "./jyOrderBackFormValues";
 export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues } from "./skxOrderBackFormValues";
 export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform } from "./orderSubFormOrderBackFormValues";
 export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues } from "./skxReturnOrderBackFormValues";

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

@@ -8,6 +8,26 @@ export declare const JY_SYSTEM_ORDER_CONFIG: {
         width: number;
     }[];
 };
+export declare const JY_ORDER_TYPE_MAP: {
+    SALES: string;
+    EXPENSE: string;
+    SUBSCRIBES: string;
+    EXCHANGE: string;
+    REISSUE: string;
+    INVOICE: string;
+    WELFARE: string;
+    OTHERS: string;
+};
+export declare const JY_ORDER_STATUS_MAP: {
+    CREATED: string;
+    AUDITED_ABNORMAL: string;
+    AUDITED: string;
+    DISPATCHED_ABNORMAL: string;
+    DISPATCHED: string;
+    DELIVERY_ABNORMAL: string;
+    DELIVERED: string;
+    INVALID: string;
+};
 export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
 export declare const updateJyGoodsHandle: (orders?: any[], config?: {
     canEdit?: boolean;

package/dist/esm/utils/jyOrderBackFormValues.js

@@ -34,6 +34,26 @@ export var JY_SYSTEM_ORDER_CONFIG = {
     width: 150
   }]
 };
+export var JY_ORDER_TYPE_MAP = {
+  SALES: "销售订单",
+  EXPENSE: "费用订单",
+  SUBSCRIBES: "预订订单",
+  EXCHANGE: "换货订单",
+  REISSUE: "补发订单",
+  INVOICE: "补发票订单",
+  WELFARE: "福利订单",
+  OTHERS: "其他订单"
+};
+export var JY_ORDER_STATUS_MAP = {
+  CREATED: "新建",
+  AUDITED_ABNORMAL: "审核失败",
+  AUDITED: "已审核",
+  DISPATCHED_ABNORMAL: "配货异常",
+  DISPATCHED: "已配货",
+  DELIVERY_ABNORMAL: "平台发货异常",
+  DELIVERED: "已发货",
+  INVALID: "作废"
+};
 export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
   var getSortedList = function getSortedList(str) {
     try {
@@ -106,12 +126,12 @@ var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList
     }
   }
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
+    var items = ((next === null || next === void 0 ? void 0 : next.subOrderDetails) || []).map(function (t) {
       return {
-        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
+        title: (t === null || t === void 0 ? void 0 : t.productName) || "",
+        picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
         platform: "jy",
-        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
+        skuId: (t === null || t === void 0 ? void 0 : t.productCode) || ""
       };
     });
     var params = {
@@ -129,6 +149,7 @@ var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList
       // prv.push(...deliveryList);
       params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
       params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
+      prv.push(params);
     } else if (type === "send") {
       params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
       //下拉框，取id
@@ -187,14 +208,20 @@ export var jyOrderTransform = function jyOrderTransform(detail, form) {
   var isReissueDefaultSelect = !!(jyReissueCom !== null && jyReissueCom !== void 0 && (_jyReissueCom$compone = jyReissueCom.componentConfig) !== null && _jyReissueCom$compone !== void 0 && _jyReissueCom$compone.showDefaultSelect);
   var isReturnDefaultSelect = !!(jyReturnCom !== null && jyReturnCom !== void 0 && (_jyReturnCom$componen = jyReturnCom.componentConfig) !== null && _jyReturnCom$componen !== void 0 && _jyReturnCom$componen.showDefaultSelect);
   var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
+  var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      tradeType: JY_ORDER_TYPE_MAP[item.tradeType],
+      tradeStatus: JY_ORDER_STATUS_MAP[item.tradeStatus]
+    });
+  });
   return {
     jySystemOrder: {
       orderNo: orderNo,
-      orders: currentTrades,
+      orders: orders,
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
-      showOrderInfo: currentTrades
+      showOrderInfo: orders
     },
     jyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.tradeNo : undefined,
     jySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.tradeNo : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.13-beta.14",
+  "version": "2.2.13-beta.16",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "996c1e6c362531681aeda62f86e3ddbba8c45cb2",
+  "gitHead": "05b79e8aca7096204256850b1c757e39bdfa198f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }