@kmkf-fe-packages/kmkf-utils 2.2.44-beta.0 → 2.2.44-beta.101

package/dist/esm/utils/orderBackFormValues.js

@@ -19,6 +19,7 @@ import { gyOrderBackFormValues } from "./gyOrderBackFormValues";
 import { jyOrderBackFormValues } from "./jyOrderBackFormValues";
 import { skxOrderBackFormValues } from "./skxOrderBackFormValues";
 import { skxReturnOrderBackFormValues } from "./skxReturnOrderBackFormValues";
+import { jkyOrderBackFormValues } from "./jkyOrderBackFormValues";
 import { pushGyLog } from "../utils";
 
 // 淘宝商品组件信息处理
@@ -252,11 +253,12 @@ export default (function (_ref) {
   var kmValues = detail["kmOrder"] ? kmOrderBackFormValues(detail["kmOrder"], templateDetail) : {};
   var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
   var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
+  var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
   //不判断是否存在detail["skxOrder"]，不存在直接清空所有skx相关组件值
   var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
   var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
   pushGyLog("gyValues", gyValues);
   // console.log("bsE3Values", bsE3Values);
 
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues);
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues), jkyValues);
 });

package/dist/esm/utils/transformList.js

@@ -21,7 +21,7 @@ import { BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packa
 import ExpressInterceptData from "../expressInterceptData";
 var interceptExpress = ExpressInterceptData.getInstance();
 export var unTransField = function unTransField(key) {
-  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
+  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmReturnWarehouse", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 };

package/dist/esm/utils/unTransField.js

@@ -1,5 +1,5 @@
 export default (function (key) {
-  return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
+  return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "jkyInStockStatusItemList", "jkyInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmReturnWarehouse", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 });

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

@@ -3,6 +3,7 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         title: string;
         dataIndex: string;
@@ -14,6 +15,7 @@ export declare const WDT_RETURN_BILL_NO_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: ({
         title: string;
         dataIndex: string;

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -12,6 +12,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import uuid from "./getUUid";
 import isNull from "./isNull";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 export var tradeStatusMap = {
   flagship: {
     4: "线下退款",
@@ -83,6 +84,7 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
   key: "wdtSystemShowOrder",
   name: "旺店通",
   selectId: "wdtSystemSelectIds",
+  orderNo: "wdtSystemOrderNo",
   columns: [{
     title: "订单类型",
     dataIndex: "billType",
@@ -134,6 +136,7 @@ export var WDT_RETURN_BILL_NO_CONFIG = {
   key: "wdtReturnBillShowOrder",
   name: "旺店通退换",
   selectId: "wdtReturnBillSelectIds",
+  orderNo: "wdtReturnBillNo",
   columns: [{
     title: "订单号",
     dataIndex: "srcTids",
@@ -538,10 +541,11 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
+          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)
         });
       }),
-
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
@@ -551,7 +555,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
           billTag: item.tagName || item.tags,
           // 网页版取tags，其他版本用tagName
-          tradeStatusValue: item.tradeStatusValue
+          logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       })
     },

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

@@ -2,6 +2,7 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
+    orderNo: string;
     columns: {
         title: string;
         dataIndex: string;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -19,6 +19,7 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
   key: "wlnSystemShowOrder",
   name: "万里牛",
   selectId: "wlnSystemSelectIds",
+  orderNo: "wlnSystemOrderNo",
   columns: [{
     title: "订单类型",
     dataIndex: "billType",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.44-beta.0",
+  "version": "2.2.44-beta.101",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "716ed4f64a6fd45217b1ba041f5f7eb3a35496c0",
+  "gitHead": "24fa14d0090629f05997a965173d224b59c543f1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }