@kmkf-fe-packages/kmkf-utils 2.0.54-beta.62 → 2.0.54-beta.64

package/dist/esm/utils/gyOrderBackFormValues.js

@@ -178,11 +178,14 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
 
 //管易订单信息转换
 export var gyOrderTransform = function gyOrderTransform(detail, form) {
-  var _form$getFieldValue, _gyReissueCom$compone, _gyReturnCom$componen, _currentTrades$, _currentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
+  var _form$getFieldValue, _gyReissueCom$compone, _gyReturnCom$componen, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
   var orderNo = detail.orderNo,
     _detail$trades = detail.trades,
     currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
     componentList = detail.componentList;
+  var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
+    return !trade.cancel;
+  });
   var gyGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "GY_GOODS";
   });
@@ -193,7 +196,7 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
     return com.workOrderComponentType === "GY_RETURN_GOODS";
   });
   var isStrict = gyGoodsCom ? (_form$getFieldValue = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
-  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
+  var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
   var isReissueDefaultSelect = !!(gyReissueCom !== null && gyReissueCom !== void 0 && (_gyReissueCom$compone = gyReissueCom.componentConfig) !== null && _gyReissueCom$compone !== void 0 && _gyReissueCom$compone.showDefaultSelect);
   var isReturnDefaultSelect = !!(gyReturnCom !== null && gyReturnCom !== void 0 && (_gyReturnCom$componen = gyReturnCom.componentConfig) !== null && _gyReturnCom$componen !== void 0 && _gyReturnCom$componen.showDefaultSelect);
   return {
@@ -229,12 +232,12 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
         });
       })
     },
-    gyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.code : undefined,
-    gySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_currentTrades$2 = currentTrades[0]) === null || _currentTrades$2 === void 0 ? void 0 : _currentTrades$2.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
+    gyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.code : undefined,
+    gySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.code : undefined,
+    gyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateGyGoodsHandle([filterCurrentTrades[0]]).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
-    gyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
+    gyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateGyGoodsHandle([filterCurrentTrades[0]]).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
     gyGoods: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.54-beta.62",
+  "version": "2.0.54-beta.64",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0cb1562fabd672a70adddf76d9bdd5eff01ada38",
+  "gitHead": "188e5c355e1e58cd6ede3265a722d57a7b8b1bd0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }