@kmkf-fe-packages/kmkf-work-order-service-component 2.7.0-rc.0 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.d.ts +4 -2
  2. package/dist/esm/FlowTemplateDetailV2/common.js +24 -7
  3. package/dist/esm/FlowTemplateDetailV2/components/ActionList/index.d.ts +2 -0
  4. package/dist/esm/FlowTemplateDetailV2/components/ActionList/index.js +50 -8
  5. package/dist/esm/FlowTemplateDetailV2/components/AutoTaskDetail/index.d.ts +3 -1
  6. package/dist/esm/FlowTemplateDetailV2/components/AutoTaskDetail/index.js +65 -3
  7. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts +1 -0
  8. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +111 -24
  9. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.module.less +4 -1
  10. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
  11. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +528 -259
  12. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +35 -2
  13. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +420 -58
  14. package/dist/esm/FlowTemplateDetailV2/components/FormRender/skxOrderBack.d.ts +9 -0
  15. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.js → FlowTemplateDetailV2/components/FormRender/skxOrderBack.js} +150 -47
  16. package/dist/esm/FlowTemplateDetailV2/components/Header/index.d.ts +3 -0
  17. package/dist/esm/FlowTemplateDetailV2/components/Header/index.js +61 -9
  18. package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +2 -0
  19. package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +69 -33
  20. package/dist/esm/FlowTemplateDetailV2/components/JumpBuyer/index.d.ts +9 -0
  21. package/dist/esm/FlowTemplateDetailV2/components/JumpBuyer/index.js +58 -0
  22. package/dist/esm/FlowTemplateDetailV2/components/Layout/index.d.ts +9 -0
  23. package/dist/esm/FlowTemplateDetailV2/components/Layout/index.js +17 -0
  24. package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.d.ts +1 -0
  25. package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.js +19 -11
  26. package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.d.ts +3 -0
  27. package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js +225 -0
  28. package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.module.less +29 -0
  29. package/dist/esm/FlowTemplateDetailV2/constant.js +9 -1
  30. package/dist/esm/FlowTemplateDetailV2/index.js +441 -194
  31. package/dist/esm/FlowTemplateDetailV2/index.less +61 -6
  32. package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +16 -0
  33. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +225 -76
  34. package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +8 -0
  35. package/dist/esm/FlowTemplateDetailV2/store/selector.js +15 -0
  36. package/dist/esm/FlowTemplateDetailV2/type.d.ts +2 -1
  37. package/dist/esm/KmErpTradeList/api.d.ts +14 -0
  38. package/dist/esm/KmErpTradeList/api.js +36 -0
  39. package/dist/esm/KmErpTradeList/components/OrderLogDrawer.d.ts +8 -0
  40. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.js → KmErpTradeList/components/OrderLogDrawer.js} +100 -104
  41. package/dist/esm/KmErpTradeList/components/PlatformOrderCard.d.ts +12 -0
  42. package/dist/esm/KmErpTradeList/components/PlatformOrderCard.js +101 -0
  43. package/dist/esm/KmErpTradeList/components/Search.d.ts +17 -0
  44. package/dist/esm/KmErpTradeList/components/Search.js +37 -0
  45. package/dist/esm/KmErpTradeList/components/StockQueryDrawer.d.ts +8 -0
  46. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.js → KmErpTradeList/components/StockQueryDrawer.js} +220 -71
  47. package/dist/esm/KmErpTradeList/components/SystemOrderCard.d.ts +11 -0
  48. package/dist/esm/KmErpTradeList/components/SystemOrderCard.filter.d.ts +16 -0
  49. package/dist/esm/KmErpTradeList/components/SystemOrderCard.filter.js +25 -0
  50. package/dist/esm/KmErpTradeList/components/SystemOrderCard.js +437 -0
  51. package/dist/esm/KmErpTradeList/components/TradeList.d.ts +21 -0
  52. package/dist/esm/KmErpTradeList/components/TradeList.js +79 -0
  53. package/dist/esm/KmErpTradeList/components/index.less +1 -0
  54. package/dist/esm/KmErpTradeList/constant.d.ts +1 -0
  55. package/dist/esm/KmErpTradeList/constant.js +9 -0
  56. package/dist/esm/KmErpTradeList/index.d.ts +16 -0
  57. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal → KmErpTradeList}/index.js +144 -130
  58. package/dist/esm/KmErpTradeList/index.less +643 -0
  59. package/dist/esm/KmErpTradeList/interface.d.ts +1090 -0
  60. package/dist/esm/KmErpTradeList/interface.js +1 -0
  61. package/dist/esm/LBOrderDetail/detail/OrderInfo.d.ts +19 -0
  62. package/dist/esm/LBOrderDetail/detail/OrderInfo.js +652 -0
  63. package/dist/esm/LBOrderDetail/detail/ServiceProgress.d.ts +11 -0
  64. package/dist/esm/LBOrderDetail/detail/ServiceProgress.js +446 -0
  65. package/dist/esm/LBOrderDetail/detail/index.d.ts +14 -0
  66. package/dist/esm/LBOrderDetail/detail/index.js +51 -0
  67. package/dist/esm/LBOrderDetail/detail/index.module.less +63 -0
  68. package/dist/esm/LBOrderDetail/detail/services.d.ts +4 -0
  69. package/dist/esm/LBOrderDetail/detail/services.js +28 -0
  70. package/dist/esm/LBOrderDetail/detail/types.d.ts +383 -0
  71. package/dist/esm/LBOrderDetail/detail/types.js +1 -0
  72. package/dist/esm/LBOrderDetail/index.d.ts +14 -0
  73. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/RecordLog → LBOrderDetail}/index.js +100 -74
  74. package/dist/esm/WorkOrder/components/WorkOrderList/components/CustomizeWorkOrderCard/index.js +13 -3
  75. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.d.ts +3 -1
  76. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.js +15 -4
  77. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.less +18 -7
  78. package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts +2 -2
  79. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +193 -38
  80. package/dist/esm/WorkOrder/index.js +110 -25
  81. package/dist/esm/WorkOrder/index.less +15 -0
  82. package/dist/esm/common/constant.d.ts +29 -0
  83. package/dist/esm/common/constant.js +34 -2
  84. package/dist/esm/common/imgs/contact.png +0 -0
  85. package/dist/esm/common/utils/constant.d.ts +4 -0
  86. package/dist/esm/common/utils/constant.js +107 -1
  87. package/dist/esm/common/utils/submitDataTransOldFormat.js +241 -110
  88. package/dist/esm/common/utils/tools.d.ts +8 -1
  89. package/dist/esm/common/utils/tools.js +444 -163
  90. package/dist/esm/common/utils/tools_constants.js +40 -5
  91. package/dist/esm/common/utils/transformWorkOrderData.js +276 -11
  92. package/dist/esm/common/utils/xzSDK.d.ts +65 -2
  93. package/dist/esm/common/utils/xzSDK.js +155 -18
  94. package/dist/esm/hooks/useDoubleClick/index.d.ts +21 -0
  95. package/dist/esm/hooks/useDoubleClick/index.js +55 -0
  96. package/dist/esm/index.d.ts +5 -0
  97. package/dist/esm/index.js +5 -0
  98. package/dist/esm/model/customizeWorkOrder/index.d.ts +2 -1
  99. package/dist/esm/model/customizeWorkOrder/index.js +88 -44
  100. package/dist/esm/model/customizeWorkOrder/selector.d.ts +32 -0
  101. package/dist/esm/model/customizeWorkOrder/selector.js +3 -0
  102. package/dist/esm/model/customizeWorkOrder/types.d.ts +1 -0
  103. package/dist/esm/model/flowTemplateDetail/api.d.ts +18 -0
  104. package/dist/esm/model/flowTemplateDetail/api.js +64 -0
  105. package/dist/esm/model/flowTemplateDetail/types.d.ts +10 -0
  106. package/dist/esm/model/kmErpTradeList/index.d.ts +14 -0
  107. package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal → model/kmErpTradeList}/index.js +56 -63
  108. package/dist/esm/model/logicFlow/index.js +2 -1
  109. package/dist/esm/model/logicFlow/selector.d.ts +0 -3
  110. package/dist/esm/model/paymentWorkOrder/selector.d.ts +0 -9
  111. package/dist/esm/model/servers/api.d.ts +6 -0
  112. package/dist/esm/model/servers/api.js +64 -4
  113. package/dist/esm/model/servers/request.js +1 -1
  114. package/dist/esm/model/singleShopWorkOrder/selector.d.ts +0 -5
  115. package/dist/esm/model/store.d.ts +2 -0
  116. package/dist/esm/model/store.js +5 -3
  117. package/dist/esm/model/types/login.d.ts +1 -0
  118. package/package.json +7 -5
  119. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.d.ts +0 -5
  120. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.d.ts +0 -4
  121. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +0 -297
  122. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less +0 -137
  123. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.d.ts +0 -5
  124. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.d.ts +0 -5
  125. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.d.ts +0 -12
  126. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.js +0 -22
  127. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.less +0 -20
  128. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.d.ts +0 -7
  129. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.less +0 -7
  130. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +0 -4
  131. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +0 -34
  132. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.d.ts +0 -5
  133. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.d.ts +0 -11
  134. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.js +0 -19
  135. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.less +0 -17
  136. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.d.ts +0 -8
  137. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +0 -454
  138. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less +0 -284
