@kmkf-fe-packages/kmkf-work-order-service-component 2.0.79 → 2.1.1

package/dist/esm/FlowTemplateDetailV2/components/AutoTaskDetail/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const AutoTaskDetail: ({ flowEventData }: {
+    flowEventData: any;
+}) => React.JSX.Element;

package/dist/esm/FlowTemplateDetailV2/components/AutoTaskDetail/index.js

@@ -0,0 +1,34 @@
+import React from 'react';
+import { isNumber } from 'lodash';
+import { Divider } from 'antd';
+export var AutoTaskDetail = function AutoTaskDetail(_ref) {
+  var flowEventData = _ref.flowEventData;
+  var mapping = {
+    0: '执行中',
+    1: '部分成功',
+    2: '全部成功',
+    4: '全部失败'
+  };
+  var eventStatus = flowEventData === null || flowEventData === void 0 ? void 0 : flowEventData.eventStatus;
+  var renderRules = function renderRules() {
+    var _flowEventData$eventD, _flowEventData$eventD2;
+    return /*#__PURE__*/React.createElement("div", null, flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD = flowEventData.eventData) === null || _flowEventData$eventD === void 0 ? void 0 : (_flowEventData$eventD2 = _flowEventData$eventD.businessStatus) === null || _flowEventData$eventD2 === void 0 ? void 0 : _flowEventData$eventD2.map(function (item) {
+      var _flowEventData$eventD3, _flowEventData$eventD4, _flowEventData$eventD5, _result$passCondition;
+      var result = flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD3 = flowEventData.eventData) === null || _flowEventData$eventD3 === void 0 ? void 0 : (_flowEventData$eventD4 = _flowEventData$eventD3.otherBusinessData) === null || _flowEventData$eventD4 === void 0 ? void 0 : (_flowEventData$eventD5 = _flowEventData$eventD4.ruleDomainList) === null || _flowEventData$eventD5 === void 0 ? void 0 : _flowEventData$eventD5.find(function (k) {
+        return k.businessKey === item.businessKey;
+      });
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Divider, {
+        dashed: true
+      }), result && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, result.ruleName && "\u547D\u4E2D\u89C4\u5219\u540D\u79F0: ".concat(result.ruleName)), /*#__PURE__*/React.createElement("p", null, (_result$passCondition = result.passConditionList) === null || _result$passCondition === void 0 ? void 0 : _result$passCondition.map(function (condition) {
+        return /*#__PURE__*/React.createElement("p", null, condition);
+      }))), /*#__PURE__*/React.createElement("p", null, item.remark));
+    }));
+  };
+  var renderReason = function renderReason() {
+    var _flowEventData$eventD6, _flowEventData$eventD7, _flowEventData$eventD8;
+    return /*#__PURE__*/React.createElement("p", null, flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD6 = flowEventData.eventData) === null || _flowEventData$eventD6 === void 0 ? void 0 : (_flowEventData$eventD7 = _flowEventData$eventD6.businessStatus) === null || _flowEventData$eventD7 === void 0 ? void 0 : (_flowEventData$eventD8 = _flowEventData$eventD7.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.remark;
+    })) === null || _flowEventData$eventD8 === void 0 ? void 0 : _flowEventData$eventD8.join(','));
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, isNumber(eventStatus) && "\u6267\u884C\u72B6\u6001: ".concat(mapping[eventStatus])), isNumber(eventStatus) && [1, 2].includes(eventStatus) && renderRules(), isNumber(eventStatus) && [4].includes(eventStatus) && renderReason());
+};

package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js

@@ -34,12 +34,13 @@ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, s
 import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
 import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
+import { AutoTaskDetail } from "../AutoTaskDetail";
 var formProps = {
   className: 'customizeFormModalClassName',
   layout: 'vertical'
 };
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$wo22;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$wo22;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -275,6 +276,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     };
   }();
   var isArtificialNode = tag === 'artificial';
+  var isAutoNode = tag === 'auto';
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE'].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType);
   var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
   // TODO: 决策节点给后端修复数据加了一个入口
   // @ts-ignore
@@ -329,6 +332,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     flowAllShowHideRules: allShowHideRules,
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
     autoSubmit: autoSubmit
-  }))));
+  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
+    flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData
+  })));
 };
 export default /*#__PURE__*/forwardRef(CurrentNode);

package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts

@@ -16,6 +16,7 @@ interface NodeItem {
     visibleType?: string;
     nodeIsAuto: boolean;
     flowTemplateKey: string;
+    eventNodeType: string;
 }
 declare const NodeItem: (props: NodeItem) => React.JSX.Element;
 export default NodeItem;

package/dist/esm/FlowTemplateDetailV2/components/Item/index.js

@@ -32,8 +32,9 @@ import { PlatForm } from "../../../WorkOrder/types";
 import { currentUserHasOperatorAuth } from "../../common";
 import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
+import { AutoTaskDetail } from "../AutoTaskDetail";
 var NodeItem = function NodeItem(props) {
-  var _data$data10, _data$data11, _data$data11$workOrde, _data$data12, _data$data12$workOrde, _data$data13, _data$data13$nodeInfo, _data$data14, _data$data15, _data$data15$nodeInfo, _data$data16, _data$data17, _data$data18, _data$data18$workOrde, _data$data19;
+  var _data$data10, _data$data11, _data$data11$workOrde, _data$data12, _data$data12$workOrde, _data$data13, _data$data13$nodeInfo, _data$data14, _data$data15, _data$data15$nodeInfo, _data$data16, _data$data17, _data$data18, _data$data18$workOrde, _data$data19, _data$data20;
   var tag = props.tag,
     nodeId = props.nodeId,
     nodeName = props.nodeName,
@@ -52,7 +53,8 @@ var NodeItem = function NodeItem(props) {
     visibleType = _props$visibleType === void 0 ? '' : _props$visibleType,
     nodeIsAuto = props.nodeIsAuto,
     flowTemplateKey = props.flowTemplateKey,
-    onJumpPage = props.onJumpPage;
+    onJumpPage = props.onJumpPage,
+    eventNodeType = props.eventNodeType;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   var plat = useSelector(selectPlatInfo);
@@ -69,6 +71,7 @@ var NodeItem = function NodeItem(props) {
     setEditing = _useState4[1];
   // 是否是人工任务
   var isArtificialNode = tag === 'artificial';
+  var isAutoNode = tag === 'auto';
   var flowStatus = useSelector(selectFlowStatus);
   var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
   var assistantMap = useSelector(selectNodeAssistantMap);
@@ -237,7 +240,7 @@ var NodeItem = function NodeItem(props) {
       isAllStaff: data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : (_data$data9$nodeInfo = _data$data9.nodeInfo) === null || _data$data9$nodeInfo === void 0 ? void 0 : (_data$data9$nodeInfo$ = _data$data9$nodeInfo.assistants) === null || _data$data9$nodeInfo$ === void 0 ? void 0 : _data$data9$nodeInfo$.isAllStaff
     });
   }, [data, plat.userKey, assistantMap]);
-
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE'].includes(eventNodeType);
   // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
   var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
 
@@ -254,6 +257,7 @@ var NodeItem = function NodeItem(props) {
   //     dispatch(setLabelList(data?.map(item => item?.labelShowName) || []))
   //   }
   // };
+
   var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : _data$data10.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$workOrde = _data$data11.workOrderTemplateInfo) === null || _data$data11$workOrde === void 0 ? void 0 : _data$data11$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$workOrde = _data$data12.workOrderTemplateInfo) === null || _data$data12$workOrde === void 0 ? void 0 : _data$data12$workOrde.componentDtoList) || []))),
     _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
     transData = _calcWorkOrderList2[0];
@@ -261,7 +265,7 @@ var NodeItem = function NodeItem(props) {
     tag: tag,
     nodeName: nodeName,
     editing: editing,
-    showLook: isArtificialNode,
+    showLook: isArtificialNode || isShowAutoNodeDetail,
     showEdit: showEdit,
     opening: open,
     handleLook: handleOpen,
@@ -307,6 +311,8 @@ var NodeItem = function NodeItem(props) {
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
-  }))));
+  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
+    flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
+  })));
 };
 export default NodeItem;

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -1286,7 +1286,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       nodeIsAuto: flowRecord.nodeIsAuto,
       openCloseCallback: function openCloseCallback() {
         setOpenCloseVisible('');
-      }
+      },
+      eventNodeType: flowRecord.eventNodeType
     }));
   }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
     ref: currentNodeRef,

package/dist/esm/FlowTemplateDetailV2/store/reducers.js

@@ -85,7 +85,8 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
                 tag: tag,
                 operator: item.operator || '',
                 nodeIsAuto: item.nodeIsAuto,
-                operateType: item.operateType
+                operateType: item.operateType,
+                eventNodeType: item.eventNodeType
               };
             }); // TODO: 针对已完结工单 会出现多一个最后节点问题；需要当前节点id和记录列表中最后一条比对，如果相同，则移除记录中最后一条；
             if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$currentNod = _res$data2.currentNodeDetail) === null || _res$data2$currentNod === void 0 ? void 0 : (_res$data2$currentNod2 = _res$data2$currentNod.nodeInfo) === null || _res$data2$currentNod2 === void 0 ? void 0 : _res$data2$currentNod2.id) === ((_last = last(recordList)) === null || _last === void 0 ? void 0 : _last.nodeId)) {

package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts

@@ -225,8 +225,10 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
                 remark: string;
             }[] | undefined;
             otherBusinessData?: {
-                ruleName?: string | undefined;
-                passConditionList?: string[] | undefined;
+                ruleDomainList: {
+                    ruleName?: string | undefined;
+                    passConditionList?: string[] | undefined;
+                }[];
             } | undefined;
         } | undefined;
     } | undefined;

package/dist/esm/common/utils/tools.js

@@ -320,16 +320,21 @@ export var orderBack = /*#__PURE__*/function () {
           bsInfo = bsOrders && bsOrderTransform({
             detail: bsOrders || {}
           });
-          wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
+          wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
+            allOrders: wlnOrders.orders
+          }));
           bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: bsE3Orders === null || bsE3Orders === void 0 ? void 0 : bsE3Orders.orderList
           }), form);
           wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || []
           }), form);
           kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
+            allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
             order_no: order_no,
             componentList: templateDetail.componentDtoList
           }), form);
@@ -337,13 +342,15 @@ export var orderBack = /*#__PURE__*/function () {
             kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
           }
           gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
+            allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
           pushGyLog('gyInfo', gyInfo);
           jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (jstOrders === null || jstOrders === void 0 ? void 0 : jstOrders.orderList) || []
           }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
@@ -363,7 +370,8 @@ export var orderBack = /*#__PURE__*/function () {
           }
           if ((bsE3Orders === null || bsE3Orders === void 0 ? void 0 : (_bsE3Orders$orderList = bsE3Orders.orderList) === null || _bsE3Orders$orderList === void 0 ? void 0 : _bsE3Orders$orderList.length) > 1) {
             bsE3Info.bsE3Goods = _objectSpread(_objectSpread({}, bsE3Info.bsE3Goods), {}, {
-              bsE3Goods: []
+              bsE3Goods: [],
+              orders: []
             });
             // bsInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
             // bsInfo.bsSendGood = [{ sendId: '', sendName: '' }];
@@ -1050,7 +1058,8 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
   var orderInfo = bsE3OrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = bsE3OrderBackFormValues(orderInfo, {
     componentDtoList: bsE3GoodsComponent
@@ -1073,7 +1082,8 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
   var wlnGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
   var orderInfo = wlnOrderTransform({
     orders: value.selectedRows,
-    shopCode: wlnGoodsValue.shopCode
+    shopCode: wlnGoodsValue.shopCode,
+    allOrders: value === null || value === void 0 ? void 0 : value.orders
   });
   var values = wlnOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent
@@ -1100,7 +1110,8 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
   var orderInfo = kmOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = kmOrderBackFormValues(orderInfo, {
     componentDtoList: kmGoodsComponent
@@ -1132,7 +1143,8 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10)
     trades: value.selectedRows,
     shopCode: wdtGoodsValue.shopCode,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = wdtOrderBackFormValues(orderInfo, {
     componentDtoList: wdtGoodsComponent
@@ -1159,7 +1171,8 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   var orderInfo = gyOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = gyOrderBackFormValues(orderInfo, {
     componentDtoList: gyGoodsComponent
@@ -1186,7 +1199,8 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
   var orderInfo = jstOrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders || []
   }, form);
   var values = jstOrderBackFormValues(orderInfo, {
     componentDtoList: jstGoodsComponent

package/dist/esm/common/utils/transformWorkOrderData.js

@@ -834,12 +834,22 @@ var processErpTradeId = function processErpTradeId(getValue) {
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
   };
 };
-var processWlnGoods = function processWlnGoods(getValue) {
-  return function (nex, config) {
-    return _defineProperty({}, nex.uniqueKey, {
-      wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
-      shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
-    });
+var processWlnGoods = function processWlnGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        orderNo: orderNo
+      });
+    };
   };
 };
 var processWdtReissueGoods = function processWdtReissueGoods(templateColumns) {
@@ -1143,7 +1153,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       REISSUE_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
-      WLN_GOODS: processWlnGoods,
+      WLN_GOODS: processWlnGoods(templateColumns),
       WDT_REISSUE_GOODS: processWdtReissueGoods(templateColumns),
       GY_REISSUE_GOODS: processGyReissueGoods(templateColumns),
       GY_RETURN_GOODS: processGyReturnGoods(templateColumns),

package/dist/esm/model/customizeWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectorDealerModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectorCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").CompanyUserListI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").CompanyUserListI[], {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectorSelectedCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectorModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -76,7 +71,6 @@ export declare const selectorLogModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -90,7 +84,6 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -104,7 +97,6 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -118,7 +110,6 @@ export declare const selectorLogicFlowId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -132,7 +123,6 @@ export declare const selectorFlowWorkOrderId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -146,7 +136,6 @@ export declare const selectorCurrentShopId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -160,7 +149,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -174,7 +162,6 @@ export declare const selectorCurrentBuyerChecked: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -188,7 +175,6 @@ export declare const selectorAllTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ComponentColumnsT[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ComponentColumnsT[], {
     clearCache: () => void;
 }> & {
@@ -202,7 +188,6 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -216,7 +201,6 @@ export declare const selectRepeatWorkOrderConditions: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ConditionsT) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ConditionsT, {
     clearCache: () => void;
 }> & {
@@ -230,7 +214,6 @@ export declare const selectCancelInterceptionModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -244,7 +227,6 @@ export declare const selectShowPayment: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/dist/esm/model/flowTemplateDetail/types.d.ts

@@ -5,6 +5,7 @@ export interface Line {
     operator: string;
     nodeIsAuto: boolean;
     operateType: string;
+    eventNodeType: string;
 }
 export interface Assistant {
     id: string;
@@ -796,6 +797,24 @@ export interface QyFlowPanelInfoResponse {
             }[];
             [k: string]: any;
         };
+        flowEventData?: {
+            eventStatus: 0 | 1 | 2 | 4;
+            eventType: string;
+            eventData?: {
+                businessStatus?: Array<{
+                    businessKey: string;
+                    businessStatus: number;
+                    businessStatusDesc: string;
+                    remark: string;
+                }>;
+                otherBusinessData?: {
+                    ruleDomainList: Array<{
+                        ruleName?: string;
+                        passConditionList?: Array<string>;
+                    }>;
+                };
+            };
+        };
     };
     /**
      * 当前流程模版全部节点的显隐配置
@@ -1556,4 +1575,21 @@ export interface QueryNodeDetailResponse {
         }[];
         [k: string]: any;
     };
+    flowEventData?: {
+        eventData?: {
+            businessStatus?: Array<{
+                businessKey: string;
+                businessStatus: number;
+                businessStatusDesc: string;
+                remark: string;
+            }>;
+            otherBusinessData?: {
+                ruleDomainList: Array<{
+                    ruleName?: string;
+                    passConditionList?: Array<string>;
+                }>;
+            };
+        };
+        eventType: string;
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.79",
+  "version": "2.1.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.79",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.79",
-    "@kmkf-fe-packages/services-components": "2.0.79",
+    "@kmkf-fe-packages/basic-components": "2.1.1",
+    "@kmkf-fe-packages/kmkf-utils": "2.1.1",
+    "@kmkf-fe-packages/services-components": "2.1.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2322a33372d35b4da259bd6ea8d4838164dc70e8",
+  "gitHead": "fbfab5e12781f7bfdc14afe31bdec00598f74202",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }