@kmkf-fe-packages/kmkf-work-order-service-component 2.2.18 → 2.2.20-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/FlowTemplateDetailV2/common.d.ts +3 -2
- package/dist/esm/FlowTemplateDetailV2/common.js +14 -4
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +22 -20
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +49 -28
- package/dist/esm/FlowTemplateDetailV2/index.js +15 -13
- package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +6 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +106 -81
- package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
- package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
- package/dist/esm/common/utils/xzSDK.js +3 -1
- package/dist/esm/model/flowTemplateDetail/api.d.ts +3 -0
- package/dist/esm/model/flowTemplateDetail/api.js +7 -0
- package/dist/esm/model/flowTemplateDetail/types.d.ts +3 -0
- package/dist/esm/model/logicFlow/selector.d.ts +3 -0
- package/dist/esm/model/paymentWorkOrder/selector.d.ts +9 -0
- package/dist/esm/model/singleShopWorkOrder/selector.d.ts +5 -0
- package/package.json +5 -5
- package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +0 -52
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js +0 -180
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +0 -186
- package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +0 -899
- package/dist/esm/common/utils/dist/tools.js +0 -1326
- package/dist/esm/common/utils/dist/transformWorkOrderData.js +0 -965
- package/dist/esm/model/customizeWorkOrder/dist/api.js +0 -48
- package/dist/esm/model/customizeWorkOrder/dist/index.js +0 -370
- package/dist/esm/model/customizeWorkOrder/dist/selector.js +0 -63
- package/dist/esm/model/customizeWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/dist/global.js +0 -44
- package/dist/esm/model/dist/hooks.js +0 -15
- package/dist/esm/model/dist/login.js +0 -245
- package/dist/esm/model/dist/store.js +0 -30
- package/dist/esm/model/dist/userData.js +0 -41
- package/dist/esm/model/dist/workOrder.js +0 -329
- package/dist/esm/model/flowTemplateDetail/dist/api.js +0 -192
- package/dist/esm/model/flowTemplateDetail/dist/types.js +0 -48
- package/dist/esm/model/logicFlow/dist/api.js +0 -14
- package/dist/esm/model/logicFlow/dist/index.js +0 -235
- package/dist/esm/model/logicFlow/dist/selector.js +0 -18
- package/dist/esm/model/logicFlow/dist/types.js +0 -3
- package/dist/esm/model/paymentWorkOrder/dist/index.js +0 -77
- package/dist/esm/model/paymentWorkOrder/dist/selector.js +0 -36
- package/dist/esm/model/paymentWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/servers/dist/api.js +0 -545
- package/dist/esm/model/servers/dist/request.js +0 -63
- package/dist/esm/model/singleShopWorkOrder/dist/index.js +0 -216
- package/dist/esm/model/singleShopWorkOrder/dist/selector.js +0 -24
- package/dist/esm/model/singleShopWorkOrder/dist/types.js +0 -3
- package/dist/esm/model/types/dist/login.js +0 -3
- package/dist/esm/model/types/dist/singleWorkOrder.js +0 -3
- package/dist/esm/model/types/dist/workOrder.js +0 -3
|
@@ -18,13 +18,14 @@ 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: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList, }: {
|
|
22
22
|
currentUserKey: string;
|
|
23
23
|
staffIds: Array<string>;
|
|
24
|
-
operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL';
|
|
24
|
+
operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL' | 'ONLY_THE_SAME_USER_GROUP';
|
|
25
25
|
handlerList: Array<{
|
|
26
26
|
userKey: string;
|
|
27
27
|
}>;
|
|
28
28
|
isAllStaff: boolean;
|
|
29
29
|
assistantList: Array<Assistant>;
|
|
30
|
+
userGroupList: Array<string>;
|
|
30
31
|
}) => boolean;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { NodeType } from "../model/flowTemplateDetail/types";
|
|
2
|
+
import { intersection } from 'lodash';
|
|
2
3
|
export var getTag = function getTag(item) {
|
|
3
4
|
var tag = 'artificial'; // 人工节点
|
|
4
5
|
// 先判断是什么节点类型 步骤/判断
|
|
@@ -63,16 +64,17 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
|
|
|
63
64
|
operateDataPermission = _ref.operateDataPermission,
|
|
64
65
|
handlerList = _ref.handlerList,
|
|
65
66
|
isAllStaff = _ref.isAllStaff,
|
|
66
|
-
assistantList = _ref.assistantList
|
|
67
|
-
|
|
68
|
-
|
|
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);
|
|
69
71
|
// handlerList为空数组是没有处理人,都可以处理
|
|
70
72
|
if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
|
|
71
73
|
return true;
|
|
72
74
|
}
|
|
73
75
|
|
|
74
76
|
// 可以处理所有任务
|
|
75
|
-
if (
|
|
77
|
+
if (operateDataPermission === 'HANDLE_ALL') {
|
|
76
78
|
// 判断是否是预备客服
|
|
77
79
|
return isAllStaff || ( // 全部
|
|
78
80
|
staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
|
|
@@ -82,6 +84,14 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
|
|
|
82
84
|
}) // 人在groups中
|
|
83
85
|
;
|
|
84
86
|
}
|
|
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;
|
|
94
|
+
}
|
|
85
95
|
|
|
86
96
|
// 只能处理分配到自己的任务
|
|
87
97
|
// 判断处理人是否是自己
|
|
@@ -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 } from "../../store/selector";
|
|
33
|
+
import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } 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$
|
|
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;
|
|
44
44
|
var formRenderRef = useRef(null);
|
|
45
45
|
useImperativeHandle(ref, function () {
|
|
46
46
|
return {
|
|
@@ -87,6 +87,7 @@ 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);
|
|
90
91
|
var tradeKey = useMemo(function () {
|
|
91
92
|
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
|
|
92
93
|
var tradeConfig = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo === void 0 ? void 0 : (_currentNodeDetail$wo2 = _currentNodeDetail$wo.componentDtoList) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.find(function (item) {
|
|
@@ -101,20 +102,21 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
101
102
|
|
|
102
103
|
// 是否是当前节点处理人
|
|
103
104
|
var isCurrentNodeHandler = useMemo(function () {
|
|
104
|
-
var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$
|
|
105
|
+
var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
|
|
105
106
|
return currentUserHasOperatorAuth({
|
|
106
107
|
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] || [],
|
|
107
109
|
currentUserKey: plat.userKey,
|
|
108
|
-
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
109
|
-
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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,
|
|
110
112
|
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
|
|
111
|
-
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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
|
|
112
114
|
});
|
|
113
115
|
}, [currentNodeDetail, plat.userKey, assistantMap]);
|
|
114
116
|
var handleChangeTradeId = useMemoizedFn(function (tid) {
|
|
115
|
-
var _currentNodeDetail$
|
|
117
|
+
var _currentNodeDetail$no15;
|
|
116
118
|
// 非开始节点不进行订单重复校验逻辑
|
|
117
|
-
if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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) {
|
|
118
120
|
return;
|
|
119
121
|
}
|
|
120
122
|
if (!tid) {
|
|
@@ -127,10 +129,10 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
127
129
|
}
|
|
128
130
|
});
|
|
129
131
|
} else {
|
|
130
|
-
var _currentNodeDetail$
|
|
132
|
+
var _currentNodeDetail$no16;
|
|
131
133
|
// 查询当前订单号有多少的重复
|
|
132
134
|
var params = {
|
|
133
|
-
flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
135
|
+
flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
|
|
134
136
|
flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
|
|
135
137
|
desensitizedFlag: false,
|
|
136
138
|
pageNo: 1,
|
|
@@ -150,11 +152,11 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
150
152
|
});
|
|
151
153
|
// 当前节点是开始节点、并且携带订单号时,此时会进行订单重复提醒
|
|
152
154
|
useEffect(function () {
|
|
153
|
-
var _currentNodeDetail$
|
|
154
|
-
if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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) {
|
|
155
157
|
handleChangeTradeId(plat.orderNo);
|
|
156
158
|
}
|
|
157
|
-
}, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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]);
|
|
158
160
|
var transData = useMemo(function () {
|
|
159
161
|
if (flowStatus === FlowStatus.COMPLETED) {
|
|
160
162
|
var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
|
|
@@ -165,11 +167,11 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
165
167
|
}
|
|
166
168
|
}, [flowStatus, currentNodeDetail]);
|
|
167
169
|
var handleWithdraw = function handleWithdraw() {
|
|
168
|
-
var _currentNodeDetail$
|
|
170
|
+
var _currentNodeDetail$no19;
|
|
169
171
|
dispatch({
|
|
170
172
|
type: 'setWithdrawWorkOrderDetail',
|
|
171
173
|
payload: {
|
|
172
|
-
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
174
|
+
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
|
|
173
175
|
}
|
|
174
176
|
});
|
|
175
177
|
dispatch({
|
|
@@ -237,7 +239,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
237
239
|
}();
|
|
238
240
|
var handleRestartAutoTask = /*#__PURE__*/function () {
|
|
239
241
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
240
|
-
var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$
|
|
242
|
+
var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
|
|
241
243
|
var _yield$restartAutoTas, success, _controllerRef$curren2;
|
|
242
244
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
243
245
|
while (1) switch (_context2.prev = _context2.next) {
|
|
@@ -249,7 +251,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
249
251
|
flowWorkOrderId: flowWorkOrderId,
|
|
250
252
|
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
|
|
251
253
|
workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
|
|
252
|
-
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
254
|
+
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
|
|
253
255
|
})
|
|
254
256
|
});
|
|
255
257
|
case 2:
|
|
@@ -303,17 +305,17 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
303
305
|
handleRestartAutoTask: handleRestartAutoTask,
|
|
304
306
|
flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
|
|
305
307
|
flowWorkOrderId: flowWorkOrderId || '',
|
|
306
|
-
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
308
|
+
nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
|
|
307
309
|
}), /*#__PURE__*/React.createElement("div", {
|
|
308
310
|
className: styles.formRenderContainer
|
|
309
|
-
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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, {
|
|
310
312
|
workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
311
313
|
transData: transData,
|
|
312
314
|
platform: plat.platform,
|
|
313
315
|
onOpenWangWang: onOpenWangWang
|
|
314
316
|
}) : /*#__PURE__*/React.createElement(FormRender, {
|
|
315
317
|
ref: formRenderRef,
|
|
316
|
-
isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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),
|
|
317
319
|
plat: plat,
|
|
318
320
|
templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
319
321
|
shopList: shopList,
|
|
@@ -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 } from "../../../model/flowTemplateDetail/api";
|
|
28
|
-
import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams } from "../../store/selector";
|
|
27
|
+
import { queryNodeDetail, queryMultiNodeAssistantInfo, queryUserGroupList } from "../../../model/flowTemplateDetail/api";
|
|
28
|
+
import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams, selectNodeUserGroupMap } 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$
|
|
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;
|
|
38
38
|
var tag = props.tag,
|
|
39
39
|
nodeId = props.nodeId,
|
|
40
40
|
nodeName = props.nodeName,
|
|
@@ -75,6 +75,7 @@ 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);
|
|
78
79
|
var _Form$useForm = Form.useForm(),
|
|
79
80
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
80
81
|
form = _Form$useForm2[0];
|
|
@@ -96,12 +97,12 @@ var NodeItem = function NodeItem(props) {
|
|
|
96
97
|
manual: true,
|
|
97
98
|
onSuccess: function () {
|
|
98
99
|
var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
|
|
99
|
-
var _currentNodeDetail$wo, _currentNodeDetail$no, currentNodeDetail, handlerList, assistants, assistantRes, _assistantRes$data;
|
|
100
|
+
var _currentNodeDetail$wo, _currentNodeDetail$no, _assistants$groupIds, currentNodeDetail, handlerList, assistants, userRes, assistantRes, _assistantRes$data;
|
|
100
101
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
101
102
|
while (1) switch (_context.prev = _context.next) {
|
|
102
103
|
case 0:
|
|
103
104
|
if (!result.success) {
|
|
104
|
-
_context.next =
|
|
105
|
+
_context.next = 24;
|
|
105
106
|
break;
|
|
106
107
|
}
|
|
107
108
|
setOpen(true);
|
|
@@ -110,20 +111,39 @@ var NodeItem = function NodeItem(props) {
|
|
|
110
111
|
currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
|
|
111
112
|
handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
|
|
112
113
|
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:
|
|
113
133
|
if (!(Array.isArray(handlerList) && handlerList.length &&
|
|
114
134
|
// 有处理人
|
|
115
135
|
!(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理,查询能够处理的人
|
|
116
136
|
)) {
|
|
117
|
-
_context.next =
|
|
137
|
+
_context.next = 24;
|
|
118
138
|
break;
|
|
119
139
|
}
|
|
120
|
-
_context.prev =
|
|
121
|
-
_context.next =
|
|
140
|
+
_context.prev = 14;
|
|
141
|
+
_context.next = 17;
|
|
122
142
|
return queryMultiNodeAssistantInfo([{
|
|
123
143
|
flowTemplateId: flowTemplateId,
|
|
124
144
|
currentNodeId: nodeId
|
|
125
145
|
}]);
|
|
126
|
-
case
|
|
146
|
+
case 17:
|
|
127
147
|
assistantRes = _context.sent;
|
|
128
148
|
if (assistantRes.success) {
|
|
129
149
|
dispatch({
|
|
@@ -131,17 +151,17 @@ var NodeItem = function NodeItem(props) {
|
|
|
131
151
|
payload: _defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
|
|
132
152
|
});
|
|
133
153
|
}
|
|
134
|
-
_context.next =
|
|
154
|
+
_context.next = 24;
|
|
135
155
|
break;
|
|
136
|
-
case
|
|
137
|
-
_context.prev =
|
|
138
|
-
_context.t0 = _context["catch"](
|
|
156
|
+
case 21:
|
|
157
|
+
_context.prev = 21;
|
|
158
|
+
_context.t0 = _context["catch"](14);
|
|
139
159
|
console.error(_context.t0);
|
|
140
|
-
case
|
|
160
|
+
case 24:
|
|
141
161
|
case "end":
|
|
142
162
|
return _context.stop();
|
|
143
163
|
}
|
|
144
|
-
}, _callee, null, [[
|
|
164
|
+
}, _callee, null, [[14, 21]]);
|
|
145
165
|
}));
|
|
146
166
|
function onSuccess(_x2) {
|
|
147
167
|
return _onSuccess.apply(this, arguments);
|
|
@@ -229,15 +249,16 @@ var NodeItem = function NodeItem(props) {
|
|
|
229
249
|
|
|
230
250
|
// 是否是当前节点处理人
|
|
231
251
|
var isCurrentNodeHandler = useMemo(function () {
|
|
232
|
-
var _data$data4, _data$data4$nodeInfo, _data$data5, _data$data5$nodeInfo, _data$data6, _data$data6$nodeInfo, _data$
|
|
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;
|
|
233
253
|
return currentUserHasOperatorAuth({
|
|
234
254
|
// assistantList: data?.data?.nodeInfo?.id && assistantMap['FN00278209550851436544'] || [],
|
|
235
255
|
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] || [],
|
|
236
257
|
currentUserKey: plat.userKey,
|
|
237
|
-
staffIds: (data === null || data === void 0 ? void 0 : (_data$
|
|
238
|
-
operateDataPermission: data === null || data === void 0 ? void 0 : (_data$
|
|
239
|
-
handlerList: (data === null || data === void 0 ? void 0 : (_data$
|
|
240
|
-
isAllStaff: data === null || data === void 0 ? void 0 : (_data$
|
|
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
|
|
241
262
|
});
|
|
242
263
|
}, [data, plat.userKey, assistantMap]);
|
|
243
264
|
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);
|
|
@@ -258,7 +279,7 @@ var NodeItem = function NodeItem(props) {
|
|
|
258
279
|
// }
|
|
259
280
|
// };
|
|
260
281
|
|
|
261
|
-
var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$
|
|
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) || []))),
|
|
262
283
|
_calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
|
|
263
284
|
transData = _calcWorkOrderList2[0];
|
|
264
285
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
|
|
@@ -286,18 +307,18 @@ var NodeItem = function NodeItem(props) {
|
|
|
286
307
|
display: open ? 'block' : 'none',
|
|
287
308
|
marginTop: '16px'
|
|
288
309
|
}
|
|
289
|
-
}, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$
|
|
290
|
-
isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$
|
|
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),
|
|
291
312
|
plat: plat,
|
|
292
|
-
templateDetail: data === null || data === void 0 ? void 0 : (_data$
|
|
313
|
+
templateDetail: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : _data$data18.workOrderTemplateInfo,
|
|
293
314
|
shopList: shopList,
|
|
294
|
-
record: data === null || data === void 0 ? void 0 : (_data$
|
|
315
|
+
record: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrder,
|
|
295
316
|
accountName: plat.accountName,
|
|
296
317
|
form: form,
|
|
297
318
|
onOpenWangWang: onOpenWangWang,
|
|
298
319
|
onJumpPage: onJumpPage,
|
|
299
320
|
look: !editing || flowStatus === FlowStatus.STOPPING,
|
|
300
|
-
shopId: data === null || data === void 0 ? void 0 : (_data$
|
|
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,
|
|
301
322
|
formProps: {
|
|
302
323
|
className: 'customizeFormModalClassName',
|
|
303
324
|
layout: 'vertical'
|
|
@@ -307,12 +328,12 @@ var NodeItem = function NodeItem(props) {
|
|
|
307
328
|
firstOrderBackfill: false // TODO: 前面节点必然是已完成状态,已完成状态不再调用订单反填
|
|
308
329
|
// handleChangeTradeId={handleChangeTradeId}
|
|
309
330
|
}) : /*#__PURE__*/React.createElement(RenderDetail, {
|
|
310
|
-
workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$
|
|
331
|
+
workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
|
|
311
332
|
transData: transData,
|
|
312
333
|
platform: plat.platform,
|
|
313
334
|
onOpenWangWang: onOpenWangWang
|
|
314
335
|
})), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
|
|
315
|
-
flowEventData: data === null || data === void 0 ? void 0 : (_data$
|
|
336
|
+
flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData
|
|
316
337
|
})));
|
|
317
338
|
};
|
|
318
339
|
export default NodeItem;
|
|
@@ -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$
|
|
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);
|
|
@@ -1157,19 +1158,20 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1157
1158
|
}
|
|
1158
1159
|
}, [currentNodeDetail, autoSubmitFlag]);
|
|
1159
1160
|
var isCurrentNodeHandler = useMemo(function () {
|
|
1160
|
-
var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$wo27, _currentNodeDetail$
|
|
1161
|
+
var _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$wo27, _currentNodeDetail$no23, _currentNodeDetail$no24;
|
|
1161
1162
|
return currentUserHasOperatorAuth({
|
|
1162
1163
|
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] || [],
|
|
1163
1165
|
currentUserKey: plat.userKey,
|
|
1164
|
-
staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1165
|
-
operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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,
|
|
1166
1168
|
handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
|
|
1167
|
-
isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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
|
|
1168
1170
|
});
|
|
1169
|
-
}, [currentNodeDetail, plat, assistantMap]);
|
|
1171
|
+
}, [currentNodeDetail, plat, assistantMap, useGroupMap]);
|
|
1170
1172
|
var defaultShopId = (_shopList$find = shopList.find(function (item) {
|
|
1171
|
-
var _currentNodeDetail$
|
|
1172
|
-
return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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);
|
|
1173
1175
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
|
|
1174
1176
|
var ReportOrderRender = function ReportOrderRender(props) {
|
|
1175
1177
|
var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
|
|
@@ -1366,8 +1368,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1366
1368
|
handleOpenRemarkList: handleOpenRemarkList,
|
|
1367
1369
|
handleOpenAddRemark: handleOpenAddRemark
|
|
1368
1370
|
}))), getTag({
|
|
1369
|
-
nodeIsAuto: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1370
|
-
nodeType: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
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
|
|
1371
1373
|
}) === 'artificial' && (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder) || isCurrentNodeHandler || ['true', 'created'].includes(privilege)) && !readonly && /*#__PURE__*/React.createElement("div", {
|
|
1372
1374
|
className: "footer"
|
|
1373
1375
|
}, /*#__PURE__*/React.createElement(ActionList, {
|
|
@@ -1395,7 +1397,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1395
1397
|
plat: plat
|
|
1396
1398
|
}), /*#__PURE__*/React.createElement(ForWardModal, {
|
|
1397
1399
|
flowTemplateId: flowTemplateId,
|
|
1398
|
-
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1400
|
+
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no29 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no29 === void 0 ? void 0 : _currentNodeDetail$no29.id,
|
|
1399
1401
|
handleForWard: handleForWard
|
|
1400
1402
|
}), /*#__PURE__*/React.createElement(StopModal, {
|
|
1401
1403
|
handleStop: handleStop
|
|
@@ -1403,7 +1405,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1403
1405
|
handleClose: handleClose
|
|
1404
1406
|
}), /*#__PURE__*/React.createElement(RejectedModal, {
|
|
1405
1407
|
flowTemplateId: flowTemplateId,
|
|
1406
|
-
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
1408
|
+
nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no30 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no30 === void 0 ? void 0 : _currentNodeDetail$no30.id,
|
|
1407
1409
|
handleReturnWorkOrder: handleReturnWorkOrder
|
|
1408
1410
|
}), /*#__PURE__*/React.createElement(RemarkModal, {
|
|
1409
1411
|
handleSubmitRemark: handleSubmitRemark
|
|
@@ -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;
|