@kmkf-fe-packages/kmkf-utils 2.0.74 → 2.0.76

package/README.md

@@ -1 +1 @@
-11231111111
+112311111111

package/dist/esm/baseAddressData/baseAddressData.js

@@ -53,7 +53,7 @@ var BaseAddressData = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
-      return codes;
+      return codes.filter(Boolean);
     }
   }]);
   return BaseAddressData;

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

@@ -9,9 +9,7 @@ export declare const BS_SYSTEM_ORDER_CONFIG: {
     }[];
 };
 export declare const bsOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
-export declare const specialCascader = "8MIqJOso1j";
-export declare const hasQualityValue: (value: any[], uniqueKey: string, componentConfig: Record<any, string>) => boolean;
-export declare const bsOrderTransform: ({ detail, componentDtoList, form }: any) => {
+export declare const bsOrderTransform: ({ detail }: any) => {
     bsSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/bsOrderBackFormValues.js

@@ -7,7 +7,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import ExpressData from "../expressData";
 import ExpressInterceptData from "../expressInterceptData";
 import uuid from "./getUUid";
-import { findLabelBySelectValue } from "./index";
 export var BS_SYSTEM_ORDER_CONFIG = {
   key: "bsSystemShowOrder",
   name: "百胜",
@@ -43,7 +42,6 @@ export var BS_SYSTEM_ORDER_CONFIG = {
 
 var updateBsGoodsHandle = function updateBsGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var hasQuality = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var list = orders.reduce(function (prv, next) {
     var goods = next.items.map(function (item) {
       var id = item.id,
@@ -82,7 +80,7 @@ var updateBsGoodsHandle = function updateBsGoodsHandle() {
     return prv;
   }, []);
   //如果数量大于1 商品标记为否
-  if (list.length > 1 && !hasQuality) {
+  if (list.length > 1) {
     list = list.map(function (item) {
       item.mark = "否";
       return item;
@@ -284,36 +282,12 @@ export var bsOrderBackFormValues = function bsOrderBackFormValues() {
     return prv;
   }, {});
 };
-// 花西子特定自定义组件 写死
-export var specialCascader = "8MIqJOso1j";
-// 花西子定制需求对应的问题场景自定义多级下拉组件uniqueKey
 
-export var hasQualityValue = function hasQualityValue(value, uniqueKey, componentConfig) {
-  if (specialCascader === uniqueKey) {
-    var _findLabelBySelectVal, _findLabelBySelectVal2;
-    var label = (_findLabelBySelectVal = findLabelBySelectValue(value, componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (item) {
-      return item.label;
-    })) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2[0];
-    return label === "质量类";
-  }
-  return false;
-};
 //bs订单信息转换
 export var bsOrderTransform = function bsOrderTransform(_ref) {
   var _detail$orders, _detail$orders$, _detail$orders$$advan, _detail$orders2, _ref2, _detail$orders3, _detail$orders3$, _detail$orders3$$adva, _detail$orders3$$adva2;
-  var detail = _ref.detail,
-    componentDtoList = _ref.componentDtoList,
-    form = _ref.form;
+  var detail = _ref.detail;
   var advItem = (detail === null || detail === void 0 ? void 0 : (_detail$orders = detail.orders) === null || _detail$orders === void 0 ? void 0 : (_detail$orders$ = _detail$orders[0]) === null || _detail$orders$ === void 0 ? void 0 : (_detail$orders$$advan = _detail$orders$.advancedDistributionInfos) === null || _detail$orders$$advan === void 0 ? void 0 : _detail$orders$$advan[0]) || {};
-  // 花西子定制的问题场景自定义组件,判断改组件的值是否为质量类
-  var cascader = componentDtoList === null || componentDtoList === void 0 ? void 0 : componentDtoList.find(function (item) {
-    return specialCascader === (item === null || item === void 0 ? void 0 : item.uniqueKey);
-  });
-  var hasQuality = false;
-  if (cascader !== null && cascader !== void 0 && cascader.componentConfig) {
-    var v = form.getFieldValue(specialCascader);
-    hasQuality = hasQualityValue(v, cascader.uniqueKey, cascader === null || cascader === void 0 ? void 0 : cascader.componentConfig);
-  }
   return {
     bsSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.sourceBillNo,
@@ -348,7 +322,7 @@ export var bsOrderTransform = function bsOrderTransform(_ref) {
     }, 0) || null,
     bsGoods: {
       shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
-      bsGoods: updateBsGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders, hasQuality)
+      bsGoods: updateBsGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders)
     },
     bsExchangeGoods: {
       shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,

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

@@ -7,7 +7,7 @@ export { default as getExpression } from "./getExpression";
 export { default as formatDisplayConfig } from "./formatDisplayConfig";
 export { default as orderBackFormValues } from "./orderBackFormValues";
 export { default as pushGyLog } from "./pushGyLog";
-export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, hasQualityValue, } from "./bsOrderBackFormValues";
+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, } from "./wlnOrderBackFormValues";
 export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, tradeStatusMap, } from "./wdtOrderBackFormValues";

package/dist/esm/utils/index.js

@@ -7,7 +7,7 @@ export { default as getExpression } from "./getExpression";
 export { default as formatDisplayConfig } from "./formatDisplayConfig";
 export { default as orderBackFormValues } from "./orderBackFormValues";
 export { default as pushGyLog } from "./pushGyLog";
-export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, hasQualityValue } from "./bsOrderBackFormValues";
+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 } from "./wlnOrderBackFormValues";
 export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, tradeStatusMap } from "./wdtOrderBackFormValues";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.74",
+  "version": "2.0.76",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "33def4c863f35acd939ef023dcf87fb64f80c4b9",
+  "gitHead": "d9f5d5ba6a83f248c39d24693a3a622c892b3bcf",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }