@kmkf-fe-packages/kmkf-work-order-service-component 2.2.31-beta.94 → 2.2.31-beta.96

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

@@ -18,12 +18,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
+import { Modal } from 'antd';
 import { message } from 'antd';
 import { useMemoizedFn } from 'ahooks';
 import { get, find } from 'lodash';
 import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
 import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
-import { modifyWorkOrder, restartAutoTask } from "../../../model/flowTemplateDetail/api";
+import { modifyWorkOrder, restartAutoTask, skipNode } from "../../../model/flowTemplateDetail/api";
 import Header from "../Header";
 import FormRender from "../FormRender";
 import RenderDetail from "../RenderDetail";
@@ -36,12 +37,13 @@ import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/re
 import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
 import { AutoTaskDetail } from "../AutoTaskDetail";
+import { SKIP_NODE_TYPES } from "../../../common/constant";
 var formProps = {
   className: 'customizeFormModalClassName',
   layout: 'vertical'
 };
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$wo22, _currentNodeDetail$no24, _currentNodeDetail$wo23;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$fl2, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo22, _currentNodeDetail$no25, _currentNodeDetail$wo23;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -282,6 +284,67 @@ var CurrentNode = function CurrentNode(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var handleSkip = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            Modal.confirm({
+              title: '当前获取物流单号自动化任务正在执行中，确定要跳过吗？跳过后将无法获取物流信息',
+              okText: '确认',
+              cancelText: '取消',
+              onOk: function () {
+                var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                  var _currentNodeDetail$no21;
+                  var _yield$skipNode, success, _controllerRef$curren3;
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _context3.next = 2;
+                        return skipNode({
+                          operateParams: {
+                            flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
+                            flowWorkOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowWorkOrderUpdateTime,
+                            flowTemplateId: flowTemplateId,
+                            flowWorkOrderId: flowWorkOrderId,
+                            nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
+                          }
+                        });
+                      case 2:
+                        _yield$skipNode = _context3.sent;
+                        success = _yield$skipNode.success;
+                        if (success) {
+                          message.success('跳过成功');
+                          queryRemarkList();
+                          dispatch(fetchPanelInfo({
+                            flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
+                            flowWorkOrderId: flowWorkOrderId
+                          }, {
+                            signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
+                          }));
+                        }
+                      case 5:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }));
+                function onOk() {
+                  return _onOk.apply(this, arguments);
+                }
+                return onOk;
+              }()
+            });
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function handleSkip() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   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', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER'].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType);
@@ -289,6 +352,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   // TODO: 决策节点给后端修复数据加了一个入口
   // @ts-ignore
   var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
+  var showSkipButton = SKIP_NODE_TYPES.includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl2 = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl2 === void 0 ? void 0 : _currentNodeDetail$fl2.eventType) && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
     tag: tag,
     nodeName: nodeName,
@@ -300,9 +364,11 @@ var CurrentNode = function CurrentNode(props, ref) {
     showReminder: isArtificialNode && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.flowStatus) &&
     // isCurrentNodeHandler &&
     !readonly,
+    showSkipButton: showSkipButton,
     isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : (_currentNodeDetail$wo20 = _currentNodeDetail$wo19.jsonMap) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : _currentNodeDetail$wo20.flowTags) || '[]').includes('REMINDER'),
     handleWithdraw: handleWithdraw,
     handleReminder: onReminder,
+    handleSkip: handleSkip,
     editing: editing,
     handleEdit: handleEdit,
     handleSave: handleSave,
@@ -310,18 +376,18 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleRestartAutoTask: handleRestartAutoTask,
     flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
     flowWorkOrderId: flowWorkOrderId || '',
-    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || '',
+    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.id) || '',
     flowTemplateId: flowTemplateId
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
+  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
-    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
+    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,
@@ -338,7 +404,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleChangeTradeId: handleChangeTradeId,
     canModifyPayment: true,
     flowAllShowHideRules: allShowHideRules,
-    isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
+    isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
     autoSubmit: autoSubmit
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {

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

@@ -7,6 +7,7 @@ interface HeaderProps {
     showWithdraw: boolean;
     showReminder?: boolean;
     showRestartAutoTask?: boolean;
+    showSkipButton?: boolean;
     handleLook?: () => void;
     handleSave?: () => void;
     handleEdit?: () => void;
@@ -14,6 +15,7 @@ interface HeaderProps {
     handleWithdraw?: () => void;
     handleReminder?: (type: string) => void;
     handleRestartAutoTask?: () => void;
+    handleSkip?: () => void;
     loading?: boolean;
     editing?: boolean;
     opening?: boolean;

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

@@ -43,6 +43,7 @@ var Header = function Header(props) {
     handlePackUp = props.handlePackUp,
     handleWithdraw = props.handleWithdraw,
     handleReminder = props.handleReminder,
+    handleSkip = props.handleSkip,
     _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
     _props$editing = props.editing,
@@ -55,6 +56,8 @@ var Header = function Header(props) {
     showReminder = _props$showReminder === void 0 ? false : _props$showReminder,
     _props$showRestartAut = props.showRestartAutoTask,
     showRestartAutoTask = _props$showRestartAut === void 0 ? false : _props$showRestartAut,
+    _props$showSkipButton = props.showSkipButton,
+    showSkipButton = _props$showSkipButton === void 0 ? false : _props$showSkipButton,
     handler = props.handler,
     isReminder = props.isReminder,
     _props$handleLabel = props.handleLabel,
@@ -190,7 +193,14 @@ var Header = function Header(props) {
     },
     "data-spm-click": "\u53D6\u6D88\u50AC\u5355",
     "data-spm-param": "\u53D6\u6D88\u50AC\u5355"
-  }, "\u53D6\u6D88"))), /*#__PURE__*/React.createElement(Modal, {
+  }, "\u53D6\u6D88"))), showSkipButton && /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: function onClick() {
+      return typeof handleSkip === 'function' && handleSkip();
+    },
+    "data-spm-click": "\u8DF3\u8FC7",
+    "data-spm-param": "\u8DF3\u8FC7"
+  }, "\u8DF3\u8FC7"), /*#__PURE__*/React.createElement(Modal, {
     title: "\u5F02\u5E38\u65E5\u5FD7",
     onOk: handleCancel,
     onCancel: handleCancel,

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

@@ -236,6 +236,7 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
                 }[];
             } | undefined;
         } | undefined;
+        uniqueKey: string;
     } | undefined;
 } | undefined;
 export declare const selectTid: (state: FlowTemplateDetailState) => string;

package/dist/esm/common/constant.d.ts

@@ -67,3 +67,4 @@ export declare const WORK_ORDER_STATUS_AI_BUILD: {
     STOPPING: string;
     COMPLETED: string;
 };
+export declare const SKIP_NODE_TYPES: string[];

package/dist/esm/common/constant.js

@@ -86,4 +86,7 @@ export var CHILD_FIELD_VALUE = {
   returnLogisticsCompany: 'company',
   returnLogisticsCode: 'order'
 };
-export var WORK_ORDER_STATUS_AI_BUILD = (_WORK_ORDER_STATUS_AI = {}, _defineProperty(_WORK_ORDER_STATUS_AI, WAITING, '暂存'), _defineProperty(_WORK_ORDER_STATUS_AI, STOPPING, '暂停'), _defineProperty(_WORK_ORDER_STATUS_AI, COMPLETED, '已提交'), _WORK_ORDER_STATUS_AI);
+export var WORK_ORDER_STATUS_AI_BUILD = (_WORK_ORDER_STATUS_AI = {}, _defineProperty(_WORK_ORDER_STATUS_AI, WAITING, '暂存'), _defineProperty(_WORK_ORDER_STATUS_AI, STOPPING, '暂停'), _defineProperty(_WORK_ORDER_STATUS_AI, COMPLETED, '已提交'), _WORK_ORDER_STATUS_AI);
+
+//支持跳过的节点类型
+export var SKIP_NODE_TYPES = ['REISSUE_LOGISTICS_SYNC', 'BS_E3_REISSUE_LOGISTICS_SYNC', 'WDT_LOGISTICS_SYNC', 'GY_REISSUE_LOGISTICS_SYNC', 'KUAI_MAI_REISSUE_LOGISTICS_SYNC', 'JST_REISSUE_LOGISTICS_SYNC', 'JY_REISSUE_LOGISTICS_SYNC'];

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

@@ -93,3 +93,4 @@ export declare const getH5SharePermission: () => Promise<serverProps<any>>;
 export declare const shortLink: (data: any) => Promise<serverProps<any>>;
 export declare const createNodeLink: (data: any) => Promise<serverProps<any>>;
 export declare const createLink: (data: any) => Promise<serverProps<any>>;
+export declare const skipNode: (data: any) => Promise<serverProps<any>>;

package/dist/esm/model/flowTemplateDetail/api.js

@@ -257,4 +257,11 @@ export var createLink = function createLink(data) {
     method: 'get',
     data: data
   });
+};
+export var skipNode = function skipNode(data) {
+  return request({
+    url: "/qy/flow/operate/jump",
+    method: 'post',
+    data: data
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.31-beta.94",
+  "version": "2.2.31-beta.96",
   "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.2.31-beta.94",
+    "@kmkf-fe-packages/basic-components": "2.2.31-beta.95",
     "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.94",
-    "@kmkf-fe-packages/services-components": "2.2.31-beta.94",
+    "@kmkf-fe-packages/services-components": "2.2.31-beta.95",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8f41fd8a6ee2b93292b48e5473f951df970896b3",
+  "gitHead": "b2e797bb637b38f2dc178de1ce5e8ee0c46c5416",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }