@kmkf-fe-packages/kmkf-utils 2.9.0 → 2.9.1-beta.10

package/README.md

@@ -1 +1 @@
-112311111
+112311111

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

@@ -33,7 +33,7 @@ export declare const jstOrderTransform: (detail: any, form: any) => {
     jstReissueGoods: any;
     jstReturnGoods: any;
     jstSystemOrderBillType: any;
-    jstReturnSystemOrderBillType: any;
+    shopCode: any;
     jstGoods: {
         isRequest: boolean;
         allOrders: any;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -54,6 +54,7 @@ export var updateJstGoodsHandle = function updateJstGoodsHandle() {
     item.canEdit = !!options.canEdit;
     item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
     item.systemOrderNo = systemOrderNo;
+    item.saleAmount = ((item.qty || 0) * (item.salePrice || 0)).toFixed(2);
     return _objectSpread({}, item);
   };
   var list = orders.reduce(function (prv, next) {
@@ -237,7 +238,7 @@ export var jstMergeIdenticalGoods = function jstMergeIdenticalGoods() {
 export var jstOrderBackFormValues = function jstOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+  var res = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     switch (next.workOrderComponentType) {
@@ -266,10 +267,13 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
             jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
             jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderNo,
             jstReturnType: [_initReason],
-            jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
-            jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderBillType) || ""
+            shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
+            jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || [])
+            // jstSystemOrderBillType:
+            //   detail?.jstReturnSystemOrderBillType || "",
           };
         }
+
         break;
       case "JST_ITEM_SELECT_THIRD":
         prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstItemSelectThird, "itemList", config);
@@ -286,10 +290,11 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
     }
     return prv;
   }, {});
+  return res;
 };
 //jst订单信息转换
 export var jstOrderTransform = function jstOrderTransform(detail, form) {
-  var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call, _jstGoodsCom$componen;
+  var _form$getFieldValue, _jstReissueCom$compon, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _jstReturnCom$compone, _newOrderList$3, _orderList$find, _orderList$find$call, _orderList$find2, _orderList$find2$call, _jstGoodsCom$componen;
   var orderNo = detail.orderNo,
     _detail$orderList = detail.orderList,
     orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -311,7 +316,8 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
   });
   var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
   var isReissueDefaultSelect = !!(jstReissueCom !== null && jstReissueCom !== void 0 && (_jstReissueCom$compon = jstReissueCom.componentConfig) !== null && _jstReissueCom$compon !== void 0 && _jstReissueCom$compon.showDefaultSelect);
-  var isReturnDefaultSelect = !!(jstReturnCom !== null && jstReturnCom !== void 0 && (_jstReturnCom$compone = jstReturnCom.componentConfig) !== null && _jstReturnCom$compone !== void 0 && _jstReturnCom$compone.showDefaultSelect);
+  // 退货商品不用选择系统订单号，所以当做固定选中默认值
+  var isReturnDefaultSelect = true;
   var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
   return {
     jstSystemOrder: {
@@ -334,12 +340,19 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: jstReturnCom === null || jstReturnCom === void 0 ? void 0 : (_jstReturnCom$compone = jstReturnCom.componentConfig) === null || _jstReturnCom$compone === void 0 ? void 0 : _jstReturnCom$compone.orderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     jstSystemOrderBillType: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
-    jstReturnSystemOrderBillType: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$4 = newOrderList[0]) === null || _newOrderList$4 === void 0 ? void 0 : _newOrderList$4.orderType : "",
+    // jstReturnSystemOrderBillType:
+    //   onlyOneSystemOrder || isReturnDefaultSelect
+    //     ? newOrderList[0]?.orderType
+    //     : "",
+    shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find = orderList.find) === null || _orderList$find === void 0 ? void 0 : (_orderList$find$call = _orderList$find.call(orderList, function (item) {
+      return item.shopId;
+    })) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.shopId) || null,
     jstGoods: {
       //标记通过请求获取的值
       isRequest: true,
@@ -347,9 +360,9 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
       orders: orderList || [],
       orderNo: orderNo,
-      shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find = orderList.find) === null || _orderList$find === void 0 ? void 0 : (_orderList$find$call = _orderList$find.call(orderList, function (item) {
-        return item.sdCode;
-      })) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.sdCode) || null,
+      shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find2 = orderList.find) === null || _orderList$find2 === void 0 ? void 0 : (_orderList$find2$call = _orderList$find2.call(orderList, function (item) {
+        return item.shopId;
+      })) === null || _orderList$find2$call === void 0 ? void 0 : _orderList$find2$call.shopId) || null,
       jstGoods: updateJstGoodsHandle(orderList, {
         orderBackGoodsLevel: jstGoodsCom === null || jstGoodsCom === void 0 ? void 0 : (_jstGoodsCom$componen = jstGoodsCom.componentConfig) === null || _jstGoodsCom$componen === void 0 ? void 0 : _jstGoodsCom$componen.orderBackGoodsLevel
       }).filter(function (good) {

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.0",
+  "version": "2.9.1-beta.10",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "50a9ed976dfe5d2718b966cbd974a3d69c0bc1fd",
+  "gitHead": "760a35961b867b5ff48e93d67040ee0de30756a4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }