@kmkf-fe-packages/kmkf-work-order-service-component 2.2.26 → 2.2.27

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 (16) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.d.ts +4 -2
  2. package/dist/esm/FlowTemplateDetailV2/common.js +21 -5
  3. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts +1 -0
  4. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +24 -21
  5. package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +1 -0
  6. package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +53 -29
  7. package/dist/esm/FlowTemplateDetailV2/index.js +20 -15
  8. package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +6 -0
  9. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +106 -81
  10. package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
  11. package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
  12. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -1
  13. package/dist/esm/model/flowTemplateDetail/api.d.ts +3 -0
  14. package/dist/esm/model/flowTemplateDetail/api.js +7 -0
  15. package/dist/esm/model/flowTemplateDetail/types.d.ts +3 -0
  16. package/package.json +5 -5
package/dist/esm/FlowTemplateDetailV2/common.d.ts CHANGED
@@ -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;
package/dist/esm/FlowTemplateDetailV2/common.js CHANGED
@@ -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
  // 先判断是什么节点类型 步骤/判断
@@ -58,21 +59,26 @@ export var verifyHandle = function verifyHandle(data, componentDtoList) {
58
59
  return res;
59
60
  };
60
61
  export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref) {
61
- var currentUserKey = _ref.currentUserKey,
62
+ var _ref$isSuperAdmin = _ref.isSuperAdmin,
63
+ isSuperAdmin = _ref$isSuperAdmin === void 0 ? false : _ref$isSuperAdmin,
64
+ currentUserKey = _ref.currentUserKey,
62
65
  staffIds = _ref.staffIds,
63
66
  operateDataPermission = _ref.operateDataPermission,
64
67
  handlerList = _ref.handlerList,
65
68
  isAllStaff = _ref.isAllStaff,
66
- assistantList = _ref.assistantList;
67
- // 节点配置为组操作
68
- var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
69
+ assistantList = _ref.assistantList,
70
+ _ref$userGroupList = _ref.userGroupList,
71
+ userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
72
+ if (isSuperAdmin) {
73
+ return true;
74
+ }
69
75
  // handlerList为空数组是没有处理人，都可以处理
70
76
  if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
71
77
  return true;
72
78
  }
73
79
 
74
80
  // 可以处理所有任务
75
- if (groupCanOperate) {
81
+ if (operateDataPermission === 'HANDLE_ALL') {
76
82
  // 判断是否是预备客服
77
83
  return isAllStaff || ( // 全部
78
84
  staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -82,6 +88,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
82
88
  }) // 人在groups中
83
89
  ;
84
90
  }
91
+ //仅可处理同用户组的工单
92
+ if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
93
+ //判断组用户中是否包含处理人 || 判断处理人是否是自己
94
+ var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
95
+ return item.userKey;
96
+ });
97
+ return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
98
+ return item.userKey === currentUserKey;
99
+ }));
100
+ }
85
101
 
86
102
  // 只能处理分配到自己的任务
87
103
  // 判断处理人是否是自己
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts CHANGED
@@ -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;
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED
@@ -31,7 +31,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
31
31
  import styles from "./index.module.less";
32
32
  import { PlatForm } from "../../../WorkOrder/types";
33
33
  import { useSignal } from "../../../hooks/useSignal";
34
- import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
34
+ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
35
35
  import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
36
36
  import { useSelector } from "../../context/useSelector";
37
37
  import { Context } from "../../context";
@@ -41,7 +41,7 @@ var formProps = {
41
41
  layout: 'vertical'
42
42
  };
43
43
  var CurrentNode = function CurrentNode(props, ref) {
44
- 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, _currentNodeDetail$no22, _currentNodeDetail$wo23;
44
+ var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$wo22, _currentNodeDetail$no24, _currentNodeDetail$wo23;
45
45
  var formRenderRef = useRef(null);
46
46
  useImperativeHandle(ref, function () {
47
47
  return {
@@ -88,6 +88,7 @@ var CurrentNode = function CurrentNode(props, ref) {
88
88
  var operateParams = useSelector(selectOperateParams);
89
89
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
90
90
  var assistantMap = useSelector(selectNodeAssistantMap);
91
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
91
92
  var tradeKey = useMemo(function () {
92
93
  var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
93
94
  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,20 +103,22 @@ var CurrentNode = function CurrentNode(props, ref) {
102
103
 
103
104
  // 是否是当前节点处理人
104
105
  var isCurrentNodeHandler = useMemo(function () {
105
- var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$no11, _currentNodeDetail$no12;
106
+ var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
106
107
  return currentUserHasOperatorAuth({
108
+ isSuperAdmin: props === null || props === void 0 ? void 0 : props.isSuperAdmin,
107
109
  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] || [],
110
+ 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] || [],
108
111
  currentUserKey: plat.userKey,
109
- 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) || [],
110
- 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
+ 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) || [],
113
+ 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,
111
114
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
112
- 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
115
+ 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
113
116
  });
114
117
  }, [currentNodeDetail, plat.userKey, assistantMap]);
115
118
  var handleChangeTradeId = useMemoizedFn(function (tid) {
116
- var _currentNodeDetail$no13;
119
+ var _currentNodeDetail$no15;
117
120
  // 非开始节点不进行订单重复校验逻辑
118
- 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) {
121
+ 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) {
119
122
  return;
120
123
  }
121
124
  if (!tid) {
@@ -128,10 +131,10 @@ var CurrentNode = function CurrentNode(props, ref) {
128
131
  }
129
132
  });
130
133
  } else {
131
- var _currentNodeDetail$no14;
134
+ var _currentNodeDetail$no16;
132
135
  // 查询当前订单号有多少的重复
133
136
  var params = {
134
- flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
137
+ flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
135
138
  flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
136
139
  desensitizedFlag: false,
137
140
  pageNo: 1,
@@ -151,11 +154,11 @@ var CurrentNode = function CurrentNode(props, ref) {
151
154
  });
152
155
  // 当前节点是开始节点、并且携带订单号时，此时会进行订单重复提醒
153
156
  useEffect(function () {
154
- var _currentNodeDetail$no15;
155
- 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
+ var _currentNodeDetail$no17;
158
+ 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) {
156
159
  handleChangeTradeId(plat.orderNo);
157
160
  }
158
- }, [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]);
161
+ }, [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]);
159
162
  var transData = useMemo(function () {
160
163
  if (flowStatus === FlowStatus.COMPLETED) {
161
164
  var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -166,11 +169,11 @@ var CurrentNode = function CurrentNode(props, ref) {
166
169
  }
167
170
  }, [flowStatus, currentNodeDetail]);
168
171
  var handleWithdraw = function handleWithdraw() {
169
- var _currentNodeDetail$no17;
172
+ var _currentNodeDetail$no19;
170
173
  dispatch({
171
174
  type: 'setWithdrawWorkOrderDetail',
172
175
  payload: {
173
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
176
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
174
177
  }
175
178
  });
176
179
  dispatch({
@@ -241,7 +244,7 @@ var CurrentNode = function CurrentNode(props, ref) {
241
244
  }();
242
245
  var handleRestartAutoTask = /*#__PURE__*/function () {
243
246
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
244
- var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
247
+ var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
245
248
  var _yield$restartAutoTas, success, _controllerRef$curren2;
246
249
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
247
250
  while (1) switch (_context2.prev = _context2.next) {
@@ -253,7 +256,7 @@ var CurrentNode = function CurrentNode(props, ref) {
253
256
  flowWorkOrderId: flowWorkOrderId,
254
257
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
255
258
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
256
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
259
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
257
260
  })
258
261
  });
259
262
  case 2:
@@ -307,17 +310,17 @@ var CurrentNode = function CurrentNode(props, ref) {
307
310
  handleRestartAutoTask: handleRestartAutoTask,
308
311
  flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
309
312
  flowWorkOrderId: flowWorkOrderId || '',
310
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
313
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
311
314
  }), /*#__PURE__*/React.createElement("div", {
312
315
  className: styles.formRenderContainer
313
- }, [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, {
316
+ }, [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, {
314
317
  workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
315
318
  transData: transData,
316
319
  platform: plat.platform,
317
320
  onOpenWangWang: onOpenWangWang
318
321
  }) : /*#__PURE__*/React.createElement(FormRender, {
319
322
  ref: formRenderRef,
320
- 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),
323
+ 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),
321
324
  plat: plat,
322
325
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
323
326
  shopList: shopList,
@@ -334,7 +337,7 @@ var CurrentNode = function CurrentNode(props, ref) {
334
337
  handleChangeTradeId: handleChangeTradeId,
335
338
  canModifyPayment: true,
336
339
  flowAllShowHideRules: allShowHideRules,
337
- isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.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),
340
+ isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
338
341
  firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
339
342
  autoSubmit: autoSubmit
340
343
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts CHANGED
@@ -18,6 +18,7 @@ interface NodeItem {
18
18
  nodeIsAuto: boolean;
19
19
  flowTemplateKey: string;
20
20
  eventNodeType: string;
21
+ isSuperAdmin?: boolean;
21
22
  }
22
23
  declare const NodeItem: (props: NodeItem) => React.JSX.Element;
23
24
  export default NodeItem;
package/dist/esm/FlowTemplateDetailV2/components/Item/index.js CHANGED
@@ -25,8 +25,8 @@ import Header from "../Header";
25
25
  import FormRender from "../FormRender";
26
26
  import RenderDetail from "../RenderDetail";
27
27
  import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
28
- import { queryNodeDetail, queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
29
- import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams } from "../../store/selector";
28
+ import { queryNodeDetail, queryMultiNodeAssistantInfo, queryUserGroupList } from "../../../model/flowTemplateDetail/api";
29
+ import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams, selectNodeUserGroupMap } from "../../store/selector";
30
30
  import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
31
31
  import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
32
32
  import { PlatForm } from "../../../WorkOrder/types";
@@ -35,7 +35,7 @@ import { useSelector } from "../../context/useSelector";
35
35
  import { Context } from "../../context";
36
36
  import { AutoTaskDetail } from "../AutoTaskDetail";
37
37
  var NodeItem = function NodeItem(props) {
38
- 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
+ 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;
39
39
  var tag = props.tag,
40
40
  nodeId = props.nodeId,
41
41
  nodeName = props.nodeName,
@@ -56,7 +56,9 @@ var NodeItem = function NodeItem(props) {
56
56
  nodeIsAuto = props.nodeIsAuto,
57
57
  flowTemplateKey = props.flowTemplateKey,
58
58
  onJumpPage = props.onJumpPage,
59
- eventNodeType = props.eventNodeType;
59
+ eventNodeType = props.eventNodeType,
60
+ _props$isSuperAdmin = props.isSuperAdmin,
61
+ isSuperAdmin = _props$isSuperAdmin === void 0 ? false : _props$isSuperAdmin;
60
62
  var _useContext = useContext(Context),
61
63
  dispatch = _useContext.dispatch;
62
64
  var plat = useSelector(selectPlatInfo);
@@ -77,6 +79,7 @@ var NodeItem = function NodeItem(props) {
77
79
  var flowStatus = useSelector(selectFlowStatus);
78
80
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
79
81
  var assistantMap = useSelector(selectNodeAssistantMap);
82
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
80
83
  var _Form$useForm = Form.useForm(),
81
84
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
82
85
  form = _Form$useForm2[0];
@@ -98,12 +101,12 @@ var NodeItem = function NodeItem(props) {
98
101
  manual: true,
99
102
  onSuccess: function () {
100
103
  var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
101
- var _currentNodeDetail$wo, _currentNodeDetail$no, currentNodeDetail, handlerList, assistants, assistantRes, _assistantRes$data;
104
+ var _currentNodeDetail$wo, _currentNodeDetail$no, _assistants$groupIds, currentNodeDetail, handlerList, assistants, userRes, assistantRes, _assistantRes$data;
102
105
  return _regeneratorRuntime().wrap(function _callee$(_context) {
103
106
  while (1) switch (_context.prev = _context.next) {
104
107
  case 0:
105
108
  if (!result.success) {
106
- _context.next = 17;
109
+ _context.next = 24;
107
110
  break;
108
111
  }
109
112
  setOpen(true);
@@ -112,20 +115,39 @@ var NodeItem = function NodeItem(props) {
112
115
  currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
113
116
  handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
114
117
  assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
118
+ 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)) {
119
+ _context.next = 13;
120
+ break;
121
+ }
122
+ _context.next = 9;
123
+ return queryUserGroupList({
124
+ groupUkList: (assistants === null || assistants === void 0 ? void 0 : assistants.groupIds) || []
125
+ });
126
+ case 9:
127
+ userRes = _context.sent;
128
+ if (userRes.success) {
129
+ dispatch({
130
+ type: 'setGroupUserList',
131
+ payload: _defineProperty({}, nodeId, userRes.data || [])
132
+ });
133
+ }
134
+ _context.next = 24;
135
+ break;
136
+ case 13:
115
137
  if (!(Array.isArray(handlerList) && handlerList.length &&
116
138
  // 有处理人
117
139
  !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理，查询能够处理的人
118
140
  )) {
119
- _context.next = 17;
141
+ _context.next = 24;
120
142
  break;
121
143
  }
122
- _context.prev = 7;
123
- _context.next = 10;
144
+ _context.prev = 14;
145
+ _context.next = 17;
124
146
  return queryMultiNodeAssistantInfo([{
125
147
  flowTemplateId: flowTemplateId,
126
148
  currentNodeId: nodeId
127
149
  }]);
128
- case 10:
150
+ case 17:
129
151
  assistantRes = _context.sent;
130
152
  if (assistantRes.success) {
131
153
  dispatch({
@@ -133,17 +155,17 @@ var NodeItem = function NodeItem(props) {
133
155
  payload: _defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
134
156
  });
135
157
  }
136
- _context.next = 17;
158
+ _context.next = 24;
137
159
  break;
138
- case 14:
139
- _context.prev = 14;
140
- _context.t0 = _context["catch"](7);
160
+ case 21:
161
+ _context.prev = 21;
162
+ _context.t0 = _context["catch"](14);
141
163
  console.error(_context.t0);
142
- case 17:
164
+ case 24:
143
165
  case "end":
144
166
  return _context.stop();
145
167
  }
146
- }, _callee, null, [[7, 14]]);
168
+ }, _callee, null, [[14, 21]]);
147
169
  }));
148
170
  function onSuccess(_x2) {
149
171
  return _onSuccess.apply(this, arguments);
@@ -239,15 +261,17 @@ var NodeItem = function NodeItem(props) {
239
261
 
240
262
  // 是否是当前节点处理人
241
263
  var isCurrentNodeHandler = useMemo(function () {
242
- 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$;
264
+ 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;
243
265
  return currentUserHasOperatorAuth({
266
+ isSuperAdmin: isSuperAdmin,
244
267
  // assistantList: data?.data?.nodeInfo?.id && assistantMap['FN00278209550851436544'] || [],
245
268
  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] || [],
269
+ 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] || [],
246
270
  currentUserKey: plat.userKey,
247
- 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) || [],
248
- 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,
249
- 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) || [],
250
- 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
271
+ 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) || [],
272
+ 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,
273
+ 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) || [],
274
+ 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
251
275
  });
252
276
  }, [data, plat.userKey, assistantMap]);
