@kmkf-fe-packages/kmkf-work-order-service-component 2.2.20-rc.1 → 2.2.20

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 (47) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.d.ts +2 -3
  2. package/dist/esm/FlowTemplateDetailV2/common.js +4 -16
  3. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +20 -22
  4. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +11 -1
  5. package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +28 -49
  6. package/dist/esm/FlowTemplateDetailV2/index.js +13 -15
  7. package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +0 -6
  8. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +81 -106
  9. package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +0 -3
  10. package/dist/esm/FlowTemplateDetailV2/store/selector.js +0 -3
  11. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.d.ts +3 -1
  12. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.js +15 -4
  13. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.less +18 -7
  14. package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts +1 -1
  15. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +79 -21
  16. package/dist/esm/common/utils/tools.d.ts +1 -1
  17. package/dist/esm/common/utils/tools.js +148 -120
  18. package/dist/esm/model/flowTemplateDetail/api.d.ts +0 -3
  19. package/dist/esm/model/flowTemplateDetail/api.js +0 -7
  20. package/dist/esm/model/flowTemplateDetail/types.d.ts +0 -3
  21. package/package.json +5 -5
  22. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.d.ts +0 -5
  23. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.js +0 -58
  24. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.d.ts +0 -4
  25. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +0 -297
  26. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less +0 -137
  27. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.d.ts +0 -5
  28. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.js +0 -95
  29. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.d.ts +0 -5
  30. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.js +0 -71
  31. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.d.ts +0 -12
  32. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.js +0 -22
  33. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.less +0 -20
  34. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.d.ts +0 -7
  35. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.js +0 -96
  36. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.less +0 -7
  37. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +0 -4
  38. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.js +0 -139
  39. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +0 -34
  40. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.d.ts +0 -5
  41. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.js +0 -157
  42. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.d.ts +0 -11
  43. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.js +0 -19
  44. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.less +0 -17
  45. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.d.ts +0 -8
  46. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +0 -454
  47. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less +0 -284
package/dist/esm/FlowTemplateDetailV2/common.d.ts CHANGED
@@ -18,14 +18,13 @@ 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, userGroupList, }: {
21
+ export declare const currentUserHasOperatorAuth: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, }: {
22
22
  currentUserKey: string;
23
23
  staffIds: Array<string>;
24
- operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL' | 'ONLY_THE_SAME_USER_GROUP';
24
+ operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL';
25
25
  handlerList: Array<{
26
26
  userKey: string;
27
27
  }>;
28
28
  isAllStaff: boolean;
29
29
  assistantList: Array<Assistant>;
30
- userGroupList: Array<string>;
31
30
  }) => boolean;
package/dist/esm/FlowTemplateDetailV2/common.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { NodeType } from "../model/flowTemplateDetail/types";
2
- import { intersection } from 'lodash';
3
2
  export var getTag = function getTag(item) {
4
3
  var tag = 'artificial'; // 人工节点
5
4
  // 先判断是什么节点类型 步骤/判断
@@ -64,17 +63,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
64
63
  operateDataPermission = _ref.operateDataPermission,
65
64
  handlerList = _ref.handlerList,
66
65
  isAllStaff = _ref.isAllStaff,
67
- assistantList = _ref.assistantList,
68
- _ref$userGroupList = _ref.userGroupList,
69
- userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
70
- console.log('currentUserHasOperatorAuth', currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList);
66
+ assistantList = _ref.assistantList;
67
+ // 节点配置为组操作
68
+ var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
71
69
  // handlerList为空数组是没有处理人，都可以处理
72
70
  if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
73
71
  return true;
74
72
  }
75
73
 
76
74
  // 可以处理所有任务
77
- if (operateDataPermission === 'HANDLE_ALL') {
75
+ if (groupCanOperate) {
78
76
  // 判断是否是预备客服
79
77
  return isAllStaff || ( // 全部
80
78
  staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -84,16 +82,6 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
84
82
  }) // 人在groups中
85
83
  ;
86
84
  }
87
- //仅可处理同用户组的工单
88
- if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
89
- //判断组用户中是否包含处理人 || 判断处理人是否是自己
90
- var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
91
- return item.userKey;
92
- });
93
- return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
94
- return item.userKey === currentUserKey;
95
- }));
96
- }
97
85
 
98
86
  // 只能处理分配到自己的任务
99
87
  // 判断处理人是否是自己
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED
@@ -30,7 +30,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
30
30
  import styles from "./index.module.less";
31
31
  import { PlatForm } from "../../../WorkOrder/types";
32
32
  import { useSignal } from "../../../hooks/useSignal";
33
- import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
33
+ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
34
34
  import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
35
35
  import { useSelector } from "../../context/useSelector";
36
36
  import { Context } from "../../context";
@@ -40,7 +40,7 @@ var formProps = {
40
40
  layout: 'vertical'
41
41
  };
42
42
  var CurrentNode = function CurrentNode(props, ref) {
43
- 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;
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;
44
44
  var formRenderRef = useRef(null);
45
45
  useImperativeHandle(ref, function () {
46
46
  return {
@@ -87,7 +87,6 @@ var CurrentNode = function CurrentNode(props, ref) {
87
87
  var operateParams = useSelector(selectOperateParams);
88
88
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
89
89
  var assistantMap = useSelector(selectNodeAssistantMap);
90
- var useGroupMap = useSelector(selectNodeUserGroupMap);
91
90
  var tradeKey = useMemo(function () {
92
91
  var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
93
92
  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) {
@@ -102,21 +101,20 @@ var CurrentNode = function CurrentNode(props, ref) {
102
101
 
103
102
  // 是否是当前节点处理人
104
103
  var isCurrentNodeHandler = useMemo(function () {
105
- var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
104
+ var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$no11, _currentNodeDetail$no12;
106
105
  return currentUserHasOperatorAuth({
107
106
  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] || [],
108
- 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] || [],
109
107
  currentUserKey: plat.userKey,
110
- 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) || [],
111
- 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,
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,
112
110
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
113
- 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
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
114
112
  });
115
113
  }, [currentNodeDetail, plat.userKey, assistantMap]);
116
114
  var handleChangeTradeId = useMemoizedFn(function (tid) {
117
- var _currentNodeDetail$no15;
115
+ var _currentNodeDetail$no13;
118
116
  // 非开始节点不进行订单重复校验逻辑
119
- 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) {
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) {
120
118
  return;
121
119
  }
122
120
  if (!tid) {
@@ -129,10 +127,10 @@ var CurrentNode = function CurrentNode(props, ref) {
129
127
  }
130
128
  });
131
129
  } else {
132
- var _currentNodeDetail$no16;
130
+ var _currentNodeDetail$no14;
133
131
  // 查询当前订单号有多少的重复
134
132
  var params = {
135
- flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
133
+ flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
136
134
  flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
137
135
  desensitizedFlag: false,
138
136
  pageNo: 1,
@@ -152,11 +150,11 @@ var CurrentNode = function CurrentNode(props, ref) {
152
150
  });
153
151
  // 当前节点是开始节点、并且携带订单号时，此时会进行订单重复提醒
154
152
  useEffect(function () {
155
- var _currentNodeDetail$no17;
156
- 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) {
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) {
157
155
  handleChangeTradeId(plat.orderNo);
158
156
  }
159
- }, [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]);
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]);
160
158
  var transData = useMemo(function () {
161
159
  if (flowStatus === FlowStatus.COMPLETED) {
162
160
  var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -167,11 +165,11 @@ var CurrentNode = function CurrentNode(props, ref) {
167
165
  }
168
166
  }, [flowStatus, currentNodeDetail]);
169
167
  var handleWithdraw = function handleWithdraw() {
170
- var _currentNodeDetail$no19;
168
+ var _currentNodeDetail$no17;
171
169
  dispatch({
172
170
  type: 'setWithdrawWorkOrderDetail',
173
171
  payload: {
174
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
172
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
175
173
  }
176
174
  });
177
175
  dispatch({
@@ -239,7 +237,7 @@ var CurrentNode = function CurrentNode(props, ref) {
239
237
  }();
240
238
  var handleRestartAutoTask = /*#__PURE__*/function () {
241
239
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
242
- var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
240
+ var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
243
241
  var _yield$restartAutoTas, success, _controllerRef$curren2;
244
242
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
245
243
  while (1) switch (_context2.prev = _context2.next) {
@@ -251,7 +249,7 @@ var CurrentNode = function CurrentNode(props, ref) {
251
249
  flowWorkOrderId: flowWorkOrderId,
252
250
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
253
251
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
254
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
252
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
255
253
  })
256
254
  });
257
255
  case 2:
@@ -305,17 +303,17 @@ var CurrentNode = function CurrentNode(props, ref) {
305
303
  handleRestartAutoTask: handleRestartAutoTask,
306
304
  flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
307
305
  flowWorkOrderId: flowWorkOrderId || '',
308
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
306
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
309
307
  }), /*#__PURE__*/React.createElement("div", {
310
308
  className: styles.formRenderContainer
311
- }, [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, {
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, {
312
310
  workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
313
311
  transData: transData,
314
312
  platform: plat.platform,
315
313
  onOpenWangWang: onOpenWangWang
316
314
  }) : /*#__PURE__*/React.createElement(FormRender, {
317
315
  ref: formRenderRef,
318
- 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),
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),
319
317
  plat: plat,
320
318
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
321
319
  shopList: shopList,
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -456,6 +456,7 @@ var FormRender = function FormRender(props, ref) {
456
456
  queryMemberLevels(_currentNodeTid, shopId);
457
457
  _context2.next = 27;
458
458
  return orderBack({
459
+ companyKey: companyKey,
459
460
  order_no: _currentNodeTid,
460
461
  form: form,
461
462
  shopId: shopId,
@@ -491,6 +492,7 @@ var FormRender = function FormRender(props, ref) {
491
492
  queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
492
493
  _context2.next = 38;
493
494
  return orderBack({
495
+ companyKey: companyKey,
494
496
  order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
495
497
  form: form,
496
498
  shopId: shopId,
@@ -568,6 +570,7 @@ var FormRender = function FormRender(props, ref) {
568
570
  queryMemberLevels(orderNo, shopId);
569
571
  _context2.next = 63;
570
572
  return orderBack({
573
+ companyKey: companyKey,
571
574
  order_no: orderNo,
572
575
  form: form,
573
576
  shopId: shopId,
@@ -830,6 +833,7 @@ var FormRender = function FormRender(props, ref) {
830
833
  sessionStorage.setItem('order_no_test', order_no);
831
834
  _context5.next = 5;
832
835
  return orderBack({
836
+ companyKey: companyKey,
833
837
  order_no: order_no,
834
838
  form: form,
835
839
  shopId: shopId,
@@ -977,7 +981,12 @@ var FormRender = function FormRender(props, ref) {
977
981
  componentOnBlur: componentOnBlur
978
982
  });
979
983
  case 8:
980
- if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
984
+ if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
985
+ //test 测马奔腾
986
+ '6O47IBXFR26FJF4HUQ7WGO4H',
987
+ //prod 陈健企业工单
988
+ 'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
989
+ ].includes(companyKey)) {
981
990
  _context6.next = 11;
982
991
  break;
983
992
  }
@@ -1183,6 +1192,7 @@ var FormRender = function FormRender(props, ref) {
1183
1192
  var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
1184
1193
  if (_tradeValue || paymentValue) {
1185
1194
  orderBack({
1195
+ companyKey: companyKey,
1186
1196
  order_no: _tradeValue || paymentValue,
1187
1197
  form: form,
1188
1198
  shopId: val,
package/dist/esm/FlowTemplateDetailV2/components/Item/index.js CHANGED
@@ -24,8 +24,8 @@ import Header from "../Header";
24
24
  import FormRender from "../FormRender";
25
25
  import RenderDetail from "../RenderDetail";
26
26
  import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
27
- import { queryNodeDetail, queryMultiNodeAssistantInfo, queryUserGroupList } from "../../../model/flowTemplateDetail/api";
28
- import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams, selectNodeUserGroupMap } from "../../store/selector";
27
+ import { queryNodeDetail, queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
28
+ import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams } from "../../store/selector";
29
29
  import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
30
30
  import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
31
31
  import { PlatForm } from "../../../WorkOrder/types";
@@ -34,7 +34,7 @@ import { useSelector } from "../../context/useSelector";
34
34
  import { Context } from "../../context";
35
35
  import { AutoTaskDetail } from "../AutoTaskDetail";
36
36
  var NodeItem = function NodeItem(props) {
37
- var _data$data12, _data$data13, _data$data13$workOrde, _data$data14, _data$data14$workOrde, _data$data15, _data$data15$nodeInfo, _data$data16, _data$data17, _data$data17$nodeInfo, _data$data18, _data$data19, _data$data20, _data$data20$workOrde, _data$data21, _data$data22;
37
+ 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;
38
38
  var tag = props.tag,
39
39
  nodeId = props.nodeId,
40
40
  nodeName = props.nodeName,
@@ -75,7 +75,6 @@ var NodeItem = function NodeItem(props) {
75
75
  var flowStatus = useSelector(selectFlowStatus);
76
76
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
77
77
  var assistantMap = useSelector(selectNodeAssistantMap);
78
- var useGroupMap = useSelector(selectNodeUserGroupMap);
79
78
  var _Form$useForm = Form.useForm(),
80
79
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
81
80
  form = _Form$useForm2[0];
@@ -97,12 +96,12 @@ var NodeItem = function NodeItem(props) {
97
96
  manual: true,
98
97
  onSuccess: function () {
99
98
  var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
100
- var _currentNodeDetail$wo, _currentNodeDetail$no, _assistants$groupIds, currentNodeDetail, handlerList, assistants, userRes, assistantRes, _assistantRes$data;
99
+ var _currentNodeDetail$wo, _currentNodeDetail$no, currentNodeDetail, handlerList, assistants, assistantRes, _assistantRes$data;
101
100
  return _regeneratorRuntime().wrap(function _callee$(_context) {
102
101
  while (1) switch (_context.prev = _context.next) {
103
102
  case 0:
104
103
  if (!result.success) {
105
- _context.next = 24;
104
+ _context.next = 17;
106
105
  break;
107
106
  }
108
107
  setOpen(true);
@@ -111,39 +110,20 @@ var NodeItem = function NodeItem(props) {
111
110
  currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
112
111
  handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
113
112
  assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
114
- if (!((assistants === null || assistants === void 0 ? void 0 : assistants.operateDataPermission) === 'ONLY_THE_SAME_USER_GROUP' && assistants !== null && assistants !== void 0 && (_assistants$groupIds = assistants.groupIds) !== null && _assistants$groupIds !== void 0 && _assistants$groupIds.length)) {
115
- _context.next = 13;
116
- break;
117
- }
118
- _context.next = 9;
119
- return queryUserGroupList({
120
- groupUkList: (assistants === null || assistants === void 0 ? void 0 : assistants.groupIds) || []
121
- });
122
- case 9:
123
- userRes = _context.sent;
124
- if (userRes.success) {
125
- dispatch({
126
- type: 'setGroupUserList',
127
- payload: _defineProperty({}, nodeId, userRes.data || [])
128
- });
129
- }
130
- _context.next = 24;
131
- break;
132
- case 13:
133
113
  if (!(Array.isArray(handlerList) && handlerList.length &&
134
114
  // 有处理人
135
115
  !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理，查询能够处理的人
136
116
  )) {
137
- _context.next = 24;
117
+ _context.next = 17;
138
118
  break;
139
119
  }
140
- _context.prev = 14;
141
- _context.next = 17;
120
+ _context.prev = 7;
121
+ _context.next = 10;
142
122
  return queryMultiNodeAssistantInfo([{
143
123
  flowTemplateId: flowTemplateId,
144
124
  currentNodeId: nodeId
145
125
  }]);
146
- case 17:
126
+ case 10:
147
127
  assistantRes = _context.sent;
148
128
  if (assistantRes.success) {
149
129
  dispatch({
@@ -151,17 +131,17 @@ var NodeItem = function NodeItem(props) {
151
131
  payload: _defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
152
132
  });
153
133
  }
154
- _context.next = 24;
134
+ _context.next = 17;
155
135
  break;
156
- case 21:
157
- _context.prev = 21;
158
- _context.t0 = _context["catch"](14);
136
+ case 14:
137
+ _context.prev = 14;
138
+ _context.t0 = _context["catch"](7);
159
139
  console.error(_context.t0);
160
- case 24:
140
+ case 17:
161
141
  case "end":
162
142
  return _context.stop();
163
143
  }
164
- }, _callee, null, [[14, 21]]);
144
+ }, _callee, null, [[7, 14]]);
165
145
  }));
166
146
  function onSuccess(_x2) {
167
147
  return _onSuccess.apply(this, arguments);
@@ -249,16 +229,15 @@ var NodeItem = function NodeItem(props) {
249
229
 
250
230
  // 是否是当前节点处理人
251
231
  var isCurrentNodeHandler = useMemo(function () {
252
- var _data$data4, _data$data4$nodeInfo, _data$data5, _data$data5$nodeInfo, _data$data6, _data$data6$nodeInfo, _data$data7, _data$data7$nodeInfo, _data$data8, _data$data8$nodeInfo, _data$data8$nodeInfo$, _data$data9, _data$data9$nodeInfo, _data$data9$nodeInfo$, _data$data10, _data$data10$workOrde, _data$data11, _data$data11$nodeInfo, _data$data11$nodeInfo2;
232
+ var _data$data4, _data$data4$nodeInfo, _data$data5, _data$data5$nodeInfo, _data$data6, _data$data6$nodeInfo, _data$data6$nodeInfo$, _data$data7, _data$data7$nodeInfo, _data$data7$nodeInfo$, _data$data8, _data$data8$workOrder, _data$data9, _data$data9$nodeInfo, _data$data9$nodeInfo$;
253
233
  return currentUserHasOperatorAuth({
254
234
  // assistantList: data?.data?.nodeInfo?.id && assistantMap['FN00278209550851436544'] || [],
255
235
  assistantList: (data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : (_data$data4$nodeInfo = _data$data4.nodeInfo) === null || _data$data4$nodeInfo === void 0 ? void 0 : _data$data4$nodeInfo.id) && assistantMap[data === null || data === void 0 ? void 0 : (_data$data5 = data.data) === null || _data$data5 === void 0 ? void 0 : (_data$data5$nodeInfo = _data$data5.nodeInfo) === null || _data$data5$nodeInfo === void 0 ? void 0 : _data$data5$nodeInfo.id] || [],
256
- userGroupList: (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : (_data$data6$nodeInfo = _data$data6.nodeInfo) === null || _data$data6$nodeInfo === void 0 ? void 0 : _data$data6$nodeInfo.id) && useGroupMap[data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : (_data$data7$nodeInfo = _data$data7.nodeInfo) === null || _data$data7$nodeInfo === void 0 ? void 0 : _data$data7$nodeInfo.id] || [],
257
236
  currentUserKey: plat.userKey,
258
- staffIds: (data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : (_data$data8$nodeInfo = _data$data8.nodeInfo) === null || _data$data8$nodeInfo === void 0 ? void 0 : (_data$data8$nodeInfo$ = _data$data8$nodeInfo.assistants) === null || _data$data8$nodeInfo$ === void 0 ? void 0 : _data$data8$nodeInfo$.staffIds) || [],
259
- operateDataPermission: 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$.operateDataPermission,
260
- handlerList: (data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : (_data$data10$workOrde = _data$data10.workOrder) === null || _data$data10$workOrde === void 0 ? void 0 : _data$data10$workOrde.handlerList) || [],
261
- isAllStaff: data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$nodeInfo = _data$data11.nodeInfo) === null || _data$data11$nodeInfo === void 0 ? void 0 : (_data$data11$nodeInfo2 = _data$data11$nodeInfo.assistants) === null || _data$data11$nodeInfo2 === void 0 ? void 0 : _data$data11$nodeInfo2.isAllStaff
237
+ staffIds: (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : (_data$data6$nodeInfo = _data$data6.nodeInfo) === null || _data$data6$nodeInfo === void 0 ? void 0 : (_data$data6$nodeInfo$ = _data$data6$nodeInfo.assistants) === null || _data$data6$nodeInfo$ === void 0 ? void 0 : _data$data6$nodeInfo$.staffIds) || [],
238
+ operateDataPermission: data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : (_data$data7$nodeInfo = _data$data7.nodeInfo) === null || _data$data7$nodeInfo === void 0 ? void 0 : (_data$data7$nodeInfo$ = _data$data7$nodeInfo.assistants) === null || _data$data7$nodeInfo$ === void 0 ? void 0 : _data$data7$nodeInfo$.operateDataPermission,
239
+ handlerList: (data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : (_data$data8$workOrder = _data$data8.workOrder) === null || _data$data8$workOrder === void 0 ? void 0 : _data$data8$workOrder.handlerList) || [],
240
+ 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
262
241
  });
263
242
  }, [data, plat.userKey, assistantMap]);
264
243
  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', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC'].includes(eventNodeType);
@@ -279,7 +258,7 @@ var NodeItem = function NodeItem(props) {
279
258
  // }
280
259
  // };
281
260
 
282
- var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : _data$data12.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$workOrde = _data$data13.workOrderTemplateInfo) === null || _data$data13$workOrde === void 0 ? void 0 : _data$data13$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : (_data$data14$workOrde = _data$data14.workOrderTemplateInfo) === null || _data$data14$workOrde === void 0 ? void 0 : _data$data14$workOrde.componentDtoList) || []))),
261
+ 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) || []))),
283
262
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
284
263
  transData = _calcWorkOrderList2[0];
285
264
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
@@ -307,18 +286,18 @@ var NodeItem = function NodeItem(props) {
307
286
  display: open ? 'block' : 'none',
308
287
  marginTop: '16px'
309
288
  }
310
- }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : (_data$data15$nodeInfo = _data$data15.nodeInfo) === null || _data$data15$nodeInfo === void 0 ? void 0 : _data$data15$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
311
- isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : (_data$data17$nodeInfo = _data$data17.nodeInfo) === null || _data$data17$nodeInfo === void 0 ? void 0 : _data$data17$nodeInfo.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
289
+ }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$nodeInfo = _data$data13.nodeInfo) === null || _data$data13$nodeInfo === void 0 ? void 0 : _data$data13$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : _data$data14.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
290
+ isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : (_data$data15$nodeInfo = _data$data15.nodeInfo) === null || _data$data15$nodeInfo === void 0 ? void 0 : _data$data15$nodeInfo.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
312
291
  plat: plat,
313
- templateDetail: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : _data$data18.workOrderTemplateInfo,
292
+ templateDetail: data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo,
314
293
  shopList: shopList,
315
- record: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrder,
294
+ record: data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder,
316
295
  accountName: plat.accountName,
317
296
  form: form,
318
297
  onOpenWangWang: onOpenWangWang,
319
298
  onJumpPage: onJumpPage,
320
299
  look: !editing || flowStatus === FlowStatus.STOPPING,
321
- shopId: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : (_data$data20$workOrde = _data$data20.workOrder) === null || _data$data20$workOrde === void 0 ? void 0 : _data$data20$workOrde.shopId,
300
+ shopId: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrder) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.shopId,
322
301
  formProps: {
323
302
  className: 'customizeFormModalClassName',
324
303
  layout: 'vertical'
@@ -328,12 +307,12 @@ var NodeItem = function NodeItem(props) {
328
307
  firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
329
308
  // handleChangeTradeId={handleChangeTradeId}
330
309
  }) : /*#__PURE__*/React.createElement(RenderDetail, {
331
- workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
310
+ workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
332
311
  transData: transData,
333
312
  platform: plat.platform,
334
313
  onOpenWangWang: onOpenWangWang
335
314
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
336
- flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData
315
+ flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
337
316
  })));
338
317
  };
339
318
  export default NodeItem;
package/dist/esm/FlowTemplateDetailV2/index.js CHANGED
@@ -27,7 +27,7 @@ import { calcWorkOrderList, deleteCacheOrder, submitParams } from "../common/uti
27
27
  import { useMemoizedFn } from 'ahooks';
28
28
  import moment from 'moment';
29
29
  import { fetchPanelInfo, fetchAllFlowOperateRecord, fetchCollectOrder, fetchShareNodeConfig, fetchH5SharePermission } from "./store/reducers";
30
- import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectAutoSubmitFlag, selectShowShareButton, selectH5SharePermission, selectNodeUserGroupMap } from "./store/selector";
30
+ import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectAutoSubmitFlag, selectShowShareButton, selectH5SharePermission } from "./store/selector";
31
31
  import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
32
32
  import NodeItem from "./components/Item";
33
33
  import CurrentNode from "./components/CurrentNode";
@@ -61,7 +61,7 @@ import { PlatForm } from "../WorkOrder/types";
61
61
  var Text = Typography.Text,
62
62
  Link = Typography.Link;
63
63
  var FlowTemplateDetail = function FlowTemplateDetail(props) {
64
- var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _currentNodeDetail$no14, _shopList$find, _JSON$parse, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$no27, _currentNodeDetail$no28, _currentNodeDetail$no29, _currentNodeDetail$no30;
64
+ var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _currentNodeDetail$no14, _shopList$find, _JSON$parse, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$no25, _currentNodeDetail$no26, _currentNodeDetail$no27, _currentNodeDetail$no28;
65
65
  var flowTemplateKey = props.flowTemplateKey,
66
66
  _props$shopList = props.shopList,
67
67
  shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -101,7 +101,6 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
101
101
  var autoSubmitFlag = useSelector(selectAutoSubmitFlag);
102
102
  var withdrawWorkOrderDetail = useSelector(selectWithDrawOrder);
103
103
  var assistantMap = useSelector(selectNodeAssistantMap);
104
- var useGroupMap = useSelector(selectNodeUserGroupMap);
105
104
  var flowTemplateType = useSelector(selectFlowTemplateType);
106
105
  var follow = useSelector(selectFollow);
107
106
  var showShareButton = useSelector(selectShowShareButton);
@@ -1158,20 +1157,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1158
1157
  }
1159
1158
  }, [currentNodeDetail, autoSubmitFlag]);
1160
1159
  var isCurrentNodeHandler = useMemo(function () {
1161
- var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$wo27, _currentNodeDetail$no23, _currentNodeDetail$no24;
1160
+ var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$wo27, _currentNodeDetail$no21, _currentNodeDetail$no22;
1162
1161
  return currentUserHasOperatorAuth({
1163
1162
  assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id] || [],
1164
- userGroupList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) && useGroupMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id] || [],
1165
1163
  currentUserKey: plat.userKey,
1166
- staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.assistants) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.staffIds) || [],
1167
- operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : (_currentNodeDetail$no22 = _currentNodeDetail$no21.assistants) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.operateDataPermission,
1164
+ staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.staffIds) || [],
1165
+ operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.assistants) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.operateDataPermission,
1168
1166
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
1169
- isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : (_currentNodeDetail$no24 = _currentNodeDetail$no23.assistants) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.isAllStaff
1167
+ isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : (_currentNodeDetail$no22 = _currentNodeDetail$no21.assistants) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.isAllStaff
1170
1168
  });
1171
- }, [currentNodeDetail, plat, assistantMap, useGroupMap]);
1169
+ }, [currentNodeDetail, plat, assistantMap]);
1172
1170
  var defaultShopId = (_shopList$find = shopList.find(function (item) {
1173
- var _currentNodeDetail$no25, _currentNodeDetail$no26;
1174
- return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : (_currentNodeDetail$no26 = _currentNodeDetail$no25.relationEvent) === null || _currentNodeDetail$no26 === void 0 ? void 0 : _currentNodeDetail$no26.defaultShopUniqueKey);
1171
+ var _currentNodeDetail$no23, _currentNodeDetail$no24;
1172
+ return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : (_currentNodeDetail$no24 = _currentNodeDetail$no23.relationEvent) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.defaultShopUniqueKey);
1175
1173
  })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
1176
1174
  var ReportOrderRender = function ReportOrderRender(props) {
1177
1175
  var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
@@ -1368,8 +1366,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1368
1366
  handleOpenRemarkList: handleOpenRemarkList,
1369
1367
  handleOpenAddRemark: handleOpenAddRemark
1370
1368
  }))), getTag({
1371
- nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : _currentNodeDetail$no27.isAuto,
1372
- nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no28 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.nodeType
1369
+ nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.isAuto,
1370
+ nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no26 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no26 === void 0 ? void 0 : _currentNodeDetail$no26.nodeType
1373
1371
  }) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler || ['true', 'created'].includes(privilege)) && !readonly && /*#__PURE__*/React.createElement("div", {
1374
1372
  className: "footer"
1375
1373
  }, /*#__PURE__*/React.createElement(ActionList, {
@@ -1397,7 +1395,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1397
1395
  plat: plat
1398
1396
  }), /*#__PURE__*/React.createElement(ForWardModal, {
1399
1397
  flowTemplateId: flowTemplateId,
1400
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no29 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no29 === void 0 ? void 0 : _currentNodeDetail$no29.id,
1398
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : _currentNodeDetail$no27.id,
1401
1399
  handleForWard: handleForWard
1402
1400
  }), /*#__PURE__*/React.createElement(StopModal, {
1403
1401
  handleStop: handleStop
@@ -1405,7 +1403,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1405
1403
  handleClose: handleClose
1406
1404
  }), /*#__PURE__*/React.createElement(RejectedModal, {
1407
1405
  flowTemplateId: flowTemplateId,
1408
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no30 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no30 === void 0 ? void 0 : _currentNodeDetail$no30.id,
1406
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no28 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.id,
1409
1407
  handleReturnWorkOrder: handleReturnWorkOrder
1410
1408
  }), /*#__PURE__*/React.createElement(RemarkModal, {
1411
1409
  handleSubmitRemark: handleSubmitRemark
package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts CHANGED
@@ -12,9 +12,6 @@ export declare const fetchH5SharePermission: () => (dispatch: any) => Promise<vo
12
12
  export declare const setNodeAssistantInfo: (state: FlowTemplateDetailState, { payload }: PayloadAction<{
13
13
  [nodeId: string]: Assistant[];
14
14
  }>) => void;
15
- export declare const setGroupUserList: (state: FlowTemplateDetailState, { payload }: PayloadAction<{
16
- [nodeId: string]: string[];
17
- }>) => void;
18
15
  export declare const setLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
19
16
  export declare const setOrderBackLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
20
17
  export declare const setOrderBackKmLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
@@ -60,9 +57,6 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
60
57
  assistantMap: {
61
58
  [nodeId: string]: Assistant[];
62
59
  };
63
- userGroupMap: {
64
- [nodeId: string]: string[];
65
- };
66
60
  remarkList: Remark[];
67
61
  currentNode: CurrentNodeDetail;
68
62
  action: ActionType;