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

package/dist/esm/utils/bsE3OrderBackFormValues.js

@@ -376,7 +376,7 @@ export var bsE3OrderBackFormValues = function bsE3OrderBackFormValues() {
 };
 //bsE3订单信息转换
 export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
-  var _form$getFieldValue, _newOrderList$, _orderList$find, _orderList$find$call;
+  var _form$getFieldValue, _bsE3ReissueCom$compo, _newOrderList$, _orderList$find, _orderList$find$call;
   var orderNo = detail.orderNo,
     _detail$orderList = detail.orderList,
     orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -384,6 +384,9 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
   var bsE3GoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "BS_E3_GOODS";
   });
+  var bsE3ReissueCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "BS_E3_REISSUE_GOODS";
+  });
   var isStrict = bsE3GoodsCom ? (_form$getFieldValue = form.getFieldValue(bsE3GoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -391,6 +394,7 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
     });
   });
   var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
+  var isReissueDefaultSelect = !!(bsE3ReissueCom !== null && bsE3ReissueCom !== void 0 && (_bsE3ReissueCom$compo = bsE3ReissueCom.componentConfig) !== null && _bsE3ReissueCom$compo !== void 0 && _bsE3ReissueCom$compo.showDefaultSelect);
   return {
     bsE3SystemOrder: {
       orderNo: orderNo,
@@ -401,8 +405,8 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
       showOrderInfo: newOrderList
     },
     // TODO: 当只有一条系统单时默认选中该系统单
-    bsE3SystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
-    bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]], "sharePrice").filter(function (good) {
+    bsE3SystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
+    bsE3ReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateBsE3GoodsHandle([newOrderList[0]], "sharePrice").filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     bsE3Goods: {

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

@@ -20,6 +20,7 @@ export declare const gyOrderTransform: (detail: any, form: any) => {
         selectIds: any;
         showOrderInfo: any;
     };
+    gyReturnSystemOrderNo: any;
     gySystemOrderNo: any;
     gyReissueGoods: any;
     gyReturnGoods: any;

package/dist/esm/utils/gyOrderBackFormValues.js

@@ -29,6 +29,10 @@ export var GY_SYSTEM_ORDER_CONFIG = {
     dataIndex: "billNo",
     title: "系统订单号",
     width: 160
+  }, {
+    dataIndex: "cancelName",
+    title: "是否取消",
+    width: 100
   }, {
     dataIndex: "tradeTagName",
     title: "订单标记名称",
@@ -174,7 +178,7 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
 
 //管易订单信息转换
 export var gyOrderTransform = function gyOrderTransform(detail, form) {
-  var _form$getFieldValue, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
+  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 orderNo = detail.orderNo,
     _detail$trades = detail.trades,
     currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -182,8 +186,16 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
   var gyGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "GY_GOODS";
   });
+  var gyReissueCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "GY_REISSUE_GOODS";
+  });
+  var gyReturnCom = (componentList || []).find(function (com) {
+    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 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 {
     gySystemOrder: {
       orderNo: orderNo,
@@ -196,7 +208,8 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
           billTag: item.tagName,
           tradeTagName: item.tradeTagName,
           deliveryState: item.deliveryState,
-          deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
+          deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState],
+          cancelName: item !== null && item !== void 0 && item.cancel ? "是" : "否"
         });
       }),
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
@@ -211,15 +224,17 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
           billTag: item.tagName,
           tradeTagName: item.tradeTagName,
           deliveryState: item.deliveryState,
-          deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
+          deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState],
+          cancelName: item !== null && item !== void 0 && item.cancel ? "是" : "否"
         });
       })
     },
-    gySystemOrderNo: onlyOneSystemOrder ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
+    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) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
-    gyReturnGoods: onlyOneSystemOrder ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
+    gyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],
     gyGoods: {
@@ -296,7 +311,7 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
           prv[uniqueKey] = {
             gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
             gyReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.gyReturnGoods,
-            gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
+            gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gyReturnSystemOrderNo,
             shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods3 = detail.gyGoods) === null || _detail$gyGoods3 === void 0 ? void 0 : _detail$gyGoods3.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder13 = detail.gySystemOrder) === null || _detail$gySystemOrder13 === void 0 ? void 0 : (_detail$gySystemOrder14 = _detail$gySystemOrder13.orders) === null || _detail$gySystemOrder14 === void 0 ? void 0 : (_detail$gySystemOrder15 = _detail$gySystemOrder14[0]) === null || _detail$gySystemOrder15 === void 0 ? void 0 : _detail$gySystemOrder15.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder16 = detail.gySystemOrder) === null || _detail$gySystemOrder16 === void 0 ? void 0 : (_detail$gySystemOrder17 = _detail$gySystemOrder16.showOrderInfo) === null || _detail$gySystemOrder17 === void 0 ? void 0 : (_detail$gySystemOrder18 = _detail$gySystemOrder17[0]) === null || _detail$gySystemOrder18 === void 0 ? void 0 : _detail$gySystemOrder18.shopCode),
             gyReturnType: [_initReason]
           };

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

