@kmkf-fe-packages/kmkf-utils 2.2.13-beta.8 → 2.2.13-beta.82

package/README.md

@@ -1,2 +1 @@
-1123111
-30
+112311

package/dist/esm/servers/JY/logisticsData.js

@@ -12,6 +12,7 @@ var queryJYLogisticsList = function queryJYLogisticsList() {
 };
 export var getLogisticsDataAsync = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _result$data;
     var result, list, logisticsList;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -21,11 +22,11 @@ export var getLogisticsDataAsync = /*#__PURE__*/function () {
         case 2:
           result = _context.sent;
           list = [];
-          logisticsList = (result === null || result === void 0 ? void 0 : result.data) || [];
+          logisticsList = (result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.logisticsList) || [];
           logisticsList === null || logisticsList === void 0 ? void 0 : logisticsList.map(function (item) {
             list.push({
-              label: item.logisticsName,
-              value: item.logisticsCode
+              label: item.globalExpressName,
+              value: item.globalExpressCode
             });
           });
           return _context.abrupt("return", list);

package/dist/esm/servers/JY/warehouseData.d.ts

@@ -1,5 +1,4 @@
 declare type WarehouseType = {
-    disabled: boolean;
     label: string;
     value: string;
 };

package/dist/esm/servers/JY/warehouseData.js

@@ -16,15 +16,13 @@ var queryWarehouseList = function queryWarehouseList(_ref) {
 export var getWarehouseDataAsync = function getWarehouseDataAsync() {
   return fetchAll("JY_WAREHOUSE_DATA", queryWarehouseList, function (data) {
     var list = [];
-    var warehouses = data || [];
+    var warehouses = (data === null || data === void 0 ? void 0 : data.warehouseInfoList) || [];
     warehouses.map(function (_ref2) {
-      var code = _ref2.code,
-        name = _ref2.name,
-        isDeleted = _ref2.isDeleted;
+      var warehouseCode = _ref2.warehouseCode,
+        warehouseName = _ref2.warehouseName;
       list.push({
-        label: name,
-        value: code,
-        disabled: isDeleted
+        label: warehouseName,
+        value: warehouseCode
       });
     });
     var valueMap = {};
@@ -33,6 +31,9 @@ export var getWarehouseDataAsync = function getWarehouseDataAsync() {
     });
 
     return Object.values(valueMap);
+  }, {
+    pageNo: 1,
+    pageSize: 100
   });
 };
 export default getWarehouseDataAsync;

package/dist/esm/utils/bsOrderBackFormValues.js

@@ -1,3 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -7,6 +13,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import ExpressData from "../expressData";
 import ExpressInterceptData from "../expressInterceptData";
 import uuid from "./getUUid";
+import isNull from "./isNull";
 export var BS_SYSTEM_ORDER_CONFIG = {
   key: "bsSystemShowOrder",
   name: "百胜",
@@ -213,13 +220,38 @@ export var bsOrderBackFormValues = function bsOrderBackFormValues() {
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsGoods;
         break;
       case "BS_EXCHANGE_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsExchangeGoods;
+        {
+          var _detail$bsGoods, _detail$bsGoods2;
+          var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          console.log("initReason", initReason);
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsExchangeGoods), {}, {
+            bsExchangeType: initReason,
+            bsExchangeReturnGoods: ["2", "4"].includes(initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods = detail.bsGoods) === null || _detail$bsGoods === void 0 ? void 0 : _detail$bsGoods.bsGoods) || [],
+            bsExchangeSwapOutGoods: ["2", "4"].includes(initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods2 = detail.bsGoods) === null || _detail$bsGoods2 === void 0 ? void 0 : _detail$bsGoods2.bsGoods) || []
+          });
+        }
         break;
       case "BS_REISSUE_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsReissueGoods;
+        {
+          var _detail$bsGoods3;
+          var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsReissueGoods), {}, {
+            bsReissueType: _initReason,
+            bsReissueGoods: ["2", "4"].includes(_initReason[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods3 = detail.bsGoods) === null || _detail$bsGoods3 === void 0 ? void 0 : _detail$bsGoods3.bsGoods) || []
+          });
+        }
+        // prv[uniqueKey] = detail?.bsReissueGoods;
+
         break;
       case "BS_RETURN_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.bsReturnGoods;
+        {
+          var _detail$bsGoods4;
+          var _initReason2 = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? Array.isArray(config.initReason) ? config.initReason : [config.initReason] : [];
+          prv[uniqueKey] = _objectSpread(_objectSpread({}, detail === null || detail === void 0 ? void 0 : detail.bsReturnGoods), {}, {
+            bsReturnType: _initReason2,
+            bsReturnGoods: ["2"].includes(_initReason2[0]) ? [] : (detail === null || detail === void 0 ? void 0 : (_detail$bsGoods4 = detail.bsGoods) === null || _detail$bsGoods4 === void 0 ? void 0 : _detail$bsGoods4.bsGoods) || []
+          });
+        }
         break;
       case "BS_LOGISTICS":
         prv[uniqueKey] = updateBsItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.bsLogistics, "logistics", config);

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

@@ -0,0 +1,10 @@
+declare type ShowHeaderObjType = {
+    title: string;
+    dataIndex: string;
+    show?: boolean;
+};
+declare const getSystemShowHead: ({ columns, showHeader, }: {
+    columns: any[];
+    showHeader: (string | ShowHeaderObjType)[];
+}) => any[];
+export default getSystemShowHead;

package/dist/esm/utils/getSystemShowHead.js

@@ -0,0 +1,25 @@
+var getSystemShowHead = function getSystemShowHead(_ref) {
+  var columns = _ref.columns,
+    showHeader = _ref.showHeader;
+  var initBaseInfoColumns = columns || [];
+  var baseInfoColumns = initBaseInfoColumns || [];
+  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+  if (isStringArray) {
+    baseInfoColumns = initBaseInfoColumns.filter(function (col) {
+      return showHeader.includes(col.dataIndex);
+    });
+  } else if (isObjectArray) {
+    baseInfoColumns = showHeader.map(function (col) {
+      var currentCol = initBaseInfoColumns.find(function (item) {
+        return item.dataIndex === col.dataIndex;
+      }); // 如果列应该显示（show不为false），则返回对应的列配置
+      if (currentCol && col.show !== false) {
+        return currentCol;
+      }
+      return undefined;
+    }).filter(Boolean);
+  }
+  return baseInfoColumns || [];
+};
+export default getSystemShowHead;

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";
@@ -27,3 +27,4 @@ export * as templateFn from "./template";
 export * as tree from "./multidimensionalFindChild";
 export { default as unTransField } from "./unTransField";
 export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

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";
@@ -30,4 +30,5 @@ export { _templateFn as templateFn };
 import * as _tree from "./multidimensionalFindChild";
 export { _tree as tree };
 export { default as unTransField } from "./unTransField";
-export { fetchAll } from "./FetchAll";
+export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

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

@@ -8,8 +8,30 @@ 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[]) => any;
+export declare const updateJyGoodsHandle: (orders?: any[], config?: {
+    canEdit?: boolean;
+}) => any[];
 export declare const jyOrderTransform: (detail: any, form: any) => {
     jySystemOrder: {
         orderNo: any;
@@ -19,14 +41,14 @@ export declare const jyOrderTransform: (detail: any, form: any) => {
     };
     jyReturnSystemOrderNo: any;
     jySystemOrderNo: any;
-    jyReissueGoods: any;
-    jyReturnGoods: any;
+    jyReissueGoods: any[];
+    jyReturnGoods: any[];
     jyGoods: {
         allOrders: any;
         orders: any;
         orderNo: any;
         shopCode: any;
-        jyGoods: any;
+        jyGoods: any[];
     };
     shopCode: any;
     jyLogistics: any;

package/dist/esm/utils/jyOrderBackFormValues.js

@@ -1,9 +1,9 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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); }
 import uuid from "./getUUid";
 import isNull from "./isNull";
 export var JY_SYSTEM_ORDER_CONFIG = {
@@ -28,6 +28,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 {
@@ -49,18 +69,36 @@ export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesInclud
 };
 export var updateJyGoodsHandle = function updateJyGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, _toConsumableArray(cur.details.map(function (item) {
-        var _item$uuid;
-        item.canDelete = true;
-        item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
-        item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
-        return item;
-      })));
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var mappingGoodsItem = function mappingGoodsItem(list) {
+    return (list || []).map(function (item) {
+      var _item$uuid, _config$canEdit;
+      item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
+      return _objectSpread(_objectSpread({}, item), {}, {
+        canDelete: true,
+        canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false,
+        divideOrderFee: Number(item.divideOrderFee).toFixed(2),
+        sellTotal: Number(item.sellTotal).toFixed(2),
+        sellPrice: Number(item.sellPrice).toFixed(2),
+        settlementPrice: Number(item.settlementPrice).toFixed(2),
+        mallSellingPrice: Number(item.mallSellingPrice).toFixed(2)
+      });
+    });
+  };
+  return mappingGoodsItem((orders || []).reduce(function (prv, next) {
+    if (next.subOrderDetails && next.subOrderDetails.length) {
+      next.subOrderDetails.forEach(function (subItem) {
+        subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
+        subItem.divideOrderFee = Number(subItem.divideOrderFee).toFixed(2);
+        subItem.sellTotal = Number(subItem.sellTotal).toFixed(2);
+        subItem.sellPrice = Number(subItem.sellPrice).toFixed(2);
+        subItem.settlementPrice = Number(subItem.settlementPrice).toFixed(2);
+        subItem.mallSellingPrice = Number(subItem.mallSellingPrice).toFixed(2);
+        prv.push(subItem);
+      });
     }
-    return acc;
-  }, []);
+    return prv;
+  }, []));
 };
 var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList, form) {
   var _newList;
@@ -97,34 +135,26 @@ 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 = {
+      items: items
+    };
     if (type === "logistics") {
-      // 巨益的单个系统子订单存在拆单，会包含多个物流信息
-      var deliveryList = ((next === null || next === void 0 ? void 0 : next.deliveryList) || []).map(function (t) {
-        return {
-          items: items,
-          logisticsCompanyName: t === null || t === void 0 ? void 0 : t.expressName,
-          logisticsCompany: t === null || t === void 0 ? void 0 : t.expressCode,
-          logisticsCode: t === null || t === void 0 ? void 0 : t.mailNo
-        };
-      });
-      prv.push.apply(prv, _toConsumableArray(deliveryList));
-      // params.logisticsCompany = next?.expressName;
-      // params.logisticsCode = next?.mailNo;
+      params.logisticsCompanyName = next === null || next === void 0 ? void 0 : next.logistName;
+      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") {
-      var params = {
-        items: items
-      };
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
       //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseId;
       params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
       prv.push(params);
     }
@@ -179,21 +209,31 @@ 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,
-    jyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJyGoodsHandle(defaultOrder).filter(function (good) {
+    jyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
+      canEdit: true
+    }).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
-    jyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJyGoodsHandle(defaultOrder).filter(function (good) {
+    jyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
+      canEdit: true
+    }).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
     jyGoods: {
@@ -206,7 +246,7 @@ export var jyOrderTransform = function jyOrderTransform(detail, form) {
         return item.shopCode;
       })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopCode) || null,
       jyGoods: updateJyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
+        return !isStrict || !orderNo;
       })
     },
     shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find2 = currentTrades.find) === null || _currentTrades$find2 === void 0 ? void 0 : (_currentTrades$find2$ = _currentTrades$find2.call(currentTrades, function (item) {
@@ -298,7 +338,7 @@ var updateJyItemListByConfigHandle = function updateJyItemListByConfigHandle(lis
 // 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
 export var filterJyOrders = function filterJyOrders(trades, order_no) {
   var currentTrades = (trades || []).filter(function (item) {
-    return getIsPlatformCodesIncludeOrderNos(item.platformCode, order_no);
+    return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
   });
   if (currentTrades.length) {
     return currentTrades;

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

@@ -9,6 +9,8 @@ export declare const updateSkxGoodsHandle: (orders?: any[]) => {
     uuid: any;
 }[];
 export declare const skxOrderTransform: (detail: any, form: any) => {
+    shopUniqueKey: any;
+    erpShopName: any;
     onBillNo: any;
     skxGoods: {
         allGoods: {

package/dist/esm/utils/skxOrderBackFormValues.js

@@ -30,6 +30,11 @@ export var skxSystemOrderBackValues = function skxSystemOrderBackValues(_ref) {
 export var skxOrderBackFormValues = function skxOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var initValue = {};
+  if (detail !== null && detail !== void 0 && detail.shopUniqueKey) {
+    initValue.shopUniqueKey = detail === null || detail === void 0 ? void 0 : detail.shopUniqueKey;
+    initValue.erpShopName = detail === null || detail === void 0 ? void 0 : detail.erpShopName;
+  }
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
@@ -63,7 +68,7 @@ export var skxOrderBackFormValues = function skxOrderBackFormValues() {
         break;
     }
     return prv;
-  }, {});
+  }, initValue);
 };
 export var formatTrade = function formatTrade(trade) {
   return trade.subOrderList.map(function (item) {
@@ -147,12 +152,15 @@ var updateSkxItemListByConfigHandle = function updateSkxItemListByConfigHandle(l
 
 //斯凯奇订单信息转换
 export var skxOrderTransform = function skxOrderTransform(detail, form) {
+  var _trades$, _trades$2;
   var trades = (detail === null || detail === void 0 ? void 0 : detail.allOrders) || [];
   var onlyOne = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
   var allGoodsList = onlyOne ? formatTrade(trades[0]) : [];
   var skxGoods = updateSkxGoodsHandle(allGoodsList);
   var data = onlyOne ? trades[0] : {};
   return {
+    shopUniqueKey: trades === null || trades === void 0 ? void 0 : (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.shopUniqueKey,
+    erpShopName: trades === null || trades === void 0 ? void 0 : (_trades$2 = trades[0]) === null || _trades$2 === void 0 ? void 0 : _trades$2.shopTitle,
     onBillNo: data === null || data === void 0 ? void 0 : data.onBillNo,
     skxGoods: {
       allGoods: skxGoods,

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", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "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", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics"].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", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "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", "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"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 });

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

@@ -7,6 +7,7 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
         title: string;
         dataIndex: string;
         width: number;
+        ellipsis: boolean;
     }[];
 };
 export declare const WDT_ORDER_TYPE_MAP: {

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -63,6 +63,20 @@ export var tradeStatusMap = {
     105: "部分打款",
     110: "已完成",
     113: "异常发货"
+  },
+  web: {
+    4: "已取消（可恢复）",
+    5: "已取消",
+    25: "特殊单",
+    29: "预订单",
+    30: "待审核（已支付）",
+    35: "待财审",
+    50: "待发货",
+    51: "待推送",
+    52: "推送中",
+    53: "推送失败",
+    55: "已推送",
+    95: "已发货"
   }
 };
 export var WDT_SYSTEM_ORDER_CONFIG = {
@@ -72,19 +86,48 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
   columns: [{
     title: "订单类型",
     dataIndex: "billType",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "系统订单号",
     dataIndex: "billNo",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单状态",
     dataIndex: "tradeStatusValue",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单标签",
     dataIndex: "billTag",
-    width: 150
+    width: 150,
+    ellipsis: true
+  }, {
+    title: "物流公司名称",
+    dataIndex: "logisticsName",
+    width: 150,
+    ellipsis: true
+  }, {
+    title: "物流公司编码",
+    dataIndex: "logisticsCode",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "物流单号",
+    dataIndex: "logisticsNo",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓名称",
+    dataIndex: "warehouseName",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓编码",
+    dataIndex: "warehouseNo",
+    width: 200,
+    ellipsis: true
   }]
 };
 export var WDT_ORDER_TYPE_MAP = {
@@ -114,6 +157,7 @@ export var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
         item.goodId = item.goodsId;
         item.goodName = item.goodsName;
         item.goodNo = item.goodsNo;
+        item.orderPrice = item.orderPrice || item.price;
         item.canDelete = true;
         item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
         item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
@@ -353,19 +397,21 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName
+          billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
         });
       }),
+
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
       showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return {
+        return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName,
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
           tradeStatusValue: item.tradeStatusValue
-        };
+        });
       })
     },
     wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,

package/package.json

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