@kmkf-fe-packages/kmkf-utils 2.7.7-beta.0 → 2.8.1

package/README.md

@@ -1 +1 @@
-112311112311
+11231111

package/dist/esm/constants/constant.js

@@ -124,7 +124,7 @@ export var SYMBOL = {
   BETWEEN: "between",
   EQ: "eq"
 };
-export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "ERP_AFTER_SALES_ORDER_REVIEW_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
+export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
 export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
 
 // 表单默认值

package/dist/esm/servers/WLN/index.d.ts

@@ -1,2 +1 @@
 export * from './logisticsData';
-export * from './warehouseData';

package/dist/esm/servers/WLN/index.js

@@ -1,2 +1 @@
-export * from "./logisticsData";
-export * from "./warehouseData";
+export * from "./logisticsData";

package/dist/esm/utils/SendData.js

@@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 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 { BSE3, WDT, KM, GY, JST, JY, JKY, WLN } from "../servers/index";
+import { BSE3, WDT, KM, GY, JST, JY, JKY } from "../servers/index";
 var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
   var _this = this;
   _classCallCheck(this, SendData);
@@ -22,7 +22,8 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
         case 0:
           _context.next = 2;
           return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
-            console.log("发货仓数据---", _this.platform, list);
+            // console.log("发货仓数据---", this.platform, list);
+
             _this.sendData = list;
           });
         case 2:
@@ -71,8 +72,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
     gy: GY,
     jst: JST,
     jy: JY,