@@ -22,6 +22,7 @@ export declare const jstOrderTransform: (detail: any, form: any) => {
         selectIds: any;
         showOrderInfo: any;
     };
+    jstReturnSystemOrderNo: any;
     jstSystemOrderNo: any;
     jstReissueGoods: any;
     jstReturnGoods: any;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -237,7 +237,7 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
           var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
           prv[uniqueKey] = {
             jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
-            jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
+            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.jstSystemOrderBillType) || ""
@@ -262,7 +262,7 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
 };
 //jst订单信息转换
 export var jstOrderTransform = function jstOrderTransform(detail, form) {
-  var _form$getFieldValue, _newOrderList$, _newOrderList$2, _orderList$find, _orderList$find$call;
+  var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _newOrderList$3, _orderList$find, _orderList$find$call;
   var orderNo = detail.orderNo,
     _detail$orderList = detail.orderList,
     orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -270,11 +270,19 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
   var jstGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "JST_GOODS";
   });
+  var jstReissueCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "JST_REISSUE_GOODS";
+  });
+  var jstReturnCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "JST_RETURN_GOODS";
+  });
   var isStrict = jstGoodsCom ? (_form$getFieldValue = form.getFieldValue(jstGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
     return _objectSpread({}, item);
   });
   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);
   return {
     jstSystemOrder: {
       orderNo: orderNo,
@@ -284,15 +292,16 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       }) : [],
       showOrderInfo: newOrderList
     },
+    jstReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
     // TODO: 当只有一条系统单时默认选中该系统单
-    jstSystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
-    jstReissueGoods: onlyOneSystemOrder ? updateJstGoodsHandle([newOrderList[0]], true).filter(function (good) {
+    jstSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.oId : undefined,
+    jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJstGoodsHandle([newOrderList[0]], true).filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     jstReturnGoods: onlyOneSystemOrder ? updateJstGoodsHandle([newOrderList[0]], true).filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
-    jstSystemOrderBillType: onlyOneSystemOrder ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.orderType : "",
+    jstSystemOrderBillType: onlyOneSystemOrder ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
     jstGoods: {
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
       orders: orderList || [],

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -344,7 +344,7 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
 
 //km订单信息转换
 export var kmOrderTransform = function kmOrderTransform(detail, form) {
-  var _form$getFieldValue, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
+  var _form$getFieldValue, _kmReissueGoodsCompon, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon2, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon3, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
   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,
@@ -352,8 +352,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var kmGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "KM_GOODS";
   });
+  var kmReissueGoodsComponent = componentList.find(function (item) {
+    return item.workOrderComponentType === "KM_REISSUE_GOODS";
+  });
   var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
+  var isReissueDefaultSelect = !!(kmReissueGoodsComponent !== null && kmReissueGoodsComponent !== void 0 && (_kmReissueGoodsCompon = kmReissueGoodsComponent.componentConfig) !== null && _kmReissueGoodsCompon !== void 0 && _kmReissueGoodsCompon.showDefaultSelect);
   console.log("kmOrderTransform---", {
     detail: detail,
     componentList: componentList
@@ -361,24 +365,21 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
     return item.workOrderComponentType === "KM_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 kmReissueGoodsComponent = componentList.find(function (item) {
-    return item.workOrderComponentType === "KM_REISSUE_GOODS";
-  });
-  var kmReissueGoodsOrderBackGoodsLevel = kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon === void 0 ? void 0 : _kmReissueGoodsCompon.orderBackGoodsLevel;
+  var kmReissueGoodsOrderBackGoodsLevel = kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.orderBackGoodsLevel;
   var kmReturnGoodsOrderBackGoodsLevel = (_componentList$find2 = componentList.find(function (item) {
     return item.workOrderComponentType === "KM_RETURN_GOODS";
   })) === null || _componentList$find2 === void 0 ? void 0 : (_componentList$find2$ = _componentList$find2.componentConfig) === null || _componentList$find2$ === void 0 ? void 0 : _componentList$find2$.orderBackGoodsLevel;
   var postingComponent = componentList.find(function (item) {
     return item.workOrderComponentType === "POSTING";
   });
-  var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
+  var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon3 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon3 === void 0 ? void 0 : _kmReissueGoodsCompon3.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]);
     console.log("kmPosting", kmPosting);
   }
   return {
-    kmSystemOrderNo: onlyOneSystemOrder ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
+    kmSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
     kmSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.order_no,
       orders: trades.map(function (item) {
@@ -414,7 +415,7 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
         orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
       })
     },