253
277
  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);
@@ -268,7 +292,7 @@ var NodeItem = function NodeItem(props) {
268
292
  // }
269
293
  // };
270
294
 
271
- 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) || []))),
295
+ 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) || []))),
272
296
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
273
297
  transData = _calcWorkOrderList2[0];
274
298
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
@@ -296,18 +320,18 @@ var NodeItem = function NodeItem(props) {
296
320
  display: open ? 'block' : 'none',
297
321
  marginTop: '16px'
298
322
  }
299
- }, [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, {
300
- 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),
323
+ }, [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, {
324
+ 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),
301
325
  plat: plat,
302
- templateDetail: data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo,
326
+ templateDetail: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : _data$data18.workOrderTemplateInfo,
303
327
  shopList: shopList,
304
- record: data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder,
328
+ record: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrder,
305
329
  accountName: plat.accountName,
306
330
  form: form,
307
331
  onOpenWangWang: onOpenWangWang,
308
332
  onJumpPage: onJumpPage,
309
333
  look: !editing || flowStatus === FlowStatus.STOPPING,
310
- 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,
334
+ 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,
311
335
  formProps: {
312
336
  className: 'customizeFormModalClassName',
313
337
  layout: 'vertical'
@@ -317,12 +341,12 @@ var NodeItem = function NodeItem(props) {
317
341
  firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
318
342
  // handleChangeTradeId={handleChangeTradeId}
319
343
  }) : /*#__PURE__*/React.createElement(RenderDetail, {
320
- workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
344
+ workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
321
345
  transData: transData,
322
346
  platform: plat.platform,
323
347
  onOpenWangWang: onOpenWangWang
324
348
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
325
- flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
349
+ flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData
326
350
  })));
327
351
  };
328
352
  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 } from "./store/selector";
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";
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$no25, _currentNodeDetail$no26, _currentNodeDetail$no27, _currentNodeDetail$no28;
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;
65
65
  var flowTemplateKey = props.flowTemplateKey,
66
66
  _props$shopList = props.shopList,
67
67
  shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -101,6 +101,7 @@ 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);
104
105
  var flowTemplateType = useSelector(selectFlowTemplateType);
105
106
  var follow = useSelector(selectFollow);
106
107
  var showShareButton = useSelector(selectShowShareButton);
@@ -1161,19 +1162,21 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1161
1162
  }
1162
1163
  }, [currentNodeDetail, autoSubmitFlag]);
1163
1164
  var isCurrentNodeHandler = useMemo(function () {
1164
- var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$wo27, _currentNodeDetail$no21, _currentNodeDetail$no22;
1165
+ var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$wo27, _currentNodeDetail$no23, _currentNodeDetail$no24;
1165
1166
  return currentUserHasOperatorAuth({
1167
+ isSuperAdmin: isSuperAdmin,
1166
1168
  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] || [],
1169
+ 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] || [],
1167
1170
  currentUserKey: plat.userKey,
1168
- 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) || [],
1169
- 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,
1171
+ 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) || [],
1172
+ 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,
1170
1173
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
1171
- 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
1174
+ 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
1172
1175
  });
1173
- }, [currentNodeDetail, plat, assistantMap]);
1176
+ }, [currentNodeDetail, plat, assistantMap, useGroupMap]);
1174
1177
  var defaultShopId = (_shopList$find = shopList.find(function (item) {
1175
- var _currentNodeDetail$no23, _currentNodeDetail$no24;
1176
- 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);
1178
+ var _currentNodeDetail$no25, _currentNodeDetail$no26;
1179
+ 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);
1177
1180
  })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
1178
1181
  var ReportOrderRender = function ReportOrderRender(props) {
1179
1182
  var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
@@ -1350,7 +1353,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1350
1353
  openCloseCallback: function openCloseCallback() {
1351
1354
  setOpenCloseVisible('');
1352
1355
  },
1353
- eventNodeType: flowRecord.eventNodeType
1356
+ eventNodeType: flowRecord.eventNodeType,
1357
+ isSuperAdmin: isSuperAdmin
1354
1358
  }));
1355
1359
  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
1356
1360
  ref: currentNodeRef,
@@ -1365,14 +1369,15 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1365
1369
  onJumpPage: onJumpPage,
1366
1370
  onReminder: handleReminder,
1367
1371
  queryRemarkList: queryRemarkList,
1368
- autoSubmit: autoSubmit
1372
+ autoSubmit: autoSubmit,
1373
+ isSuperAdmin: isSuperAdmin
1369
1374
  }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
1370
1375
  readonly: readonly,
1371
1376
  handleOpenRemarkList: handleOpenRemarkList,
1372
1377
  handleOpenAddRemark: handleOpenAddRemark
1373
1378
  }))), getTag({
1374
- nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.isAuto,
1375
- nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no26 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no26 === void 0 ? void 0 : _currentNodeDetail$no26.nodeType
1379
+ nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : _currentNodeDetail$no27.isAuto,
1380
+ nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no28 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.nodeType
1376
1381
  }) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler || ['true', 'created'].includes(privilege)) && !readonly && /*#__PURE__*/React.createElement("div", {
1377
1382
  className: "footer"
1378
1383
  }, /*#__PURE__*/React.createElement(ActionList, {
@@ -1401,7 +1406,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1401
1406
  shopList: shopList
1402
1407
  }), /*#__PURE__*/React.createElement(ForWardModal, {
1403
1408
  flowTemplateId: flowTemplateId,
1404
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : _currentNodeDetail$no27.id,
1409
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no29 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no29 === void 0 ? void 0 : _currentNodeDetail$no29.id,
1405
1410
  handleForWard: handleForWard
1406
1411
  }), /*#__PURE__*/React.createElement(StopModal, {
1407
1412
  handleStop: handleStop
@@ -1409,7 +1414,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1409
1414
  handleClose: handleClose
1410
1415
  }), /*#__PURE__*/React.createElement(RejectedModal, {
1411
1416
  flowTemplateId: flowTemplateId,
1412
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no28 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.id,
1417
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no30 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no30 === void 0 ? void 0 : _currentNodeDetail$no30.id,
1413
1418
  handleReturnWorkOrder: handleReturnWorkOrder
1414
1419
  }), /*#__PURE__*/React.createElement(RemarkModal, {
1415
1420
  handleSubmitRemark: handleSubmitRemark
package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts CHANGED
@@ -12,6 +12,9 @@ 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;
15
18
  export declare const setLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
16
19
  export declare const setOrderBackLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
17
20
  export declare const setOrderBackKmLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
@@ -57,6 +60,9 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
57
60
  assistantMap: {
58
61
  [nodeId: string]: Assistant[];
59
62
  };
63
+ userGroupMap: {
64
+ [nodeId: string]: string[];
65
+ };
60
66
  remarkList: Remark[];
61
67
  currentNode: CurrentNodeDetail;
62
68
  action: ActionType;
package/dist/esm/FlowTemplateDetailV2/store/reducers.js CHANGED
@@ -11,13 +11,14 @@ import { PlatForm, NodeType } from "../../model/flowTemplateDetail/types";
11
11
  import { last } from 'lodash';
12
12
  import { unstable_batchedUpdates } from 'react-dom';
13
13
  import { message } from 'antd';
14
- import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo, followOrUnFollow, queryShareNodeConfig, getH5SharePermission } from "../../model/flowTemplateDetail/api";
14
+ import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo, followOrUnFollow, queryShareNodeConfig, getH5SharePermission, queryUserGroupList } from "../../model/flowTemplateDetail/api";
15
15
  export var initState = {
16
16
  loading: false,
17
17
  orderBackLoading: false,
18
18
  orderBackKmLoading: false,
19
19
  flowList: [],
20
20
  assistantMap: {},
21
+ userGroupMap: {},
21
22
  remarkList: [],
22
23
  currentNode: {},
23
24
  action: undefined,
@@ -59,7 +60,7 @@ export var initState = {
59
60
  export var fetchPanelInfo = function fetchPanelInfo(params, options) {
60
61
  return /*#__PURE__*/function () {
61
62
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dispatch) {
62
- var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data16, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data17, _currentNodeDetail$no2, recordList, _recordList, currentNodeDetail, handlerList, assistants, _res$data18, _currentNodeDetail$no3, assistantRes, _assistantRes$data;
63
+ var res, _res$data, _res$data$flowRecordL, _res$data$flowRecordL2, _res$data2, _res$data2$currentNod, _res$data2$currentNod2, _last, _res$data16, _currentNodeDetail$wo, _currentNodeDetail$no, _res$data17, _currentNodeDetail$no2, _assistants$groupIds, _res$data18, _currentNodeDetail$no3, recordList, _recordList, currentNodeDetail, handlerList, assistants, userRes, _res$data19, _currentNodeDetail$no4, assistantRes, _assistantRes$data;
63
64
  return _regeneratorRuntime().wrap(function _callee$(_context) {
64
65
  while (1) switch (_context.prev = _context.next) {
65
66
  case 0:
@@ -73,7 +74,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
73
74
  case 4:
74
75
  res = _context.sent;
75
76
  if (!res.success) {
76
- _context.next = 19;
77
+ _context.next = 26;
77
78
  break;
78
79
  }
79
80
  recordList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$flowRecordL = _res$data.flowRecordList) === null || _res$data$flowRecordL === void 0 ? void 0 : (_res$data$flowRecordL2 = _res$data$flowRecordL.filter(function (t) {
@@ -157,19 +158,38 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
157
158
  currentNodeDetail = res === null || res === void 0 ? void 0 : (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.currentNodeDetail;
158
159
  handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
159
160
  assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
161
+ if (!(res !== null && res !== void 0 && (_res$data17 = res.data) !== null && _res$data17 !== void 0 && _res$data17.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id && (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)) {
162
+ _context.next = 19;
163
+ break;
164
+ }
165
+ _context.next = 15;
166
+ return queryUserGroupList({
167
+ groupUkList: (assistants === null || assistants === void 0 ? void 0 : assistants.groupIds) || []
168
+ });
169
+ case 15:
170
+ userRes = _context.sent;
171
+ if (userRes.success) {
172
+ dispatch({
173
+ type: 'setGroupUserList',
174
+ payload: _defineProperty({}, currentNodeDetail.nodeInfo.id, userRes.data || [])
175
+ });
176
+ }
177
+ _context.next = 24;
178
+ break;
179
+ case 19:
160
180
  if (!(Array.isArray(handlerList) && handlerList.length &&
161
181
  // 有处理人
162
182
  !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) && // 不是所有人都能处理，查询能够处理的人
163
- res !== null && res !== void 0 && (_res$data17 = res.data) !== null && _res$data17 !== void 0 && _res$data17.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no2 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no2 !== void 0 && _currentNodeDetail$no2.id)) {
164
- _context.next = 17;
183
+ res !== null && res !== void 0 && (_res$data18 = res.data) !== null && _res$data18 !== void 0 && _res$data18.flowTemplateId && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$no3 = currentNodeDetail.nodeInfo) !== null && _currentNodeDetail$no3 !== void 0 && _currentNodeDetail$no3.id)) {
184
+ _context.next = 24;
165
185
  break;
166
186
  }
167
- _context.next = 15;
187
+ _context.next = 22;
168
188
  return queryMultiNodeAssistantInfo([{
169
- flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data18 = res.data) === null || _res$data18 === void 0 ? void 0 : _res$data18.flowTemplateId,
170
- currentNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no3 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no3 === void 0 ? void 0 : _currentNodeDetail$no3.id
189
+ flowTemplateId: res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.flowTemplateId,
190
+ currentNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no4 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no4 === void 0 ? void 0 : _currentNodeDetail$no4.id
171
191
  }]);
172
- case 15:
192
+ case 22:
173
193
  assistantRes = _context.sent;
174
194
  if (assistantRes.success) {
175
195
  dispatch({
@@ -177,10 +197,10 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
177
197
  payload: _defineProperty({}, currentNodeDetail.nodeInfo.id, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
178
198
  });
179
199
  }
180
- case 17:
181
- _context.next = 20;
200
+ case 24:
201
+ _context.next = 27;
182
202
  break;
183
- case 19:
203
+ case 26:
184
204
  dispatch({
185
205
  type: 'setCurrentNode',
186
206
  payload: {
@@ -189,11 +209,11 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
189
209
  }
190
210
  }
191
211
  });
192
- case 20:
193
- _context.next = 26;
212
+ case 27:
213
+ _context.next = 33;
194
214
  break;
195
- case 22:
196
- _context.prev = 22;
215
+ case 29:
216
+ _context.prev = 29;
197
217
  _context.t0 = _context["catch"](0);
198
218
  console.error(_context.t0);
199
219
  dispatch({
@@ -204,18 +224,18 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
204
224
  }
205
225
  }
206
226
  });
207
- case 26:
208
- _context.prev = 26;
227
+ case 33:
228
+ _context.prev = 33;
209
229
  dispatch({
210
230
  type: 'setLoading',
211
231
  payload: false
212
232
  });
213
- return _context.finish(26);
214
- case 29:
233
+ return _context.finish(33);
234
+ case 36:
215
235
  case "end":
216
236
  return _context.stop();
217
237
  }
218
- }, _callee, null, [[0, 22, 26, 29]]);
238
+ }, _callee, null, [[0, 29, 33, 36]]);
219
239
  }));
220
240
  return function (_x) {
221
241
  return _ref.apply(this, arguments);
@@ -225,7 +245,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
225
245
  export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params) {
226
246
  return /*#__PURE__*/function () {
227
247
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dispatch) {
228
- var res, _res$data19, list;
248
+ var res, _res$data20, list;
229
249
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
230
250
  while (1) switch (_context2.prev = _context2.next) {
231
251
  case 0:
@@ -239,7 +259,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
239
259
  case 4:
240
260
  res = _context2.sent;
241
261
  if (res.success) {
242
- list = res === null || res === void 0 ? void 0 : (_res$data19 = res.data) === null || _res$data19 === void 0 ? void 0 : _res$data19.map(function (item) {
262
+ list = res === null || res === void 0 ? void 0 : (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.map(function (item) {
243
263
  return _objectSpread(_objectSpread({}, item), {}, {
244
264
  time: (item === null || item === void 0 ? void 0 : item.created) || '',
245
265
  operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
@@ -280,7 +300,7 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
280
300
  export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWorkOrder(params) {
281
301
  return /*#__PURE__*/function () {
282
302
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(dispatch) {
283
- var res, _res$data20, _res$data21, total, list;
303
+ var res, _res$data21, _res$data22, total, list;
284
304
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
285
305
  while (1) switch (_context3.prev = _context3.next) {
286
306
  case 0:
@@ -294,8 +314,8 @@ export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWo
294
314
  case 4:
295
315
  res = _context3.sent;
296
316
  if (res.success) {
297
- total = (res === null || res === void 0 ? void 0 : (_res$data20 = res.data) === null || _res$data20 === void 0 ? void 0 : _res$data20.total) || 0;
298
- list = (res === null || res === void 0 ? void 0 : (_res$data21 = res.data) === null || _res$data21 === void 0 ? void 0 : _res$data21.list) || [];
317
+ total = (res === null || res === void 0 ? void 0 : (_res$data21 = res.data) === null || _res$data21 === void 0 ? void 0 : _res$data21.total) || 0;
318
+ list = (res === null || res === void 0 ? void 0 : (_res$data22 = res.data) === null || _res$data22 === void 0 ? void 0 : _res$data22.list) || [];
299
319
  dispatch({
300
320
  type: 'setCurrentTradeIdWOrkOrderNumber',
301
321
  payload: {
@@ -455,127 +475,132 @@ export var setNodeAssistantInfo = function setNodeAssistantInfo(state, _ref7) {
455
475
  var payload = _ref7.payload;
456
476
  state.assistantMap = _objectSpread(_objectSpread({}, state.assistantMap), payload);
457
477
  };
458
- export var setLoading = function setLoading(state, _ref8) {
478
+ export var setGroupUserList = function setGroupUserList(state, _ref8) {
459
479
  var payload = _ref8.payload;
460
- state.loading = payload;
480
+ state.userGroupMap = _objectSpread(_objectSpread({}, state.userGroupMap), payload);
461
481
  };
462
- export var setOrderBackLoading = function setOrderBackLoading(state, _ref9) {
482
+ export var setLoading = function setLoading(state, _ref9) {
463
483
  var payload = _ref9.payload;
464
- state.orderBackLoading = payload;
484
+ state.loading = payload;
465
485
  };
466
- export var setOrderBackKmLoading = function setOrderBackKmLoading(state, _ref10) {
486
+ export var setOrderBackLoading = function setOrderBackLoading(state, _ref10) {
467
487
  var payload = _ref10.payload;
468
- state.orderBackKmLoading = payload;
488
+ state.orderBackLoading = payload;
469
489
  };
470
- export var setFlowList = function setFlowList(state, _ref11) {
490
+ export var setOrderBackKmLoading = function setOrderBackKmLoading(state, _ref11) {
471
491
  var payload = _ref11.payload;
472
- state.flowList = payload;
492
+ state.orderBackKmLoading = payload;
473
493
  };
474
- export var setTid = function setTid(state, _ref12) {
494
+ export var setFlowList = function setFlowList(state, _ref12) {
475
495
  var payload = _ref12.payload;
476
- state.tid = payload;
496
+ state.flowList = payload;
477
497
  };
478
- export var setShopUniqueKey = function setShopUniqueKey(state, _ref13) {
498
+ export var setTid = function setTid(state, _ref13) {
479
499
  var payload = _ref13.payload;
480
- state.shopUniqueKey = payload;
500
+ state.tid = payload;
481
501
  };
482
- export var setRemarkList = function setRemarkList(state, _ref14) {
502
+ export var setShopUniqueKey = function setShopUniqueKey(state, _ref14) {
483
503
  var payload = _ref14.payload;
484
- state.remarkList = payload;
504
+ state.shopUniqueKey = payload;
485
505
  };
486
- export var setCurrentNode = function setCurrentNode(state, _ref15) {
506
+ export var setRemarkList = function setRemarkList(state, _ref15) {
487
507
  var payload = _ref15.payload;
488
- state.currentNode = payload;
508
+ state.remarkList = payload;
489
509
  };
490
- export var setAction = function setAction(state, _ref16) {
510
+ export var setCurrentNode = function setCurrentNode(state, _ref16) {
491
511
  var payload = _ref16.payload;
492
- state.action = payload;
512
+ state.currentNode = payload;
493
513
  };
494
- export var setVisibleRemarkList = function setVisibleRemarkList(state, _ref17) {
514
+ export var setAction = function setAction(state, _ref17) {
495
515
  var payload = _ref17.payload;
496
- state.visibleRemarkList = payload;
516
+ state.action = payload;
497
517
  };
498
- export var setPlat = function setPlat(state, _ref18) {
518
+ export var setVisibleRemarkList = function setVisibleRemarkList(state, _ref18) {
499
519
  var payload = _ref18.payload;
500
- state.plat = payload;
520
+ state.visibleRemarkList = payload;
501
521
  };
502
- export var setOperateParams = function setOperateParams(state, _ref19) {
522
+ export var setPlat = function setPlat(state, _ref19) {
503
523
  var payload = _ref19.payload;
504
- state.operateParams = payload;
524
+ state.plat = payload;
505
525
  };
506
- export var setAddRemarkVisible = function setAddRemarkVisible(state, _ref20) {
526
+ export var setOperateParams = function setOperateParams(state, _ref20) {
507
527
  var payload = _ref20.payload;
508
- state.addRemarkVisible = payload;
528
+ state.operateParams = payload;
509
529
  };
510
- export var setFlowStatus = function setFlowStatus(state, _ref21) {
530
+ export var setAddRemarkVisible = function setAddRemarkVisible(state, _ref21) {
511
531
  var payload = _ref21.payload;
512
- state.flowStatus = payload;
532
+ state.addRemarkVisible = payload;
513
533
  };
514
- export var setFlowTemplateId = function setFlowTemplateId(state, _ref22) {
534
+ export var setFlowStatus = function setFlowStatus(state, _ref22) {
515
535
  var payload = _ref22.payload;
516
- state.flowTemplateId = payload;
536
+ state.flowStatus = payload;
517
537
  };
518
- export var setCurrentTradeIdWOrkOrderNumber = function setCurrentTradeIdWOrkOrderNumber(state, _ref23) {
538
+ export var setFlowTemplateId = function setFlowTemplateId(state, _ref23) {
519
539
  var payload = _ref23.payload;
520
- state.currentTradeIdLinkWorkOrder = payload;
540
+ state.flowTemplateId = payload;
521
541
  };
522
- export var setCurrentFlowAllShowHideRules = function setCurrentFlowAllShowHideRules(state, _ref24) {
542
+ export var setCurrentTradeIdWOrkOrderNumber = function setCurrentTradeIdWOrkOrderNumber(state, _ref24) {
523
543
  var payload = _ref24.payload;
524
- state.currentFlowAllShowHideRules = payload;
544
+ state.currentTradeIdLinkWorkOrder = payload;
525
545
  };
526
- export var setWithdrawWorkOrderDetail = function setWithdrawWorkOrderDetail(state, _ref25) {
546
+ export var setCurrentFlowAllShowHideRules = function setCurrentFlowAllShowHideRules(state, _ref25) {
527
547
  var payload = _ref25.payload;
548
+ state.currentFlowAllShowHideRules = payload;
549
+ };
550
+ export var setWithdrawWorkOrderDetail = function setWithdrawWorkOrderDetail(state, _ref26) {
551
+ var payload = _ref26.payload;
528
552
  state.withdrawWorkOrderDetail = payload;
529
553
  };
530
- export var setClearStore = function setClearStore(state, _ref26) {
554
+ export var setClearStore = function setClearStore(state, _ref27) {
531
555
  var _Object$keys;
532
- var payload = _ref26.payload;
556
+ var payload = _ref27.payload;
533
557
  (_Object$keys = Object.keys(initState)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (key) {
534
558
  // @ts-ignore
535
559
  state[key] = initState[key];
536
560
  });
537
561
  };
538
- export var setFlowTemplateType = function setFlowTemplateType(state, _ref27) {
539
- var payload = _ref27.payload;
562
+ export var setFlowTemplateType = function setFlowTemplateType(state, _ref28) {
563
+ var payload = _ref28.payload;
540
564
  state.flowTemplateType = payload;
541
565
  };
542
- export var setLabelList = function setLabelList(state, _ref28) {
543
- var payload = _ref28.payload;
566
+ export var setLabelList = function setLabelList(state, _ref29) {
567
+ var payload = _ref29.payload;
544
568
  state.labelList = payload;
545
569
  };
546
570
  export var clearLabelList = function clearLabelList(state) {
547
571
  state.labelList = [];
548
572
  };
549
- export var setRejectLoading = function setRejectLoading(state, _ref29) {
550
- var payload = _ref29.payload;
573
+ export var setRejectLoading = function setRejectLoading(state, _ref30) {
574
+ var payload = _ref30.payload;
551
575
  state.rejectLoading = payload;
552
576
  };
553
- export var setWithDrawLoading = function setWithDrawLoading(state, _ref30) {
554
- var payload = _ref30.payload;
577
+ export var setWithDrawLoading = function setWithDrawLoading(state, _ref31) {
578
+ var payload = _ref31.payload;
555
579
  state.withdrawLoading = payload;
556
580
  };
557
- export var setFollow = function setFollow(state, _ref31) {
558
- var payload = _ref31.payload;
581
+ export var setFollow = function setFollow(state, _ref32) {
582
+ var payload = _ref32.payload;
559
583
  state.follow = payload;
560
584
  };
561
- export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref32) {
562
- var payload = _ref32.payload;
585
+ export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref33) {
586
+ var payload = _ref33.payload;
563
587
  state.autoSubmitFlag = payload;
564
588
  };
565
- export var setPrivilege = function setPrivilege(state, _ref33) {
566
- var payload = _ref33.payload;
589
+ export var setPrivilege = function setPrivilege(state, _ref34) {
590
+ var payload = _ref34.payload;
567
591
  state.privilege = payload;
568
592
  };
569
- export var setShowShareButton = function setShowShareButton(state, _ref34) {
570
- var payload = _ref34.payload;
593
+ export var setShowShareButton = function setShowShareButton(state, _ref35) {
594
+ var payload = _ref35.payload;
571
595
  state.showShareButton = payload;
572
596
  };
573
- export var setH5SharePermission = function setH5SharePermission(state, _ref35) {
574
- var payload = _ref35.payload;
597
+ export var setH5SharePermission = function setH5SharePermission(state, _ref36) {
598
+ var payload = _ref36.payload;
575
599
  state.hasH5SharePermission = payload;
576
600
  };
577
601
  var reducerMap = {
578
602
  setNodeAssistantInfo: setNodeAssistantInfo,
603
+ setGroupUserList: setGroupUserList,
579
604
  setLoading: setLoading,
580
605
  setOrderBackLoading: setOrderBackLoading,
581
606
  setOrderBackKmLoading: setOrderBackKmLoading,
package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts CHANGED
@@ -3,6 +3,9 @@ export declare const selectFlowRecordList: (state: FlowTemplateDetailState) => i
3
3
  export declare const selectNodeAssistantMap: (state: FlowTemplateDetailState) => {
4
4
  [nodeId: string]: import("../../model/flowTemplateDetail/types").Assistant[];
5
5
  };
6
+ export declare const selectNodeUserGroupMap: (state: FlowTemplateDetailState) => {
7
+ [nodeId: string]: string[];
8
+ };
6
9
  export declare const selectRemarkRecordList: (state: FlowTemplateDetailState) => import("../../model/flowTemplateDetail/types").Remark[];
7
10
  export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) => {
8
11
  nodeInfo?: {
package/dist/esm/FlowTemplateDetailV2/store/selector.js CHANGED
@@ -4,6 +4,9 @@ export var selectFlowRecordList = function selectFlowRecordList(state) {
4
4
  export var selectNodeAssistantMap = function selectNodeAssistantMap(state) {
5
5
  return state.assistantMap || {};
6
6
  };
7
+ export var selectNodeUserGroupMap = function selectNodeUserGroupMap(state) {
8
+ return state.userGroupMap || {};
9
+ };
7
10
  export var selectRemarkRecordList = function selectRemarkRecordList(state) {
8
11
  return state.remarkList;
9
12
  };
package/dist/esm/WorkOrder/components/WorkOrderList/index.js CHANGED
@@ -178,6 +178,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
178
178
  var bindERP = useAppSelector(function (state) {
179
179
  return state.workOrder.userInfo.bindERP;
180
180
  });
181
+ var hasBindWdt = useAppSelector(function (state) {
182
+ var _JSON$parse, _JSON$parse$plugins, _JSON$parse$plugins$w;
183
+ return ((_JSON$parse = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$plugins = _JSON$parse.plugins) === null || _JSON$parse$plugins === void 0 ? void 0 : (_JSON$parse$plugins$w = _JSON$parse$plugins.wdt) === null || _JSON$parse$plugins$w === void 0 ? void 0 : _JSON$parse$plugins$w.show) || false;
184
+ });
181
185
  var hasSuperAdminRole = useAppSelector(function (state) {
182
186
  return state.workOrder.userInfo.hasSuperAdminRole;
183
187
  });
@@ -606,7 +610,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
606
610
  shopId: shopId,
607
611
  userKey: userKey,
608
612
  companyKey: companyKey,
609
- bindERP: bindERP,
613
+ bindERP: bindERP || hasBindWdt,
610
614
  hasSuperAdminRole: hasSuperAdminRole
611
615
  },
612
616
  callbackDealWorkOrderSuccess: onDealWorkOrderSuccess,
package/dist/esm/model/flowTemplateDetail/api.d.ts CHANGED
@@ -40,6 +40,9 @@ export declare const queryMultiNodeAssistantInfo: (data: {
40
40
  name: string;
41
41
  }>;
42
42
  }>>;
43
+ export declare const queryUserGroupList: (data: {
44
+ groupUkList: string[];
45
+ }) => Promise<serverProps<Array<string>>>;
43
46
  export declare const forwardWorkOrder: (data: any) => Promise<serverProps<{
44
47
  failList: Array<{
45
48
  failReason: string;
package/dist/esm/model/flowTemplateDetail/api.js CHANGED
@@ -106,6 +106,13 @@ export var queryMultiNodeAssistantInfo = function queryMultiNodeAssistantInfo(da
106
106
  data: data
107
107
  });
108
108
  };
109
+ export var queryUserGroupList = function queryUserGroupList(data) {
110
+ return request({
111
+ url: '/qy/user/group/listBelongTheSameGroupUserKeys',
112
+ method: 'post',
113
+ data: data
114
+ });
115
+ };
109
116
 
110
117
  // 转交
111
118
  export var forwardWorkOrder = function forwardWorkOrder(data) {
package/dist/esm/model/flowTemplateDetail/types.d.ts CHANGED
@@ -42,6 +42,9 @@ export interface FlowTemplateDetailState {
42
42
  assistantMap: {
43
43
  [nodeId: string]: Array<Assistant>;
44
44
  };
45
+ userGroupMap: {
46
+ [nodeId: string]: Array<string>;
47
+ };
45
48
  remarkList: Array<Remark>;
46
49
  currentNode: CurrentNodeDetail;
47
50
  action: ActionType;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.2.26",
3
+ "version": "2.2.27",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.2.26",
36
- "@kmkf-fe-packages/kmkf-utils": "2.2.26",
37
- "@kmkf-fe-packages/services-components": "2.2.26",
35
+ "@kmkf-fe-packages/basic-components": "2.2.27",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.2.27",
37
+ "@kmkf-fe-packages/services-components": "2.2.27",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
74
74
  "publishConfig": {
75
75
  "access": "public"
76
76
  },
77
- "gitHead": "786169beb384512f2dd49ceb5ecee234058f4434",
77
+ "gitHead": "58f53f4ddc7e22b5d5437bcb14d2d0f211bd6954",
78
78
  "gitHooks": {
79
79
  "pre-commit": "lint-staged"
80
80
  }