-    jky: JKY,
-    wln: WLN
+    jky: JKY
   }[this.platform];
 });
 export var SendDataCenter = /*#__PURE__*/function () {
@@ -90,7 +90,6 @@ 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/dist/gyOrderBackFormValues.js

@@ -0,0 +1,285 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+exports.__esModule = true;
+exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
+var getUUid_1 = require("./getUUid");
+var deliveryStateMap = {
+  0: "未发货",
+  2: "全部发货"
+};
+exports.GY_SYSTEM_ORDER_CONFIG = {
+  key: "gySystemShowOrder",
+  name: "管易",
+  selectId: "gySystemSelectIds",
+  columns: [{
+    dataIndex: "billType",
+    title: "订单类型",
+    width: 150
+  }, {
+    dataIndex: "billNo",
+    title: "系统订单号",
+    width: 160
+  }, {
+    dataIndex: "tradeTagName",
+    title: "订单标记名称",
+    width: 150
+  }, {
+    dataIndex: "billTag",
+    title: "订单标签",
+    width: 150
+  }, {
+    dataIndex: "deliveryState",
+    title: "发货状态",
+    width: 150
+  }]
+};
+exports.updateGyGoodsHandle = function (orders) {
+  if (orders === void 0) {
+    orders = [];
+  }
+  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
+    if (Array.isArray(cur.details)) {
+      acc.push.apply(acc, cur.details.map(function (item) {
+        var _a;
+        item.goodName = item.itemName;
+        item.goodShortName = item.itemSimpleName;
+        item.goodNo = item.itemCode;
+        item.specNo = item.skuCode;
+        item.specName = item.skuName;
+        item.canDelete = true;
+        item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
+        return item;
+      }));
+    }
+    return acc;
+  }, []);
+};
+var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
+  var _a, _b;
+  if (type === "logistics") {
+    //管易物流信息组件先不做
+    // const currentCom = comList?.find?.(
+    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
+    // );
+    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
+    // if (notOrderBack) {
+    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
+    //   currentValue = currentValue?.length
+    //     ? currentValue
+    //     : [{ logisticsCode: "", logisticsCompany: "" }];
+    //   return currentValue;
+    // }
+  } else if (type === "send") {
+    var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
+      return item.workOrderComponentType === "GY_SEND_GOOD";
+    });
+    var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
+    if (notOrderBack) {
+      var currentValue = form.getFieldValue(currentCom.uniqueKey);
+      currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
+        sendId: "",
+        sendName: ""
+      }];
+      return currentValue;
+    }
+  }
+  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) {
+      return {
+        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
+        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
+        platform: "gy",
+        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
+      };
+    });
+    var params = {
+      items: items
+    };
+    if (type === "logistics") {
+      // params.logisticsCompany = next?.shippingCode;
+      // params.logisticsCode = next?.shippingSn;
+    } else if (type === "send") {
+      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      //下拉框，取id
+      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
+      params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
+    }
+    prv.push(params);
+    return prv;
+  }, []);
+  if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
+    switch (type) {
+      case "logistics":
+        newList = [{
+          logisticsCode: ""
+        }];
+        break;
+      case "supply":
+        newList = [{
+          supplyId: ""
+        }];
+        break;
+      case "send":
+        newList = [{
+          sendId: "",
+          sendName: ""
+        }];
+        break;
+    }
+  }
+  return newList;
+};
+//管易订单信息转换
+exports.gyOrderTransform = function (detail, form) {
+  var _a, _b, _c, _d, _e, _f;
+  var orderNo = detail.orderNo,
+    _g = detail.trades,
+    currentTrades = _g === void 0 ? [] : _g,
+    componentList = detail.componentList;
+  var gyGoodsCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "GY_GOODS";
+  });
+  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
+  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
+  console.log("触发---getGyOrderList--4");
+  return {
+    gySystemOrder: {
+      orderNo: orderNo,
+      isTest: 4,
+      orders: currentTrades.map(function (item) {
+        return __assign(__assign({}, item), {
+          billNo: item.code,
+          billType: item.orderTypeName,
+          billTag: item.tagName,
+          tradeTagName: item.tradeTagName,
+          deliveryState: deliveryStateMap[item.deliveryState]
+        });
+      }),
+      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
+        return item.code;
+      }) : [],
+      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
+        return __assign(__assign({}, item), {
+          billNo: item.code,
+          billType: item.orderTypeName,
+          billTag: item.tagName,
+          tradeTagName: item.tradeTagName,
+          deliveryState: deliveryStateMap[item.deliveryState]
+        });
+      })
+    },
+    gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
+    gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
+      return !isStrict || !orderNo || good.platformCode === orderNo;
+    }) : [],
+    gyGoods: {
+      // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
+      orders: currentTrades,
+      orderNo: orderNo,
+      shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
+        return item.shopCode;
+      })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
+      vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
+        return item.vipCode;
+      })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
+      gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
+        return !isStrict || !orderNo || good.platformCode === orderNo;
+      })
+    },
+    // gyLogistics: updateGyItemListHandle(
+    //   currentTrades,
+    //   "logistics",
+    //   componentList || [],
+    //   form
+    // ),
+    gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
+  };
+};
+exports.gyOrderBackFormValues = function (detail, templateDetail) {
+  if (detail === void 0) {
+    detail = {};
+  }
+  if (templateDetail === void 0) {
+    templateDetail = {};
+  }
+  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+    var _a, _b;
+    var uniqueKey = next.uniqueKey;
+    var config = next.componentConfig;
+    switch (next.workOrderComponentType) {
+      case "GY_SYSTEM_ORDER":
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
+        break;
+      case "GY_GOODS":
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
+        break;
+      case "GY_REISSUE_GOODS":
+        prv[uniqueKey] = {
+          gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
+          gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
+          gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
+          gyReissueType: ["1"],
+          shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
+          vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
+        };
+        break;
+      case "GY_LOGISTICS":
+        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
+        break;
+      case "GY_SEND_GOOD":
+        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
+    }
+    return prv;
+  }, {});
+};
+var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
+  if (config === void 0) {
+    config = {};
+  }
+  var showField = config.showField,
+    _a = config.notOrderBack,
+    notOrderBack = _a === void 0 ? false : _a;
+  if (notOrderBack) {
+    return list;
+  }
+  return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
+    if (type === "logistics") {
+      if (!["logisticsCompany", ""].includes(showField || "")) {
+        next.logisticsCompany = undefined;
+      }
+      if (!["logisticsCode", ""].includes(showField || "")) {
+        next.logisticsCode = undefined;
+      }
+    } else if (type === "send") {
+      if (!["sendId", "all"].includes(showField || "")) {
+        next.sendId = undefined;
+      }
+      if (!["sendName", "all"].includes(showField || "")) {
+        next.sendName = undefined;
+        next.sendSnapshotName = undefined;
+      }
+    }
+    prv.push(next);
+    return prv;
+  }, []);
+};
+// 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
+exports.filterGyOrders = function (trades, order_no) {
+  var currentTrades = (trades || []).filter(function (item) {
+    return (item.platformCode || "").split(",").includes(order_no);
+  });
+  if (currentTrades.length) {
+    return currentTrades;
+  }
+  return [];
+};

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, updateWlnGoodsHandle, } from "./wlnOrderBackFormValues";
+export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, } 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,6 +22,7 @@ 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, updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
+export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform } 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,6 +23,7 @@ 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/wlnOrderBackFormValues.d.ts

@@ -3,29 +3,15 @@ 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 getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
-export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
-    canEdit?: boolean;
-    orderBackGoodsLevel?: string;
-}) => any;
+export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
 export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
-export declare const wlnOrderTransform: (detail: any, form: any) => {
-    wlnSystemOrderNo: any;
-    wlnReissueGoods: any;
+export declare const wlnOrderTransform: (detail: any) => {
     wlnSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -13,33 +13,8 @@ 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: "万里牛",
@@ -57,197 +32,45 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
     title: "标记",
     dataIndex: "billTag",
     width: 150
-  }, {
-    title: "是否拆分订单",
-    dataIndex: "splitTrade",
-    width: 150
-  }, {
-    title: "是否售后订单",
-    dataIndex: "exchangeTrade",
-    width: 150
-  }, {
-    title: "是否有退款",
-    dataIndex: "hasRefund",
-    width: 150
-  }, {
-    title: "是否预售订单",
-    dataIndex: "preSale",
-    width: 150
-  }, {
-    title: "合并前系统单号",
-    dataIndex: "mergeUids",
-    width: 150
-  }, {
-    title: "快递公司名称",
-    dataIndex: "logisticName",
-    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,
-    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,
-    render: function render(val, record) {
-      return renderPackageInfos(val, record, 'expressCode');
-    },
-    renderExport: function renderExport(val, record) {
-      return renderPackageInfos(val, record, 'expressCode', true);
-    }
-  }, {
-    title: "发货仓名称",
-    dataIndex: "storageName",
-    width: 150
-  }, {
-    title: "发货仓编码",
-    dataIndex: "storageCode",
-    width: 150
-  }, {
-    title: "单据处理状态",
-    dataIndex: "processStatus",
-    width: 150
-  }, {
-    title: "线上单号",
-    dataIndex: "tpTid",
-    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) {
-    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));
-        }
+    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
       });
-    } 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));
-    }
+    });
+    prv.push.apply(prv, _toConsumableArray(goods));
     return prv;
   }, []);
   return list;
 };
-var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
+var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
   var _newList;
-  if (type === "logistics") {
-    var _comList$find, _currentCom$component;
-    var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
-      return item.workOrderComponentType === "WLN_LOGISTICS";
-    });
-    var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
-    if (notOrderBack) {
-      var _currentValue;
-      var currentValue = form.getFieldValue(currentCom.uniqueKey);
-      currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
-        logisticsCode: "",
-        logisticsCompany: ""
-      }];
-      return currentValue;
-    }
-  } else if (type === "send") {
-    var _comList$find2, _currentCom$component2;
-    var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
-      return item.workOrderComponentType === "WLN_SEND_GOOD";
-    });
-    var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
-    if (_notOrderBack) {
-      var _currentValue3;
-      var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
-      _currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
-        sendId: "",
-        sendName: ""
-      }];
-      return _currentValue2;
-    }
-  }
-  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 newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
     var items = (next.items || []).map(function (t) {
       return {
         title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
@@ -324,17 +147,6 @@ 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;
@@ -349,48 +161,9 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
   }, {});
 };
 //wln订单信息转换
-export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
-  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,
-    _detail$trades = detail.trades,
-    currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
-    componentList = detail.componentList;
-  var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
-    return !trade.cancel;
-  });
-  var wlnGoodsCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "WLN_GOODS";
-  });
-  var wlnReissueCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "WLN_REISSUE_GOODS";
-  });
-  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;
-  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,
-  // });
+export var wlnOrderTransform = function wlnOrderTransform(detail) {
+  var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
   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) {
@@ -404,21 +177,19 @@ 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 _objectSpread(_objectSpread({}, item), {}, {
+        return {
           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, {
-        orderBackGoodsLevel: wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen2 = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen2 === void 0 ? void 0 : _wlnGoodsCom$componen2.orderBackGoodsLevel
-      }),
+      wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
       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),
-    wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
+    wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics"),
+    wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send")
   };
 };

package/package.json

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

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

@@ -1,7 +0,0 @@
-declare type WarehouseType = {
-    disabled: boolean;
-    label: string;
-    value: string;
-};
-export declare const getWarehouseDataAsync: () => Promise<WarehouseType[]>;
-export default getWarehouseDataAsync;

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

@@ -1,32 +0,0 @@
-import { fetchAll } from "../../utils";
-import request from "../../request";
-var queryWarehouseList = function queryWarehouseList(_ref) {
-  var pageNo = _ref.pageNo,
-    pageSize = _ref.pageSize;
-  return request({
-    url: "/qy/gdfw/wln/erp/warehouse/list",
-    method: "post",
-    data: {
-      pageNo: pageNo,
-      pageSize: pageSize
-    }
-  });
-};
-export var getWarehouseDataAsync = function getWarehouseDataAsync() {
-  return fetchAll("WLN_WAREHOUSE_DATA", queryWarehouseList, function (data) {
-    var list = [];
-    var warehouses = data || [];
-    warehouses.map(function (_ref2) {
-      var storageCode = _ref2.storageCode,
-        storageName = _ref2.storageName,
-        status = _ref2.status;
-      list.push({
-        label: storageName,
-        value: storageCode,
-        disabled: [0, 2].includes(status)
-      });
-    });
-    return list;
-  });
-};
-export default getWarehouseDataAsync;