-    kmReissueGoods: onlyOneSystemOrder ? updateKmGoodsHandle([trades[0]], {
+    kmReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateKmGoodsHandle([trades[0]], {
       orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {

package/dist/esm/utils/orderBackFormValues.js

@@ -81,6 +81,7 @@ export default (function (_ref) {
     _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
     fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
   var orderValues = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+    var _next$componentConfig, _next$componentConfig2, _next$componentConfig3;
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     var city = null,
@@ -157,8 +158,8 @@ export default (function (_ref) {
         prv[uniqueKey] = taobaoGoodHandle(detail["itemList"], next.workOrderComponentType, next.componentConfig);
         break;
       case "REMARK_INPUT":
-        // 淘宝平台的备注信息不需要订单反填
-        if (!fromQNCreateWorkOrderByOrderNo) {
+        // 淘宝平台的备注信息如果设置了默认值 初始化的时候不需要订单反填
+        if (!fromQNCreateWorkOrderByOrderNo || !((_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.flag || ((_next$componentConfig2 = next.componentConfig) === null || _next$componentConfig2 === void 0 ? void 0 : _next$componentConfig2.flag) === 0 || (_next$componentConfig3 = next.componentConfig) !== null && _next$componentConfig3 !== void 0 && _next$componentConfig3.remark)) {
           prv[uniqueKey] = {
             remark: detail["remark"] || "",
             flag: detail["flag"] ? Number(detail["flag"]) : detail["flag"]

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -326,7 +326,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
 };
 //wdt订单信息转换
 export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
-  var _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$2;
+  var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$2;
   var orderNo = detail.orderNo,
     _detail$trades = detail.trades,
     currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -334,6 +334,10 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
   var wdtGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "WDT_GOODS";
   });
+  var wdtReissueCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "WDT_REISSUE_GOODS";
+  });
+  var isReissueDefaultSelect = !!(wdtReissueCom !== null && wdtReissueCom !== void 0 && (_wdtReissueCom$compon = wdtReissueCom.componentConfig) !== null && _wdtReissueCom$compon !== void 0 && _wdtReissueCom$compon.showDefaultSelect);
   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;
   return {
@@ -358,8 +362,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         };
       })
     },
-    wdtSystemOrderNo: onlyOneSystemOrder ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
-    wdtReissueGoods: onlyOneSystemOrder ? updateWdtGoodsHandle([currentTrades[0]]).filter(function (good) {
+    wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
+    wdtReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWdtGoodsHandle([currentTrades[0]]).filter(function (good) {
       return !isStrict || !orderNo || good.srcTid === orderNo;
     }) : [],
     wdtGoods: {

package/package.json

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

package/dist/esm/utils/dist/gyOrderBackFormValues.js

@@ -1,285 +0,0 @@
-"use strict";
-
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
-var getUUid_1 = require("./getUUid");
-var deliveryStateMap = {
-  0: "未发货",
-  2: "全部发货"
-};
-exports.GY_SYSTEM_ORDER_CONFIG = {
-  key: "gySystemShowOrder",
-  name: "管易",
-  selectId: "gySystemSelectIds",
-  columns: [{
-    dataIndex: "billType",
-    title: "订单类型",
-    width: 150
-  }, {
-    dataIndex: "billNo",
-    title: "系统订单号",
-    width: 160
-  }, {
-    dataIndex: "tradeTagName",
-    title: "订单标记名称",
-    width: 150
-  }, {
-    dataIndex: "billTag",
-    title: "订单标签",
-    width: 150
-  }, {
-    dataIndex: "deliveryState",
-    title: "发货状态",
-    width: 150
-  }]
-};
-exports.updateGyGoodsHandle = function (orders) {
-  if (orders === void 0) {
-    orders = [];
-  }
-  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, cur.details.map(function (item) {
-        var _a;
-        item.goodName = item.itemName;
-        item.goodShortName = item.itemSimpleName;
-        item.goodNo = item.itemCode;
-        item.specNo = item.skuCode;
-        item.specName = item.skuName;
-        item.canDelete = true;
-        item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
-        return item;
-      }));
-    }
-    return acc;
-  }, []);
-};
-var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
-  var _a, _b;
-  if (type === "logistics") {
-    //管易物流信息组件先不做
-    // const currentCom = comList?.find?.(
-    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
-    // );
-    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
-    // if (notOrderBack) {
-    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
-    //   currentValue = currentValue?.length
-    //     ? currentValue
-    //     : [{ logisticsCode: "", logisticsCompany: "" }];
-    //   return currentValue;
-    // }
-  } else if (type === "send") {
-    var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
-      return item.workOrderComponentType === "GY_SEND_GOOD";
-    });
-    var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
-    if (notOrderBack) {
-      var currentValue = form.getFieldValue(currentCom.uniqueKey);
-      currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
-        sendId: "",
-        sendName: ""
-      }];
-      return currentValue;
-    }
-  }
-  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
-      return {
-        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
-        platform: "gy",
-        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
-      };
-    });
-    var params = {
-      items: items
-    };
-    if (type === "logistics") {
-      // params.logisticsCompany = next?.shippingCode;
-      // params.logisticsCode = next?.shippingSn;
-    } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
-    }
-    prv.push(params);
-    return prv;
-  }, []);
-  if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
-    switch (type) {
-      case "logistics":
-        newList = [{
-          logisticsCode: ""
-        }];
-        break;
-      case "supply":
-        newList = [{
-          supplyId: ""
-        }];
-        break;
-      case "send":
-        newList = [{
-          sendId: "",
-          sendName: ""
-        }];
-        break;
-    }
-  }
-  return newList;
-};
-//管易订单信息转换
-exports.gyOrderTransform = function (detail, form) {
-  var _a, _b, _c, _d, _e, _f;
-  var orderNo = detail.orderNo,
-    _g = detail.trades,
-    currentTrades = _g === void 0 ? [] : _g,
-    componentList = detail.componentList;
-  var gyGoodsCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "GY_GOODS";
-  });
-  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
-  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
-  console.log("触发---getGyOrderList--4");
-  return {
-    gySystemOrder: {
-      orderNo: orderNo,
-      isTest: 4,
-      orders: currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
-        return item.code;
-      }) : [],
-      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      })
-    },
-    gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
-      return !isStrict || !orderNo || good.platformCode === orderNo;
-    }) : [],
-    gyGoods: {
-      // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
-      orderNo: orderNo,
-      shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
-        return item.shopCode;
-      })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
-      vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
-        return item.vipCode;
-      })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
-      gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || good.platformCode === orderNo;
-      })
-    },
-    // gyLogistics: updateGyItemListHandle(
-    //   currentTrades,
-    //   "logistics",
-    //   componentList || [],
-    //   form
-    // ),
-    gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
-  };
-};
-exports.gyOrderBackFormValues = function (detail, templateDetail) {
-  if (detail === void 0) {
-    detail = {};
-  }
-  if (templateDetail === void 0) {
-    templateDetail = {};
-  }
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _a, _b;
-    var uniqueKey = next.uniqueKey;
-    var config = next.componentConfig;
-    switch (next.workOrderComponentType) {
-      case "GY_SYSTEM_ORDER":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
-        break;
-      case "GY_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
-        break;
-      case "GY_REISSUE_GOODS":
-        prv[uniqueKey] = {
-          gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
-          gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
-          gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
-          gyReissueType: ["1"],
-          shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
-          vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
-        };
-        break;
-      case "GY_LOGISTICS":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
-        break;
-      case "GY_SEND_GOOD":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
-    }
-    return prv;
-  }, {});
-};
-var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
-  if (config === void 0) {
-    config = {};
-  }
-  var showField = config.showField,
-    _a = config.notOrderBack,
-    notOrderBack = _a === void 0 ? false : _a;
-  if (notOrderBack) {
-    return list;
-  }
-  return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    if (type === "logistics") {
-      if (!["logisticsCompany", ""].includes(showField || "")) {
-        next.logisticsCompany = undefined;
-      }
-      if (!["logisticsCode", ""].includes(showField || "")) {
-        next.logisticsCode = undefined;
-      }
-    } else if (type === "send") {
-      if (!["sendId", "all"].includes(showField || "")) {
-        next.sendId = undefined;
-      }
-      if (!["sendName", "all"].includes(showField || "")) {
-        next.sendName = undefined;
-        next.sendSnapshotName = undefined;
-      }
-    }
-    prv.push(next);
-    return prv;
-  }, []);
-};
-// 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
-exports.filterGyOrders = function (trades, order_no) {
-  var currentTrades = (trades || []).filter(function (item) {
-    return (item.platformCode || "").split(",").includes(order_no);
-  });
-  if (currentTrades.length) {
-    return currentTrades;
-  }
-  return [];
-};