@kmkf-fe-packages/kmkf-utils 2.7.4 → 2.7.6

package/dist/esm/constants/msgTypeMapping.js

@@ -21,6 +21,7 @@ var msgTypeCh = {
   logistics: "中通/圆通/申通售后群消息",
   negotiate: "协商售后",
   QN_LOGISTICS_INTERCEPTION: "物流拦截（平台）",
-  GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息"
+  GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息",
+  JST_ADD_MANUAL_ORDER: "聚水潭新增手工订单"
 };
 export default msgTypeCh;

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/kmOrderBackFormValues.d.ts

@@ -132,6 +132,7 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
         orderNo: any;
         orders: any;
         selectIds: any;
+        selectedRows: any;
         showOrderInfo: any;
     };
     kmLogistics: any;

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -401,11 +401,12 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
 
 //km订单信息转换
 export var kmOrderTransform = function kmOrderTransform(detail, form) {
-  var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
+  var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _selectedSystemOrders, _postingComponent$com, _orderBackTrades$find, _orderBackTrades$find2;
   var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
   var _ref = detail || {},
     orderNo = _ref.orderNo,
-    componentList = _ref.componentList;
+    componentList = _ref.componentList,
+    matchLogisticsNo = _ref.matchLogisticsNo;
   var kmGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "KM_GOODS";
   });
@@ -434,13 +435,24 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   });
   var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
   var kmPosting;
-  if (onlyOneSystemOrder && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
-    kmPosting = handleKmAddressIdentify(trades[0]);
+  var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
+  var matchedSystemOrders = matchLogisticsNo ? trades.filter(function (item) {
+    return "".concat((item === null || item === void 0 ? void 0 : item.outSid) || (item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
+  }) : [];
+  var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
+    return item.sid;
+  });
+  var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
+  var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
+  var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : trades;
+  var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.sid;
+  var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
+  if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
+    kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
     console.log("kmPosting", kmPosting);
   }
-  var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
   return {
-    kmSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
+    kmSystemOrderNo: selectedSystemOrderNo,
     kmSystemOrder: {
       //标记通过请求获取的值
       isRequest: true,
@@ -453,9 +465,17 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
           billTag: item.tags
         });
       }),
-      selectIds: onlyOneSystemOrder ? trades.map(function (item) {
+      selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? trades.map(function (item) {
         return item.sid;
       }) : [],
+      selectedRows: selectedRows.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          billNo: item.sid,
+          sysStatus: item.sysStatus,
+          billType: item.type,
+          billTag: item.tags
+        });
+      }),
       showOrderInfo: trades.map(function (item) {
         return {
           billNo: item.sid,
@@ -465,35 +485,35 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
         };
       })
     },
-    kmLogistics: updateKmItemListHandle(trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    kmSendGood: updateKmItemListHandle(trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    kmLogistics: updateKmItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    kmSendGood: updateKmItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
     kmGoods: {
       //标记通过请求获取的值
       isRequest: true,
       allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders,
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: trades,
+      orders: orderBackTrades,
       orderNo: orderNo,
-      shopCode: (trades === null || trades === void 0 ? void 0 : (_trades$find = trades.find) === null || _trades$find === void 0 ? void 0 : (_trades$find$call = _trades$find.call(trades, function (item) {
+      shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
         return item.shopCode;
-      })) === null || _trades$find$call === void 0 ? void 0 : _trades$find$call.shopCode) || null,
-      kmGoods: updateKmGoodsHandle(trades, {
+      })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopCode) || null,
+      kmGoods: updateKmGoodsHandle(orderBackTrades, {
         orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
       })
     },
-    kmReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateKmGoodsHandle(defaultOrder, {
+    kmReissueGoods: selectedSystemOrders.length ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {
       return !isStrict || !orderNo || good.sid === orderNo;
     }) : [],
-    kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
+    kmReturnGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
       canEdit: true
     }, "KM_RETURN_GOODS").filter(function (good) {
       return !isStrict || !orderNo || good.sid === orderNo;
     }) : [],
-    kmExchangeGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
+    kmExchangeGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
       orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {

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

@@ -17,9 +17,10 @@ interface OrderBackFormValuesI {
     formValue?: Record<string, unknown>;
     order_no?: string | null;
     detail: Record<string, unknown>;
-    fromQNCreateWorkOrderByOrderNo: boolean;
+    fromQNCreateWorkOrderByOrderNo?: boolean;
+    skipOrderBackUniqueKeys?: string[];
     _get_order_fail_?: boolean;
     shopId?: string;
 }
-declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
+declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, skipOrderBackUniqueKeys, }: OrderBackFormValuesI) => any;
 export default _default;

package/dist/esm/utils/orderBackFormValues.js

@@ -86,7 +86,9 @@ export default (function (_ref) {
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? "add" : _ref$type,
     _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
-    fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
+    fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork,
+    _ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
+    skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
   var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
     var uniqueKey = next.uniqueKey;
@@ -94,7 +96,7 @@ export default (function (_ref) {
     var city = null,
       town = null;
     // console.log("--订单返填数据重组", next.workOrderComponentType);
-
+    if (skipOrderBackUniqueKeys.includes(uniqueKey)) return prv;
     switch (next.workOrderComponentType) {
       case "TRADE_ID_INPUT":
         prv[uniqueKey] = (_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.toUpperCase ? (_ref2 = order_no || detail["orderNo"]) === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase() : order_no || detail["orderNo"];

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

@@ -58,6 +58,7 @@ export declare const wdtOrderTransform: (detail: any, form: any) => {
         orderNo: any;
         orders: any;
         selectIds: any;
+        selectedRows: any;
         showOrderInfo: any;
     };
     wdtReturnSystemOrder: {

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -513,7 +513,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
 };
 //wdt订单信息转换
 export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
-  var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _wdtReturnOrders$find, _wdtReturnOrders$find2, _currentTrades$2;
+  var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _selectedSystemOrders, _orderBackTrades$find, _orderBackTrades$find2, _wdtReturnOrders$find, _wdtReturnOrders$find2, _orderBackTrades$;
   var orderNo = detail.orderNo,
     _detail$trades = detail.trades,
     currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -521,7 +521,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
     _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     _detail$wdtReturnOrde = detail.wdtReturnOrders,
-    wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde;
+    wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
+    matchLogisticsNo = detail.matchLogisticsNo;
   var wdtGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "WDT_GOODS";
   });
@@ -532,6 +533,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
   var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
   var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
+  var matchedSystemOrders = matchLogisticsNo ? currentTrades.filter(function (item) {
+    return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
+  }) : [];
+  var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
+    return item.tradeNo;
+  });
+  var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
+  var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
+  var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : currentTrades;
+  var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.tradeNo;
   return {
     wdtSystemOrder: {
       //标记通过请求获取的值
@@ -546,9 +557,18 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
           logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
+      selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
+      selectedRows: selectedRows.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          billNo: item.tradeNo,
+          billType: WDT_ORDER_TYPE_MAP[item.tradeType],
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
+          logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
+        });
+      }),
       showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
@@ -569,8 +589,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       }) : [],
       showOrderInfo: wdtReturnOrders || []
     },
-    wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
-    wdtReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWdtGoodsHandle(defaultOrder).filter(function (good) {
+    wdtSystemOrderNo: selectedSystemOrderNo,
+    wdtReissueGoods: selectedSystemOrders.length ? updateWdtGoodsHandle(selectedSystemOrders).filter(function (good) {
       return !isStrict || !orderNo || good.srcTid === orderNo;
     }) : [],
     wdtGoods: {
@@ -578,12 +598,12 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       isRequest: true,
       allOrders: allOrders,
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
+      orders: orderBackTrades,
       orderNo: orderNo,
-      shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
+      shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
         return item.shopNo;
-      })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopNo) || null,
-      wdtGoods: updateWdtGoodsHandle(currentTrades).filter(function (good) {
+      })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopNo) || null,
+      wdtGoods: updateWdtGoodsHandle(orderBackTrades).filter(function (good) {
         return !isStrict || !orderNo || good.srcTid === orderNo;
       })
     },
@@ -596,9 +616,9 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       })) === null || _wdtReturnOrders$find2 === void 0 ? void 0 : _wdtReturnOrders$find2.shopNo) || null,
       wdtAftersaleGoods: updateWdtAftersaleGoodsHandle(wdtReturnOrders)
     },
-    wdtLogistics: updateWdtItemListHandle(currentTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    wdtSendGood: updateWdtItemListHandle(currentTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
-    shopCode: (_currentTrades$2 = currentTrades[0]) === null || _currentTrades$2 === void 0 ? void 0 : _currentTrades$2.shopNo
+    wdtLogistics: updateWdtItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    wdtSendGood: updateWdtItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    shopCode: (_orderBackTrades$ = orderBackTrades[0]) === null || _orderBackTrades$ === void 0 ? void 0 : _orderBackTrades$.shopNo
     // wdtSingingTime: detail?.receiptDate,
     // wdtSendTime:
     //   detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "950e70d696e58b3340e24e8c4a44b53029036922",
+  "gitHead": "28497f73db84e16b6e6ae0b280e8e4158a3f1731",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }