@kmkf-fe-packages/kmkf-utils 2.5.1-rc.0 → 2.5.1

package/dist/esm/servers/JST/orderDetailWrap.js

@@ -38,7 +38,7 @@ function jstOrderDetailDataToOrderOutData(res) {
   return _objectSpread(_objectSpread({}, res), {}, {
     data: res.data.orders.map(function (order) {
       return _objectSpread(_objectSpread({}, order), {}, {
-        orderType: order.erpOrderType
+        orderType: order.newOrderType
       });
     })
   });
@@ -54,6 +54,17 @@ export var jstOrderDetailWrap = function jstOrderDetailWrap(soId) {
       });
     }
     return jstOrderDetailDataToOrderOutData(res);
+  }).then(function (res) {
+    var _res$data2;
+    if (res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.length) {
+      res.data = res.data.map(function (order) {
+        order.items = order.items.filter(function (item) {
+          return !(item.qty === 0 && item.skuType === "combine");
+        });
+        return order;
+      });
+    }
+    return res;
   }).catch(function (e) {
     // console.log('***** in e', e);
     return jstOrderOutList({

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

@@ -10,7 +10,10 @@ export declare const JST_SYSTEM_ORDER_CONFIG: {
     }[];
 };
 export declare const JST_ORDER_STATUS_MAP: Record<number, string>;
-export declare const updateJstGoodsHandle: (orders?: any[], canEdit?: boolean) => any;
+export declare const updateJstGoodsHandle: (orders?: any[], options?: {
+    canEdit?: boolean;
+    orderBackGoodsLevel?: string;
+}) => any;
 export declare const jstMergeIdenticalGoods: <T extends {
     skuId: string;
     qty: number;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -44,18 +44,43 @@ export var JST_ORDER_STATUS_MAP = {
 };
 export var updateJstGoodsHandle = function updateJstGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var canEdit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    canEdit: false,
+    orderBackGoodsLevel: "1"
+  };
+  var wrapItem = function wrapItem(item, systemOrderNo) {
+    var _item$uuid;
+    item.canDelete = true;
+    item.canEdit = !!options.canEdit;
+    item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
+    item.systemOrderNo = systemOrderNo;
+    return _objectSpread({}, item);
+  };
   var list = orders.reduce(function (prv, next) {
-    var _next$items;
-    var goods = (next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.map(function (item) {
-      var _item$uuid;
-      item.canDelete = true;
-      item.canEdit = canEdit;
-      item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
-      item.systemOrderNo = next === null || next === void 0 ? void 0 : next.oId;
-      return _objectSpread({}, item);
-    })) || [];
-    prv.push.apply(prv, _toConsumableArray(goods));
+    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.skuType === 'combine') {
+          item.subItems.forEach(function (subItem) {
+            var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.oId);
+            newSubItem.batchId = item.batchId;
+            newSubItem.isGift = item.isGift;
+            newSubItem.qty = subItem.qty * item.qty;
+            prv.push(newSubItem);
+          });
+        } else {
+          prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.oId));
+        }
+      });
+    } 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.oId);
+      })) || [];
+      prv.push.apply(prv, _toConsumableArray(goods));
+    }
     return prv;
   }, []);
   return list;
@@ -264,7 +289,7 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
 };
 //jst订单信息转换
 export var jstOrderTransform = function jstOrderTransform(detail, form) {
-  var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call;
+  var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call, _jstGoodsCom$componen;
   var orderNo = detail.orderNo,
     _detail$orderList = detail.orderList,
     orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -302,10 +327,15 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
     jstReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
     // TODO: 当只有一条系统单时默认选中该系统单
     jstSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.oId : undefined,
-    jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJstGoodsHandle(defaultOrder, true).filter(function (good) {
+    jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: jstReissueCom === null || jstReissueCom === void 0 ? void 0 : (_jstReissueCom$compon2 = jstReissueCom.componentConfig) === null || _jstReissueCom$compon2 === void 0 ? void 0 : _jstReissueCom$compon2.orderBackGoodsLevel,
+      canEdit: true
+    }).filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
-    jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, true).filter(function (good) {
+    jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
+      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 : "",
@@ -320,7 +350,9 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       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,
-      jstGoods: updateJstGoodsHandle(orderList).filter(function (good) {
+      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) {
         return !isStrict || !orderNo || good.originalDealCode === orderNo;
       })
     },

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -189,7 +189,9 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
     return (list || []).map(function (item) {
       var _item$uuid;
       item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
+      var sysItemOuterId = config.orderBackGoodsLevel !== "2" ? item.detailSysItemOuterId : item.sysItemOuterId;
       return _objectSpread(_objectSpread({}, item), {}, {
+        sysItemOuterId: sysItemOuterId,
         sysTitle: item.title,
         title: item.platformTitle,
         num: item.itemNum || item.num,

package/package.json

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