@kmkf-fe-packages/kmkf-utils 2.7.3-beta.4 → 2.7.3-beta.8

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/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,
@@ -533,11 +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 matchedSystemOrderIds = matchLogisticsNo ? currentTrades.filter(function (item) {
+  var matchedSystemOrders = matchLogisticsNo ? currentTrades.filter(function (item) {
     return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
-  }).map(function (item) {
-    return item.tradeNo;
   }) : [];
+  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: {
       //标记通过请求获取的值
@@ -555,6 +560,15 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
       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,
@@ -575,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: {
@@ -584,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;
       })
     },
@@ -602,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.3-beta.4",
+  "version": "2.7.3-beta.8",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "006184824679eeb9a994787da6e31518e6d6f981",
+  "gitHead": "540b1e9969b3f7dfd05773d0daccf36935c58b2c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }