@kmkf-fe-packages/kmkf-utils 2.9.1-beta.0 → 2.9.1-beta.12

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -338,7 +338,7 @@ export var getJkyLogisticInfo = function getJkyLogisticInfo(item, typeKey) {
 };
 //吉客云订单信息转换
 export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
-  var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
+  var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _jkyReissueCom$compon2, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
   var _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     orderNo = detail.orderNo,
@@ -364,6 +364,7 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
   var jkyGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
     return item.workOrderComponentType === "JKY_GOODS";
   })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
+  var jkyReissueGoodsOrderBackGoodsLevel = jkyReissueCom === null || jkyReissueCom === void 0 ? void 0 : (_jkyReissueCom$compon2 = jkyReissueCom.componentConfig) === null || _jkyReissueCom$compon2 === void 0 ? void 0 : _jkyReissueCom$compon2.orderBackGoodsLevel;
   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), {}, {
@@ -387,7 +388,8 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
     jkyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.tradeNo : undefined,
     jkySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.tradeNo : undefined,
     jkyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJkyGoodsHandle(defaultOrder, {
-      canEdit: true
+      canEdit: true,
+      orderBackGoodsLevel: jkyReissueGoodsOrderBackGoodsLevel
     }).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],

package/dist/esm/utils/orderBackFormValues.js

@@ -71,6 +71,35 @@ var taobaoGoodHandle = function taobaoGoodHandle() {
   // console.log(newList);
   return newList;
 };
+/**
+ * 根据物流公司获取默认拦截类型
+ * 优先级：interceptTypeDefaults 配置 > interceptionTypeList 中 isDefault 标记
+ */
+var getDefaultInterceptType = function getDefaultInterceptType(interceptCompanyCode, interceptTypeDefaults) {
+  if (!interceptCompanyCode) return undefined;
+  var expressInterceptData = ExpressInterceptData.getInstance().getExpressData();
+  var companyData = expressInterceptData.find(function (t) {
+    return t.value === interceptCompanyCode;
+  });
+  var interceptionTypeList = (companyData === null || companyData === void 0 ? void 0 : companyData.interceptionTypeList) || [];
+
+  // 优先使用拦截类型默认值配置
+  var configuredDefault = interceptTypeDefaults === null || interceptTypeDefaults === void 0 ? void 0 : interceptTypeDefaults[interceptCompanyCode];
+  if (configuredDefault) {
+    var match = interceptionTypeList.find(function (item) {
+      return item.value === configuredDefault;
+    });
+    if (match) return match.value;
+  }
+
+  // 没有配置默认值时，使用 isDefault 逻辑
+  var defaultType = interceptionTypeList.find(function (item) {
+    var _item$config;
+    return item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.isDefault;
+  });
+  return defaultType === null || defaultType === void 0 ? void 0 : defaultType.value;
+};
+
 //订单返填数据重组
 export default (function (_ref) {
   var shopId = _ref.shopId,
@@ -197,10 +226,11 @@ export default (function (_ref) {
           var interceptCompany = (_formValue$uniqueKey = formValue[uniqueKey]) === null || _formValue$uniqueKey === void 0 ? void 0 : _formValue$uniqueKey.interceptCompany;
           var isInterface = interceptCompany ? ExpressInterceptData.getInstance().isInterfaceCompany(interceptCompany) : false;
           if (type === "edit" && isInterface) break;
+          var interceptCompanyCode = ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]);
           prv[uniqueKey] = {
-            interceptCompany: ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]),
+            interceptCompany: interceptCompanyCode,
             interceptCode: detail["expressLogisticsCode"],
-            interceptType: undefined,
+            interceptType: getDefaultInterceptType(interceptCompanyCode, config.interceptTypeDefaults),
             interceptSenderMobile: undefined,
             interceptAddress: [],
             interceptDetail: undefined,
@@ -227,10 +257,11 @@ export default (function (_ref) {
       case "LOGISTICS_INTERCEPTION_MORE":
         if (config.isOpen) {
           if (config.logisticsMapping.companyType === "EXPRESS_LOGISTICS_SELECT") {
+            var _interceptCompanyCode = ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]);
             prv[uniqueKey] = [{
-              interceptCompany: ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]),
+              interceptCompany: _interceptCompanyCode,
               interceptCode: detail["expressLogisticsCode"],
-              interceptType: undefined,
+              interceptType: getDefaultInterceptType(_interceptCompanyCode, config.interceptTypeDefaults),
               interceptSenderMobile: undefined,
               interceptAddress: [],
               interceptDetail: undefined,

package/dist/esm/utils/unTransField.js

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

package/package.json

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