@@ -18,13 +18,15 @@ export declare const verifyHandle: (data: any, componentDtoList: Array<any>) =>
18
18
  success: boolean;
19
19
  message: string;
20
20
  };
21
- export declare const currentUserHasOperatorAuth: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, }: {
21
+ export declare const currentUserHasOperatorAuth: ({ isSuperAdmin, currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList, }: {
22
+ isSuperAdmin?: boolean | undefined;
22
23
  currentUserKey: string;
23
24
  staffIds: Array<string>;
24
- operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL';
25
+ operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL' | 'ONLY_THE_SAME_USER_GROUP';
25
26
  handlerList: Array<{
26
27
  userKey: string;
27
28
  }>;
28
29
  isAllStaff: boolean;
29
30
  assistantList: Array<Assistant>;
31
+ userGroupList: Array<string>;
30
32
  }) => boolean;
@@ -1,4 +1,5 @@
1
1
  import { NodeType } from "../model/flowTemplateDetail/types";
2
+ import { intersection } from 'lodash';
2
3
  export var getTag = function getTag(item) {
3
4
  var tag = 'artificial'; // 人工节点
4
5
  // 先判断是什么节点类型 步骤/判断
@@ -26,7 +27,8 @@ export var getFlowOperate = {
26
27
  REMINDER: '催单',
27
28
  AI_BUILD: 'AI自动建单',
28
29
  CANCEL_REMINDER: '取消催单',
29
- AUTO_TASK_RETRY: '自动任务重试'
30
+ AUTO_TASK_RETRY: '自动任务重试',
31
+ JUMP: '跳过'
30
32
  };
31
33
  export var FLOW_STATUS_V2 = {
32
34
  WAIT_COMMIT: '待提交',
@@ -38,7 +40,7 @@ export var FLOW_STATUS_V2 = {
38
40
  RETURNING: '回退中'
39
41
  };
40
42
  //不能回填的组件type
41
- export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
43
+ export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
42
44
  export var verifyHandle = function verifyHandle(data, componentDtoList) {
43
45
  var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
44
46
  var res = {
@@ -58,21 +60,26 @@ export var verifyHandle = function verifyHandle(data, componentDtoList) {
58
60
  return res;
59
61
  };
60
62
  export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref) {
61
- var currentUserKey = _ref.currentUserKey,
63
+ var _ref$isSuperAdmin = _ref.isSuperAdmin,
64
+ isSuperAdmin = _ref$isSuperAdmin === void 0 ? false : _ref$isSuperAdmin,
65
+ currentUserKey = _ref.currentUserKey,
62
66
  staffIds = _ref.staffIds,
63
67
  operateDataPermission = _ref.operateDataPermission,
64
68
  handlerList = _ref.handlerList,
65
69
  isAllStaff = _ref.isAllStaff,
66
- assistantList = _ref.assistantList;
67
- // 节点配置为组操作
68
- var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
70
+ assistantList = _ref.assistantList,
71
+ _ref$userGroupList = _ref.userGroupList,
72
+ userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
73
+ if (isSuperAdmin) {
74
+ return true;
75
+ }
69
76
  // handlerList为空数组是没有处理人,都可以处理
70
77
  if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
71
78
  return true;
72
79
  }
73
80
 
74
81
  // 可以处理所有任务
75
- if (groupCanOperate) {
82
+ if (operateDataPermission === 'HANDLE_ALL') {
76
83
  // 判断是否是预备客服
77
84
  return isAllStaff || ( // 全部
78
85
  staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -82,6 +89,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
82
89
  }) // 人在groups中
83
90
  ;
84
91
  }
92
+ //仅可处理同用户组的工单
93
+ if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
94
+ //判断组用户中是否包含处理人 || 判断处理人是否是自己
95
+ var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
96
+ return item.userKey;
97
+ });
98
+ return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
99
+ return item.userKey === currentUserKey;
100
+ }));
101
+ }
85
102
 
86
103
  // 只能处理分配到自己的任务
87
104
  // 判断处理人是否是自己
@@ -6,6 +6,8 @@ interface ActionListProps {
6
6
  nodeType: NodeType;
7
7
  handleAction: (s: string) => void;
8
8
  hasPreNode: boolean;
9
+ privilege?: string;
10
+ showShareButton: boolean;
9
11
  }
10
12
  declare const ActionList: (props: ActionListProps) => React.JSX.Element;
11
13
  export default ActionList;
@@ -2,18 +2,39 @@ import React, { useMemo } from 'react';
2
2
  import { Menu, Button, Space, Dropdown } from 'antd';
3
3
  import { DownOutlined } from '@ant-design/icons';
4
4
  import { FlowStatus, FlowType } from "../../../model/flowTemplateDetail/types";
5
+ import { reverse } from 'lodash';
5
6
  import styles from "./index.module.less";
7
+ // const getActionMap = (nodeStatus: FlowStatus, hasPreNode: boolean, flowType: FlowType) => {
8
+ // // 非开始节点看状态
9
+ // if (nodeStatus === FlowStatus.PROCESSING) {
10
+ // if (hasPreNode) return ['forward', 'save', 'submit', 'rejected', 'close', 'stop', 'share'];
11
+ // return flowType === FlowType.SINGLE_PAGE
12
+ // ? ['save', 'forward', 'close', 'stop', 'share', 'submit']
13
+ // : ['forward', 'save', 'submit', 'close', 'stop', 'share'];
14
+ // } else if (nodeStatus === FlowStatus.STOPPING) {
15
+ // return ['open', 'close', 'share'];
16
+ // } else if (
17
+ // [FlowStatus.CLOSE, FlowStatus.COMPLETED, FlowStatus.RETURNING, FlowStatus.FLOWING].includes(
18
+ // nodeStatus,
19
+ // )
20
+ // ) {
21
+ // return [];
22
+ // } else {
23
+ // return ['save', 'share', 'submit'];
24
+ // }
25
+ // };
26
+
6
27
  var getActionMap = function getActionMap(nodeStatus, hasPreNode, flowType) {
7
28
  // 非开始节点看状态
8
29
  if (nodeStatus === FlowStatus.PROCESSING) {
9
- if (hasPreNode) return ['forward', 'save', 'submit', 'rejected', 'close', 'stop'];
10
- return flowType === FlowType.SINGLE_PAGE ? ['save', 'forward', 'close', 'stop', 'submit'] : ['forward', 'save', 'submit', 'close', 'stop'];
30
+ if (hasPreNode) return ['submit', 'save', 'share', 'forward', 'rejected', 'close', 'stop'];
31
+ return flowType === FlowType.SINGLE_PAGE ? ['save', 'forward', 'close', 'stop', 'share', 'submit'] : ['submit', 'save', 'share', 'forward', 'close', 'stop'];
11
32
  } else if (nodeStatus === FlowStatus.STOPPING) {
12
- return ['open', 'close'];
33
+ return ['close', 'open', 'share'];
13
34
  } else if ([FlowStatus.CLOSE, FlowStatus.COMPLETED, FlowStatus.RETURNING, FlowStatus.FLOWING].includes(nodeStatus)) {
14
35
  return [];
15
36
  } else {
16
- return ['save', 'submit'];
37
+ return ['submit', 'save', 'share'];
17
38
  }
18
39
  };
19
40
  var buttonMap = function buttonMap(flowType) {
@@ -26,6 +47,10 @@ var buttonMap = function buttonMap(flowType) {
26
47
  label: flowType === FlowType.SINGLE_PAGE ? '完结' : '提交',
27
48
  type: 'primary'
28
49
  },
50
+ share: {
51
+ label: '分享',
52
+ type: 'default'
53
+ },
29
54
  forward: {
30
55
  label: '转交',
31
56
  type: 'default'
@@ -49,14 +74,31 @@ var buttonMap = function buttonMap(flowType) {
49
74
  };
50
75
  };
51
76
  var ActionList = function ActionList(props) {
52
- var _buttonList$slice;
77
+ var _ref;
53
78
  var _props$flowStatus = props.flowStatus,
54
79
  flowStatus = _props$flowStatus === void 0 ? FlowStatus.NON_START : _props$flowStatus,
55
80
  hasPreNode = props.hasPreNode,
56
81
  _props$flowType = props.flowType,
57
82
  flowType = _props$flowType === void 0 ? FlowType.SINGLE_PAGE : _props$flowType,
58
- handleAction = props.handleAction;
59
- var buttonList = getActionMap(flowStatus, hasPreNode, flowType);
83
+ handleAction = props.handleAction,
84
+ _props$privilege = props.privilege,
85
+ privilege = _props$privilege === void 0 ? '' : _props$privilege,
86
+ _props$showShareButto = props.showShareButton,
87
+ showShareButton = _props$showShareButto === void 0 ? false : _props$showShareButto;
88
+ var buttonList = useMemo(function () {
89
+ var button = getActionMap(flowStatus, hasPreNode, flowType);
90
+ //如果是没有按钮权限 || 分享过来的 则不显示分享按钮
91
+ if (!showShareButton || privilege) {
92
+ button = button.filter(function (item) {
93
+ return item !== 'share';
94
+ });
95
+ }
96
+ //分享新建的只显示提交按钮
97
+ if (privilege === 'created') {
98
+ return ['submit'];
99
+ }
100
+ return button;
101
+ }, [flowStatus, hasPreNode, flowType, privilege, showShareButton]);
60
102
  var sliceLen = useMemo(function () {
61
103
  return flowType === FlowType.SINGLE_PAGE ? 1 : 3;
62
104
  }, [flowType]);
@@ -86,7 +128,7 @@ var ActionList = function ActionList(props) {
86
128
  onClick: function onClick(e) {
87
129
  return e.preventDefault();
88
130
  }
89
- }, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_buttonList$slice = buttonList.slice(0, sliceLen)) === null || _buttonList$slice === void 0 ? void 0 : _buttonList$slice.map(function (button, index) {
131
+ }, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_ref = reverse(buttonList.slice(0, sliceLen)) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (button, index) {
90
132
  var _buttonMap$button, _buttonMap$button2, _buttonMap$button3, _buttonMap$button4;
91
133
  return /*#__PURE__*/React.createElement(Button, {
92
134
  key: "button".concat(index),
@@ -1,4 +1,6 @@
1
1
  import React from 'react';
2
- export declare const AutoTaskDetail: ({ flowEventData }: {
2
+ import type { Shop } from '../../../model/types/login';
3
+ export declare const AutoTaskDetail: ({ flowEventData, shopList, }: {
3
4
  flowEventData: any;
5
+ shopList: Shop[];
4
6
  }) => React.JSX.Element;
@@ -1,8 +1,10 @@
1
1
  import React from 'react';
2
2
  import { isNumber } from 'lodash';
3
- import { Divider } from 'antd';
3
+ import { Divider, Button } from 'antd';
4
+ import { LBOrder } from "../../../LBOrderDetail";
4
5
  export var AutoTaskDetail = function AutoTaskDetail(_ref) {
5
- var flowEventData = _ref.flowEventData;
6
+ var flowEventData = _ref.flowEventData,
7
+ shopList = _ref.shopList;
6
8
  var mapping = {
7
9
  0: '执行中',
8
10
  1: '部分成功',
@@ -13,6 +15,30 @@ export var AutoTaskDetail = function AutoTaskDetail(_ref) {
13
15
  6: '同时存在成功和失败且已完结',
14
16
  7: '等待业务执行'
15
17
  };
18
+ var repairOrderMapList = [{
19
+ name: '安装/维修单订单编号',
20
+ value: 'repairOrderNumber'
21
+ }, {
22
+ name: '安装/维修单订单ID',
23
+ value: 'repairOrderId'
24
+ }, {
25
+ name: '服务类型',
26
+ value: 'serviceType'
27
+ }, {
28
+ name: '服务状态',
29
+ value: 'serviceStatus',
30
+ color: '#1b5bf3'
31
+ }, {
32
+ name: '最新服务进度',
33
+ value: 'latestServiceProgress',
34
+ color: '#1b5bf3'
35
+ }, {
36
+ name: '最新服务进度时间',
37
+ value: 'latestServiceProgressTime'
38
+ }, {
39
+ name: '下单时间',
40
+ value: 'orderTime'
41
+ }];
16
42
  var eventStatus = flowEventData === null || flowEventData === void 0 ? void 0 : flowEventData.eventStatus;
17
43
  var renderRules = function renderRules() {
18
44
  var _flowEventData$eventD, _flowEventData$eventD2;
@@ -28,8 +54,44 @@ export var AutoTaskDetail = function AutoTaskDetail(_ref) {
28
54
  }))), /*#__PURE__*/React.createElement("p", null, item.remark));
29
55
  }));
30
56
  };
57
+ var renderRepairResult = function renderRepairResult() {
58
+ var _flowEventData$eventD6, _flowEventData$eventD7;
59
+ var repairData = (flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD6 = flowEventData.eventData) === null || _flowEventData$eventD6 === void 0 ? void 0 : (_flowEventData$eventD7 = _flowEventData$eventD6.otherBusinessData) === null || _flowEventData$eventD7 === void 0 ? void 0 : _flowEventData$eventD7.repairData) || {};
60
+ var repairOrderStatus = repairData.repairOrderStatus,
61
+ id = repairData.id;
62
+ var isSuccess = repairOrderStatus === '成功';
63
+ return /*#__PURE__*/React.createElement("div", null, id && /*#__PURE__*/React.createElement(LBOrder, {
64
+ id: id,
65
+ activeKey: "orderInfo",
66
+ shopList: shopList,
67
+ btn: /*#__PURE__*/React.createElement(Button, {
68
+ style: {
69
+ padding: '4px 0'
70
+ },
71
+ type: "link"
72
+ }, "\u67E5\u770B\u8BE6\u60C5>>")
73
+ }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", {
74
+ style: {
75
+ marginBottom: '8px'
76
+ }
77
+ }, "\u5B89\u88C5/\u7EF4\u4FEE\u5355\u72B6\u6001:", /*#__PURE__*/React.createElement("span", {
78
+ style: {
79
+ color: isSuccess ? '#70B603' : '#D9001B'
80
+ }
81
+ }, repairOrderStatus)), isSuccess && (repairOrderMapList === null || repairOrderMapList === void 0 ? void 0 : repairOrderMapList.map(function (item) {
82
+ return /*#__PURE__*/React.createElement("p", {
83
+ style: {
84
+ marginBottom: '8px'
85
+ }
86
+ }, item.name, ":", /*#__PURE__*/React.createElement("span", {
87
+ style: {
88
+ color: (item === null || item === void 0 ? void 0 : item.color) || '#000'
89
+ }
90
+ }, repairData === null || repairData === void 0 ? void 0 : repairData[item.value]));
91
+ }))));
92
+ };
31
93
  // const renderReason = () => {
32
94
  // return <p>{ flowEventData?.eventData?.businessStatus?.map((item: any) => item?.remark)?.join(',') }</p>
33
95
  // }
34
- return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, isNumber(eventStatus) && "\u6267\u884C\u72B6\u6001: ".concat(mapping[eventStatus])), renderRules());
96
+ return /*#__PURE__*/React.createElement("div", null, (flowEventData === null || flowEventData === void 0 ? void 0 : flowEventData.eventType) === 'LBDJ_ONE_PRICE_ORDER' ? renderRepairResult() : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", null, isNumber(eventStatus) && "\u6267\u884C\u72B6\u6001: ".concat(mapping[eventStatus])), renderRules()));
35
97
  };
@@ -13,6 +13,7 @@ declare type CurrentNodeProps = {
13
13
  flowWorkOrderId?: string;
14
14
  queryRemarkList: () => void;
15
15
  autoSubmit?: boolean;
16
+ isSuperAdmin?: boolean;
16
17
  };
17
18
  declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
18
19
  export default _default;
@@ -18,11 +18,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
18
18
  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; } }
19
19
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
20
  import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
21
+ import { Modal } from 'antd';
21
22
  import { message } from 'antd';
22
23
  import { useMemoizedFn } from 'ahooks';
24
+ import { get, find } from 'lodash';
23
25
  import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
24
26
  import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
25
- import { modifyWorkOrder, restartAutoTask } from "../../../model/flowTemplateDetail/api";
27
+ import { modifyWorkOrder, restartAutoTask, skipNode } from "../../../model/flowTemplateDetail/api";
26
28
  import Header from "../Header";
27
29
  import FormRender from "../FormRender";
28
30
  import RenderDetail from "../RenderDetail";
@@ -30,17 +32,18 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
30
32
  import styles from "./index.module.less";
31
33
  import { PlatForm } from "../../../WorkOrder/types";
32
34
  import { useSignal } from "../../../hooks/useSignal";
33
- import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
35
+ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
34
36
  import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
35
37
  import { useSelector } from "../../context/useSelector";
36
38
  import { Context } from "../../context";
37
39
  import { AutoTaskDetail } from "../AutoTaskDetail";
40
+ import { SKIP_NODE_TYPES_CONFIG } from "../../../common/constant";
38
41
  var formProps = {
39
42
  className: 'customizeFormModalClassName',
40
43
  layout: 'vertical'
41
44
  };
42
45
  var CurrentNode = function CurrentNode(props, ref) {
43
- 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;
46
+ 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$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo22, _currentNodeDetail$no25, _currentNodeDetail$wo23;
44
47
  var formRenderRef = useRef(null);
45
48
  useImperativeHandle(ref, function () {
46
49
  return {
@@ -87,6 +90,7 @@ var CurrentNode = function CurrentNode(props, ref) {
87
90
  var operateParams = useSelector(selectOperateParams);
88
91
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
89
92
  var assistantMap = useSelector(selectNodeAssistantMap);
93
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
90
94
  var tradeKey = useMemo(function () {
91
95
  var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
92
96
  var tradeConfig = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo === void 0 ? void 0 : (_currentNodeDetail$wo2 = _currentNodeDetail$wo.componentDtoList) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.find(function (item) {
@@ -101,20 +105,22 @@ var CurrentNode = function CurrentNode(props, ref) {
101
105
 
102
106
  // 是否是当前节点处理人
103
107
  var isCurrentNodeHandler = useMemo(function () {
104
- var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$no11, _currentNodeDetail$no12;
108
+ var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
105
109
  return currentUserHasOperatorAuth({
110
+ isSuperAdmin: props === null || props === void 0 ? void 0 : props.isSuperAdmin,
106
111
  assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no5 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no5 === void 0 ? void 0 : _currentNodeDetail$no5.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no6 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no6 === void 0 ? void 0 : _currentNodeDetail$no6.id] || [],
112
+ userGroupList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : _currentNodeDetail$no7.id) && useGroupMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no8 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.id] || [],
107
113
  currentUserKey: plat.userKey,
108
- staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : (_currentNodeDetail$no8 = _currentNodeDetail$no7.assistants) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.staffIds) || [],
109
- operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : (_currentNodeDetail$no10 = _currentNodeDetail$no9.assistants) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.operateDataPermission,
114
+ staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : (_currentNodeDetail$no10 = _currentNodeDetail$no9.assistants) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.staffIds) || [],
115
+ operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : (_currentNodeDetail$no12 = _currentNodeDetail$no11.assistants) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.operateDataPermission,
110
116
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
111
- isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : (_currentNodeDetail$no12 = _currentNodeDetail$no11.assistants) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.isAllStaff
117
+ isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.isAllStaff
112
118
  });
113
119
  }, [currentNodeDetail, plat.userKey, assistantMap]);
114
120
  var handleChangeTradeId = useMemoizedFn(function (tid) {
115
- var _currentNodeDetail$no13;
121
+ var _currentNodeDetail$no15;
116
122
  // 非开始节点不进行订单重复校验逻辑
117
- if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : _currentNodeDetail$no13.nodeType) !== NodeType.START_NODE) {
123
+ if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.nodeType) !== NodeType.START_NODE) {
118
124
  return;
119
125
  }
120
126
  if (!tid) {
@@ -127,10 +133,10 @@ var CurrentNode = function CurrentNode(props, ref) {
127
133
  }
128
134
  });
129
135
  } else {
130
- var _currentNodeDetail$no14;
136
+ var _currentNodeDetail$no16;
131
137
  // 查询当前订单号有多少的重复
132
138
  var params = {
133
- flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
139
+ flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
134
140
  flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
135
141
  desensitizedFlag: false,
136
142
  pageNo: 1,
@@ -150,11 +156,11 @@ var CurrentNode = function CurrentNode(props, ref) {
150
156
  });
151
157
  // 当前节点是开始节点、并且携带订单号时,此时会进行订单重复提醒
152
158
  useEffect(function () {
153
- var _currentNodeDetail$no15;
154
- if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.nodeType) && operateParams !== null && operateParams !== void 0 && operateParams.flowTemplateKey && tradeKey) {
159
+ var _currentNodeDetail$no17;
160
+ if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.nodeType) && operateParams !== null && operateParams !== void 0 && operateParams.flowTemplateKey && tradeKey) {
155
161
  handleChangeTradeId(plat.orderNo);
156
162
  }
157
- }, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.nodeType, tradeKey]);
163
+ }, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType, tradeKey]);
158
164
  var transData = useMemo(function () {
159
165
  if (flowStatus === FlowStatus.COMPLETED) {
160
166
  var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -165,11 +171,11 @@ var CurrentNode = function CurrentNode(props, ref) {
165
171
  }
166
172
  }, [flowStatus, currentNodeDetail]);
167
173
  var handleWithdraw = function handleWithdraw() {
168
- var _currentNodeDetail$no17;
174
+ var _currentNodeDetail$no19;
169
175
  dispatch({
170
176
  type: 'setWithdrawWorkOrderDetail',
171
177
  payload: {
172
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
178
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
173
179
  }
174
180
  });
175
181
  dispatch({
@@ -201,7 +207,10 @@ var CurrentNode = function CurrentNode(props, ref) {
201
207
  flowWorkOrderId: flowWorkOrderId,
202
208
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.id,
203
209
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.update
204
- })
210
+ }),
211
+ shopUniqueKey: get(find(shopList, function (s) {
212
+ return s.shopId === formData.shopId;
213
+ }), 'accessToken', '')
205
214
  });
206
215
  _context.next = 7;
207
216
  return modifyWorkOrder(params);
@@ -237,7 +246,7 @@ var CurrentNode = function CurrentNode(props, ref) {
237
246
  }();
238
247
  var handleRestartAutoTask = /*#__PURE__*/function () {
239
248
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
240
- var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
249
+ var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
241
250
  var _yield$restartAutoTas, success, _controllerRef$curren2;
242
251
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
243
252
  while (1) switch (_context2.prev = _context2.next) {
@@ -249,7 +258,7 @@ var CurrentNode = function CurrentNode(props, ref) {
249
258
  flowWorkOrderId: flowWorkOrderId,
250
259
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
251
260
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
252
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
261
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
253
262
  })
254
263
  });
255
264
  case 2:
@@ -275,13 +284,86 @@ var CurrentNode = function CurrentNode(props, ref) {
275
284
  return _ref2.apply(this, arguments);
276
285
  };
277
286
  }();
287
+ var handleSkip = /*#__PURE__*/function () {
288
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
289
+ var title, config;
290
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
291
+ while (1) switch (_context4.prev = _context4.next) {
292
+ case 0:
293
+ title = '当前获取物流单号自动化任务正在执行中,确定要跳过吗?跳过后将无法获取物流信息';
294
+ config = SKIP_NODE_TYPES_CONFIG[eventType];
295
+ if (typeof config !== 'boolean') {
296
+ title = /*#__PURE__*/React.createElement(React.Fragment, null, "\u5F53\u524D", /*#__PURE__*/React.createElement("span", {
297
+ className: styles.highlight
298
+ }, config.name), "\u81EA\u52A8\u5316\u4EFB\u52A1\u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u786E\u5B9A\u8981\u8DF3\u8FC7\u5417\uFF1F\u8DF3\u8FC7\u540E\u5C06\u65E0\u6CD5\u83B7\u53D6", /*#__PURE__*/React.createElement("span", {
299
+ className: styles.highlight
300
+ }, config.tips));
301
+ }
302
+ Modal.confirm({
303
+ title: title,
304
+ okText: '确认',
305
+ cancelText: '取消',
306
+ onOk: function () {
307
+ var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
308
+ var _currentNodeDetail$no21;
309
+ var _yield$skipNode, success, _controllerRef$curren3;
310
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
311
+ while (1) switch (_context3.prev = _context3.next) {
312
+ case 0:
313
+ _context3.next = 2;
314
+ return skipNode({
315
+ operateParams: {
316
+ flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
317
+ flowWorkOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowWorkOrderUpdateTime,
318
+ flowTemplateId: flowTemplateId,
319
+ flowWorkOrderId: flowWorkOrderId,
320
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
321
+ }
322
+ });
323
+ case 2:
324
+ _yield$skipNode = _context3.sent;
325
+ success = _yield$skipNode.success;
326
+ if (success) {
327
+ message.success('跳过成功');
328
+ queryRemarkList();
329
+ dispatch(fetchPanelInfo({
330
+ flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
331
+ flowWorkOrderId: flowWorkOrderId
332
+ }, {
333
+ signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
334
+ }));
335
+ }
336
+ case 5:
337
+ case "end":
338
+ return _context3.stop();
339
+ }
340
+ }, _callee3);
341
+ }));
342
+ function onOk() {
343
+ return _onOk.apply(this, arguments);
344
+ }
345
+ return onOk;
346
+ }()
347
+ });
348
+ case 4:
349
+ case "end":
350
+ return _context4.stop();
351
+ }
352
+ }, _callee4);
353
+ }));
354
+ return function handleSkip() {
355
+ return _ref3.apply(this, arguments);
356
+ };
357
+ }();
278
358
  var isArtificialNode = tag === 'artificial';
279
359
  var isAutoNode = tag === 'auto';
280
- 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'].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType);
360
+ var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
361
+ 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(eventType);
281
362
  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;
282
363
  // TODO: 决策节点给后端修复数据加了一个入口
283
364
  // @ts-ignore
284
365
  var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
366
+ var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus);
285
367
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
286
368
  tag: tag,
287
369
  nodeName: nodeName,
@@ -293,9 +375,11 @@ var CurrentNode = function CurrentNode(props, ref) {
293
375
  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) &&
294
376
  // isCurrentNodeHandler &&
295
377
  !readonly,
378
+ showSkipButton: showSkipButton,
296
379
  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'),
297
380
  handleWithdraw: handleWithdraw,
298
381
  handleReminder: onReminder,
382
+ handleSkip: handleSkip,
299
383
  editing: editing,
300
384
  handleEdit: handleEdit,
301
385
  handleSave: handleSave,
@@ -303,17 +387,18 @@ var CurrentNode = function CurrentNode(props, ref) {
303
387
  handleRestartAutoTask: handleRestartAutoTask,
304
388
  flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
305
389
  flowWorkOrderId: flowWorkOrderId || '',
306
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
390
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.id) || '',
391
+ flowTemplateId: flowTemplateId
307
392
  }), /*#__PURE__*/React.createElement("div", {
308
393
  className: styles.formRenderContainer
309
- }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
394
+ }, [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, {
310
395
  workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
311
396
  transData: transData,
312
397
  platform: plat.platform,
313
398
  onOpenWangWang: onOpenWangWang
314
399
  }) : /*#__PURE__*/React.createElement(FormRender, {
315
400
  ref: formRenderRef,
316
- isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
401
+ 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),
317
402
  plat: plat,
318
403
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
319
404
  shopList: shopList,
@@ -330,10 +415,12 @@ var CurrentNode = function CurrentNode(props, ref) {
330
415
  handleChangeTradeId: handleChangeTradeId,
331
416
  canModifyPayment: true,
332
417
  flowAllShowHideRules: allShowHideRules,
418
+ 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),
333
419
  firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
334
420
  autoSubmit: autoSubmit
335
421
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
336
- flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData
422
+ flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData,
423
+ shopList: shopList
337
424
  })));
338
425
  };
339
426
  export default /*#__PURE__*/forwardRef(CurrentNode);
@@ -1,3 +1,6 @@
1
1
  .formRenderContainer {
2
2
  padding: 16px 0px;
3
- }
3
+ }
4
+ .highlight {
5
+ color: #1890ff;
6
+ }
@@ -32,6 +32,7 @@ declare type FormRenderProps = {
32
32
  firstOrderBackfill?: boolean;
33
33
  isErpUse?: boolean;
34
34
  autoSubmit?: boolean;
35
+ isStartNodeWaiting?: boolean;
35
36
  };
36
37
  declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
37
38
  export default _default;