@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.7 → 2.2.13-beta.71

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 (63) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.d.ts +3 -2
  2. package/dist/esm/FlowTemplateDetailV2/common.js +15 -4
  3. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +28 -21
  4. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
  5. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +31 -9
  6. package/dist/esm/FlowTemplateDetailV2/components/FormRender/skxOrderBack.js +1 -1
  7. package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +1 -0
  8. package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +61 -30
  9. package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.d.ts +1 -0
  10. package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.js +19 -11
  11. package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js +13 -9
  12. package/dist/esm/FlowTemplateDetailV2/index.js +22 -14
  13. package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +8 -2
  14. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +113 -88
  15. package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
  16. package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
  17. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.d.ts +3 -1
  18. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.js +15 -4
  19. package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.less +18 -7
  20. package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts +1 -1
  21. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +80 -22
  22. package/dist/esm/common/utils/constant.js +8 -1
  23. package/dist/esm/common/utils/submitDataTransOldFormat.js +3 -1
  24. package/dist/esm/common/utils/tools.d.ts +1 -1
  25. package/dist/esm/common/utils/tools.js +171 -133
  26. package/dist/esm/common/utils/tools_constants.js +1 -1
  27. package/dist/esm/common/utils/transformWorkOrderData.js +33 -4
  28. package/dist/esm/common/utils/xzSDK.js +3 -1
  29. package/dist/esm/model/flowTemplateDetail/api.d.ts +3 -0
  30. package/dist/esm/model/flowTemplateDetail/api.js +7 -0
  31. package/dist/esm/model/flowTemplateDetail/types.d.ts +4 -1
  32. package/dist/esm/model/logicFlow/selector.d.ts +3 -0
  33. package/dist/esm/model/paymentWorkOrder/selector.d.ts +9 -0
  34. package/dist/esm/model/servers/api.d.ts +1 -0
  35. package/dist/esm/model/servers/api.js +13 -0
  36. package/dist/esm/model/singleShopWorkOrder/selector.d.ts +5 -0
  37. package/package.json +5 -5
  38. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.d.ts +0 -5
  39. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.js +0 -58
  40. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.d.ts +0 -4
  41. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +0 -297
  42. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less +0 -137
  43. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.d.ts +0 -5
  44. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.js +0 -95
  45. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.d.ts +0 -5
  46. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.js +0 -71
  47. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.d.ts +0 -12
  48. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.js +0 -22
  49. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.less +0 -20
  50. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.d.ts +0 -7
  51. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.js +0 -96
  52. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.less +0 -7
  53. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +0 -4
  54. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.js +0 -139
  55. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +0 -34
  56. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.d.ts +0 -5
  57. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.js +0 -157
  58. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.d.ts +0 -11
  59. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.js +0 -19
  60. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.less +0 -17
  61. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.d.ts +0 -8
  62. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +0 -454
  63. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less +0 -284
package/dist/esm/FlowTemplateDetailV2/common.d.ts CHANGED
@@ -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;
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
  // 先判断是什么节点类型 步骤/判断
@@ -63,16 +64,16 @@ 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
- var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
67
+ assistantList = _ref.assistantList,
68
+ _ref$userGroupList = _ref.userGroupList,
69
+ userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
69
70
  // handlerList为空数组是没有处理人，都可以处理
70
71
  if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
71
72
  return true;
72
73
  }
73
74
 
74
75
  // 可以处理所有任务
75
- if (groupCanOperate) {
76
+ if (operateDataPermission === 'HANDLE_ALL') {
76
77
  // 判断是否是预备客服
77
78
  return isAllStaff || ( // 全部
78
79
  staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -82,6 +83,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
82
83
  }) // 人在groups中
83
84
  ;
84
85
  }
86
+ //仅可处理同用户组的工单
87
+ if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
88
+ //判断组用户中是否包含处理人 || 判断处理人是否是自己
89
+ var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
90
+ return item.userKey;
91
+ });
92
+ return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
93
+ return item.userKey === currentUserKey;
94
+ }));
95
+ }
85
96
 
86
97
  // 只能处理分配到自己的任务
87
98
  // 判断处理人是否是自己
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED
@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
20
  import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
21
21
  import { message } from 'antd';
22
22
  import { useMemoizedFn } from 'ahooks';
23
+ import { get, find } from 'lodash';
23
24
  import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
24
25
  import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
25
26
  import { modifyWorkOrder, restartAutoTask } from "../../../model/flowTemplateDetail/api";
@@ -30,7 +31,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
30
31
  import styles from "./index.module.less";
31
32
  import { PlatForm } from "../../../WorkOrder/types";
32
33
  import { useSignal } from "../../../hooks/useSignal";
33
- import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
34
+ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
34
35
  import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
35
36
  import { useSelector } from "../../context/useSelector";
36
37
  import { Context } from "../../context";
@@ -40,7 +41,7 @@ var formProps = {
40
41
  layout: 'vertical'
41
42
  };
42
43
  var CurrentNode = function CurrentNode(props, ref) {
43
- var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$wo22;
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;
44
45
  var formRenderRef = useRef(null);
45
46
  useImperativeHandle(ref, function () {
46
47
  return {
@@ -87,6 +88,7 @@ var CurrentNode = function CurrentNode(props, ref) {
87
88
  var operateParams = useSelector(selectOperateParams);
88
89
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
89
90
  var assistantMap = useSelector(selectNodeAssistantMap);
91
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
90
92
  var tradeKey = useMemo(function () {
91
93
  var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
92
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) {
@@ -101,20 +103,21 @@ var CurrentNode = function CurrentNode(props, ref) {
101
103
 
102
104
  // 是否是当前节点处理人
103
105
  var isCurrentNodeHandler = useMemo(function () {
104
- 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;
105
107
  return currentUserHasOperatorAuth({
106
108
  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] || [],
109
+ 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
110
  currentUserKey: plat.userKey,
108
- staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : (_currentNodeDetail$no8 = _currentNodeDetail$no7.assistants) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.staffIds) || [],
109
- operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : (_currentNodeDetail$no10 = _currentNodeDetail$no9.assistants) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.operateDataPermission,
111
+ 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) || [],
112
+ 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
113
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
111
- isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : (_currentNodeDetail$no12 = _currentNodeDetail$no11.assistants) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.isAllStaff
114
+ 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
115
  });
113
116
  }, [currentNodeDetail, plat.userKey, assistantMap]);
114
117
  var handleChangeTradeId = useMemoizedFn(function (tid) {
115
- var _currentNodeDetail$no13;
118
+ var _currentNodeDetail$no15;
116
119
  // 非开始节点不进行订单重复校验逻辑
117
- if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : _currentNodeDetail$no13.nodeType) !== NodeType.START_NODE) {
120
+ 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
121
  return;
119
122
  }
120
123
  if (!tid) {
@@ -127,10 +130,10 @@ var CurrentNode = function CurrentNode(props, ref) {
127
130
  }
128
131
  });
129
132
  } else {
130
- var _currentNodeDetail$no14;
133
+ var _currentNodeDetail$no16;
131
134
  // 查询当前订单号有多少的重复
132
135
  var params = {
133
- flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
136
+ flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
134
137
  flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
135
138
  desensitizedFlag: false,
136
139
  pageNo: 1,
@@ -150,11 +153,11 @@ var CurrentNode = function CurrentNode(props, ref) {
150
153
  });
151
154
  // 当前节点是开始节点、并且携带订单号时，此时会进行订单重复提醒
152
155
  useEffect(function () {
153
- var _currentNodeDetail$no15;
154
- if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.nodeType) && operateParams !== null && operateParams !== void 0 && operateParams.flowTemplateKey && tradeKey) {
156
+ var _currentNodeDetail$no17;
157
+ 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
158
  handleChangeTradeId(plat.orderNo);
156
159
  }
157
- }, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.nodeType, tradeKey]);
160
+ }, [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
161
  var transData = useMemo(function () {
159
162
  if (flowStatus === FlowStatus.COMPLETED) {
160
163
  var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -165,11 +168,11 @@ var CurrentNode = function CurrentNode(props, ref) {
165
168
  }
166
169
  }, [flowStatus, currentNodeDetail]);
167
170
  var handleWithdraw = function handleWithdraw() {
168
- var _currentNodeDetail$no17;
171
+ var _currentNodeDetail$no19;
169
172
  dispatch({
170
173
  type: 'setWithdrawWorkOrderDetail',
171
174
  payload: {
172
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
175
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
173
176
  }
174
177
  });
175
178
  dispatch({
@@ -201,7 +204,10 @@ var CurrentNode = function CurrentNode(props, ref) {
201
204
  flowWorkOrderId: flowWorkOrderId,
202
205
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.id,
203
206
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.update
204
- })
207
+ }),
208
+ shopUniqueKey: get(find(shopList, function (s) {
209
+ return s.shopId === formData.shopId;
210
+ }), 'accessToken', '')
205
211
  });
206
212
  _context.next = 7;
207
213
  return modifyWorkOrder(params);
@@ -237,7 +243,7 @@ var CurrentNode = function CurrentNode(props, ref) {
237
243
  }();
238
244
  var handleRestartAutoTask = /*#__PURE__*/function () {
239
245
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
240
- var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
246
+ var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
241
247
  var _yield$restartAutoTas, success, _controllerRef$curren2;
242
248
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
243
249
  while (1) switch (_context2.prev = _context2.next) {
@@ -249,7 +255,7 @@ var CurrentNode = function CurrentNode(props, ref) {
249
255
  flowWorkOrderId: flowWorkOrderId,
250
256
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
251
257
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
252
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
258
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
253
259
  })
254
260
  });
255
261
  case 2:
@@ -303,17 +309,17 @@ var CurrentNode = function CurrentNode(props, ref) {
303
309
  handleRestartAutoTask: handleRestartAutoTask,
304
310
  flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
305
311
  flowWorkOrderId: flowWorkOrderId || '',
306
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
312
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
307
313
  }), /*#__PURE__*/React.createElement("div", {
308
314
  className: styles.formRenderContainer
309
- }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
315
+ }, [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
316
  workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
311
317
  transData: transData,
312
318
  platform: plat.platform,
313
319
  onOpenWangWang: onOpenWangWang
314
320
  }) : /*#__PURE__*/React.createElement(FormRender, {
315
321
  ref: formRenderRef,
316
- isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
322
+ 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
323
  plat: plat,
318
324
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
319
325
  shopList: shopList,
@@ -330,6 +336,7 @@ var CurrentNode = function CurrentNode(props, ref) {
330
336
  handleChangeTradeId: handleChangeTradeId,
331
337
  canModifyPayment: true,
332
338
  flowAllShowHideRules: allShowHideRules,
339
+ 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),
333
340
  firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
334
341
  autoSubmit: autoSubmit
335
342
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts CHANGED
@@ -32,6 +32,7 @@ declare type FormRenderProps = {
32
32
  firstOrderBackfill?: boolean;
33
33
  isErpUse?: boolean;
34
34
  autoSubmit?: boolean;
35
+ isStartNodeWaiting?: boolean;
35
36
  };
36
37
  declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
37
38
  export default _default;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -93,6 +93,8 @@ var FormRender = function FormRender(props, ref) {
93
93
  isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
94
94
  _props$autoSubmit = props.autoSubmit,
95
95
  autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
96
+ _props$isStartNodeWai = props.isStartNodeWaiting,
97
+ isStartNodeWaiting = _props$isStartNodeWai === void 0 ? false : _props$isStartNodeWai,
96
98
  onJumpPage = props.onJumpPage;
97
99
  var shopIdToUniqueKeyMap = useMemo(function () {
98
100
  var json = {};
@@ -101,6 +103,11 @@ var FormRender = function FormRender(props, ref) {
101
103
  });
102
104
  return json;
103
105
  }, [shopList]);
106
+ var userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
107
+ var canEditShopName = useMemo(function () {
108
+ var _userInfo$companyUser, _userInfo$companyUser2;
109
+ return !!(userInfo !== null && userInfo !== void 0 && (_userInfo$companyUser = userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 && (_userInfo$companyUser2 = _userInfo$companyUser.pc) !== null && _userInfo$companyUser2 !== void 0 && _userInfo$companyUser2.canEditShopName);
110
+ }, [userInfo]);
104
111
  var mappingConfig = useMemo(function () {
105
112
  return getMappingConfigByTemplateDetail(templateDetail);
106
113
  }, [templateDetail]);
@@ -456,6 +463,7 @@ var FormRender = function FormRender(props, ref) {
456
463
  queryMemberLevels(_currentNodeTid, shopId);
457
464
  _context2.next = 27;
458
465
  return orderBack({
466
+ companyKey: companyKey,
459
467
  order_no: _currentNodeTid,
460
468
  form: form,
461
469
  shopId: shopId,
@@ -491,6 +499,7 @@ var FormRender = function FormRender(props, ref) {
491
499
  queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
492
500
  _context2.next = 38;
493
501
  return orderBack({
502
+ companyKey: companyKey,
494
503
  order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
495
504
  form: form,
496
505
  shopId: shopId,
@@ -568,6 +577,7 @@ var FormRender = function FormRender(props, ref) {
568
577
  queryMemberLevels(orderNo, shopId);
569
578
  _context2.next = 63;
570
579
  return orderBack({
580
+ companyKey: companyKey,
571
581
  order_no: orderNo,
572
582
  form: form,
573
583
  shopId: shopId,
@@ -830,6 +840,7 @@ var FormRender = function FormRender(props, ref) {
830
840
  sessionStorage.setItem('order_no_test', order_no);
831
841
  _context5.next = 5;
832
842
  return orderBack({
843
+ companyKey: companyKey,
833
844
  order_no: order_no,
834
845
  form: form,
835
846
  shopId: shopId,
@@ -917,13 +928,6 @@ var FormRender = function FormRender(props, ref) {
917
928
  form: form
918
929
  });
919
930
  }
920
- if (workOrderComponentType === 'JY_SYSTEM_ORDER') {
921
- jySystemOrderBackValues({
922
- templateList: templateDetail,
923
- value: value,
924
- form: form
925
- });
926
- }
927
931
  if (workOrderComponentType === 'JST_SYSTEM_ORDER') {
928
932
  jstSystemOrderBackValues({
929
933
  templateList: templateDetail,
@@ -984,7 +988,12 @@ var FormRender = function FormRender(props, ref) {
984
988
  componentOnBlur: componentOnBlur
985
989
  });
986
990
  case 8:
987
- if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
991
+ if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
992
+ //test 测马奔腾
993
+ '6O47IBXFR26FJF4HUQ7WGO4H',
994
+ //prod 陈健企业工单
995
+ 'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
996
+ ].includes(companyKey)) {
988
997
  _context6.next = 11;
989
998
  break;
990
999
  }
@@ -1190,6 +1199,7 @@ var FormRender = function FormRender(props, ref) {
1190
1199
  var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
1191
1200
  if (_tradeValue || paymentValue) {
1192
1201
  orderBack({
1202
+ companyKey: companyKey,
1193
1203
  order_no: _tradeValue || paymentValue,
1194
1204
  form: form,
1195
1205
  shopId: val,
@@ -1574,6 +1584,18 @@ var FormRender = function FormRender(props, ref) {
1574
1584
  labelList: labelList,
1575
1585
  shopId: shopId
1576
1586
  }));
1587
+ var shopNameDisabled = useMemo(function () {
1588
+ if (isStartNodeWaiting && !look) {
1589
+ return false;
1590
+ }
1591
+ if (canEditShopName && !look) {
1592
+ return false;
1593
+ }
1594
+ if (look || !!workOrderId) {
1595
+ return true;
1596
+ }
1597
+ return false;
1598
+ }, [workOrderId, look, canEditShopName, isStartNodeWaiting]);
1577
1599
  return /*#__PURE__*/React.createElement(ConfigProvider, {
1578
1600
  locale: zhCN
1579
1601
  }, /*#__PURE__*/React.createElement("div", {
@@ -1606,7 +1628,7 @@ var FormRender = function FormRender(props, ref) {
1606
1628
  shopList: shopList,
1607
1629
  handleChangeShopId: handleChangeShopId,
1608
1630
  hidden: !isShowShopList,
1609
- disabled: !!workOrderId || look
1631
+ disabled: shopNameDisabled
1610
1632
  }), /*#__PURE__*/React.createElement(Form.Item, {
1611
1633
  name: "fixed_field_buyerOpenUid",
1612
1634
  hidden: true
package/dist/esm/FlowTemplateDetailV2/components/FormRender/skxOrderBack.js CHANGED
@@ -6,7 +6,7 @@ import { get } from 'lodash';
6
6
  import { onBlurSkxLogisticsCode, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
7
7
  import { findComponentUniqueKeyByType } from "../../../common/utils/tools";
8
8
  var isMatchCompanyKey = function isMatchCompanyKey(companyKey) {
9
- return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey);
9
+ return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT', '6O47IBXFR26FJF4HUQ7WGO4H'].includes(companyKey);
10
10
  };
11
11
  var existSkxReturnLogisticsComponent = function existSkxReturnLogisticsComponent(templateDetail) {
12
12
  return get(templateDetail, 'componentDtoList', []).some(function (item) {
package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts CHANGED
@@ -9,6 +9,7 @@ interface NodeItem {
9
9
  onOpenWangWang?: (nick: string, id: string) => void;
10
10
  onJumpPage?: (val: any) => void;
11
11
  queryRemarkList: () => void;
12
+ updateShopId?: () => void;
12
13
  openCloseCallback?: () => void;
13
14
  handler: string;
14
15
  canWithdraw: boolean;
package/dist/esm/FlowTemplateDetailV2/components/Item/index.js CHANGED
@@ -20,12 +20,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
20
  import React, { useState, useMemo, useEffect, useContext } from 'react';
21
21
  import { Form, message } from 'antd';
22
22
  import { useRequest } from 'ahooks';
23
+ import { get, find } from 'lodash';
23
24
  import Header from "../Header";
24
25
  import FormRender from "../FormRender";
25
26
  import RenderDetail from "../RenderDetail";
26
27
  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";
28
+ import { queryNodeDetail, queryMultiNodeAssistantInfo, queryUserGroupList } from "../../../model/flowTemplateDetail/api";
29
+ import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams, selectNodeUserGroupMap } from "../../store/selector";
29
30
  import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
30
31
  import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
31
32
  import { PlatForm } from "../../../WorkOrder/types";
@@ -34,7 +35,7 @@ import { useSelector } from "../../context/useSelector";
34
35
  import { Context } from "../../context";
35
36
  import { AutoTaskDetail } from "../AutoTaskDetail";
36
37
  var NodeItem = function NodeItem(props) {
37
- var _data$data10, _data$data11, _data$data11$workOrde, _data$data12, _data$data12$workOrde, _data$data13, _data$data13$nodeInfo, _data$data14, _data$data15, _data$data15$nodeInfo, _data$data16, _data$data17, _data$data18, _data$data18$workOrde, _data$data19, _data$data20;
38
+ 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
39
  var tag = props.tag,
39
40
  nodeId = props.nodeId,
40
41
  nodeName = props.nodeName,
@@ -45,6 +46,7 @@ var NodeItem = function NodeItem(props) {
45
46
  onOpenWangWang = props.onOpenWangWang,
46
47
  openCloseCallback = props.openCloseCallback,
47
48
  queryRemarkList = props.queryRemarkList,
49
+ updateShopId = props.updateShopId,
48
50
  handler = props.handler,
49
51
  canWithdraw = props.canWithdraw,
50
52
  _props$readonly = props.readonly,
@@ -75,6 +77,7 @@ var NodeItem = function NodeItem(props) {
75
77
  var flowStatus = useSelector(selectFlowStatus);
76
78
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
77
79
  var assistantMap = useSelector(selectNodeAssistantMap);
80
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
78
81
  var _Form$useForm = Form.useForm(),
79
82
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
80
83
  form = _Form$useForm2[0];
@@ -96,12 +99,12 @@ var NodeItem = function NodeItem(props) {
96
99
  manual: true,
97
100
  onSuccess: function () {
98
101
  var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
99
- var _currentNodeDetail$wo, _currentNodeDetail$no, currentNodeDetail, handlerList, assistants, assistantRes, _assistantRes$data;
102
+ var _currentNodeDetail$wo, _currentNodeDetail$no, _assistants$groupIds, currentNodeDetail, handlerList, assistants, userRes, assistantRes, _assistantRes$data;
100
103
  return _regeneratorRuntime().wrap(function _callee$(_context) {
101
104
  while (1) switch (_context.prev = _context.next) {
102
105
  case 0:
103
106
  if (!result.success) {
104
- _context.next = 17;
107
+ _context.next = 24;
105
108
  break;
106
109
  }
107
110
  setOpen(true);
@@ -110,20 +113,39 @@ var NodeItem = function NodeItem(props) {
110
113
  currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
111
114
  handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
112
115
  assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
116
+ 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)) {
117
+ _context.next = 13;
118
+ break;
119
+ }
120
+ _context.next = 9;
121
+ return queryUserGroupList({
122
+ groupUkList: (assistants === null || assistants === void 0 ? void 0 : assistants.groupIds) || []
123
+ });
124
+ case 9:
125
+ userRes = _context.sent;
126
+ if (userRes.success) {
127
+ dispatch({
128
+ type: 'setGroupUserList',
129
+ payload: _defineProperty({}, nodeId, userRes.data || [])
130
+ });
131
+ }
132
+ _context.next = 24;
133
+ break;
134
+ case 13:
113
135
  if (!(Array.isArray(handlerList) && handlerList.length &&
114
136
  // 有处理人
115
137
  !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理，查询能够处理的人
116
138
  )) {
117
- _context.next = 17;
139
+ _context.next = 24;
118
140
  break;
119
141
  }
120
- _context.prev = 7;
121
- _context.next = 10;
142
+ _context.prev = 14;
143
+ _context.next = 17;
122
144
  return queryMultiNodeAssistantInfo([{
123
145
  flowTemplateId: flowTemplateId,
124
146
  currentNodeId: nodeId
125
147
  }]);
126
- case 10:
148
+ case 17:
127
149
  assistantRes = _context.sent;
128
150
  if (assistantRes.success) {
129
151
  dispatch({
@@ -131,17 +153,17 @@ var NodeItem = function NodeItem(props) {
131
153
  payload: _defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
132
154
  });
133
155
  }
134
- _context.next = 17;
156
+ _context.next = 24;
135
157
  break;
136
- case 14:
137
- _context.prev = 14;
138
- _context.t0 = _context["catch"](7);
158
+ case 21:
159
+ _context.prev = 21;
160
+ _context.t0 = _context["catch"](14);
139
161
  console.error(_context.t0);
140
- case 17:
162
+ case 24:
141
163
  case "end":
142
164
  return _context.stop();
143
165
  }
144
- }, _callee, null, [[7, 14]]);
166
+ }, _callee, null, [[14, 21]]);
145
167
  }));
146
168
  function onSuccess(_x2) {
147
169
  return _onSuccess.apply(this, arguments);
@@ -166,7 +188,7 @@ var NodeItem = function NodeItem(props) {
166
188
  };
167
189
  var handleSave = /*#__PURE__*/function () {
168
190
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
169
- var _data$data, _data$data$workOrder, _data$data2, _data$data2$workOrder, formData, params, res;
191
+ var _data$data, _data$data$workOrder, _data$data2, _data$data2$workOrder, formData, params, res, _params$updateInfo, _params$updateInfo$up, isUpdateShopId;
170
192
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
171
193
  while (1) switch (_context2.prev = _context2.next) {
172
194
  case 0:
@@ -185,7 +207,10 @@ var NodeItem = function NodeItem(props) {
185
207
  flowWorkOrderId: flowWorkOrderId,
186
208
  workOrderId: data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$workOrder = _data$data.workOrder) === null || _data$data$workOrder === void 0 ? void 0 : _data$data$workOrder.id,
187
209
  workOrderUpdateTime: data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : (_data$data2$workOrder = _data$data2.workOrder) === null || _data$data2$workOrder === void 0 ? void 0 : _data$data2$workOrder.update
188
- })
210
+ }),
211
+ shopUniqueKey: get(find(shopList, function (s) {
212
+ return s.shopId === formData.shopId;
213
+ }), 'accessToken', '')
189
214
  });
190
215
  _context2.next = 7;
191
216
  return modifyWorkOrder(params);
@@ -195,6 +220,11 @@ var NodeItem = function NodeItem(props) {
195
220
  message.success('数据修改成功');
196
221
  run();
197
222
  queryRemarkList();
223
+ //如果修改了店铺 回调
224
+ isUpdateShopId = (_params$updateInfo = params.updateInfo) === null || _params$updateInfo === void 0 ? void 0 : (_params$updateInfo$up = _params$updateInfo.updateList) === null || _params$updateInfo$up === void 0 ? void 0 : _params$updateInfo$up.some(function (item) {
225
+ return item.dataKey === 'userId';
226
+ });
227
+ isUpdateShopId && (updateShopId === null || updateShopId === void 0 ? void 0 : updateShopId());
198
228
  setEditing(false);
199
229
  }
200
230
  _context2.next = 14;
@@ -229,15 +259,16 @@ var NodeItem = function NodeItem(props) {
229
259
 
230
260
  // 是否是当前节点处理人
231
261
  var isCurrentNodeHandler = useMemo(function () {
232
- var _data$data4, _data$data4$nodeInfo, _data$data5, _data$data5$nodeInfo, _data$data6, _data$data6$nodeInfo, _data$data6$nodeInfo$, _data$data7, _data$data7$nodeInfo, _data$data7$nodeInfo$, _data$data8, _data$data8$workOrder, _data$data9, _data$data9$nodeInfo, _data$data9$nodeInfo$;
262
+ 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
263
  return currentUserHasOperatorAuth({
234
264
  // assistantList: data?.data?.nodeInfo?.id && assistantMap['FN00278209550851436544'] || [],
235
265
  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] || [],
266
+ 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
267
  currentUserKey: plat.userKey,
237
- staffIds: (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : (_data$data6$nodeInfo = _data$data6.nodeInfo) === null || _data$data6$nodeInfo === void 0 ? void 0 : (_data$data6$nodeInfo$ = _data$data6$nodeInfo.assistants) === null || _data$data6$nodeInfo$ === void 0 ? void 0 : _data$data6$nodeInfo$.staffIds) || [],
238
- operateDataPermission: data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : (_data$data7$nodeInfo = _data$data7.nodeInfo) === null || _data$data7$nodeInfo === void 0 ? void 0 : (_data$data7$nodeInfo$ = _data$data7$nodeInfo.assistants) === null || _data$data7$nodeInfo$ === void 0 ? void 0 : _data$data7$nodeInfo$.operateDataPermission,
239
- handlerList: (data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : (_data$data8$workOrder = _data$data8.workOrder) === null || _data$data8$workOrder === void 0 ? void 0 : _data$data8$workOrder.handlerList) || [],
240
- isAllStaff: data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : (_data$data9$nodeInfo = _data$data9.nodeInfo) === null || _data$data9$nodeInfo === void 0 ? void 0 : (_data$data9$nodeInfo$ = _data$data9$nodeInfo.assistants) === null || _data$data9$nodeInfo$ === void 0 ? void 0 : _data$data9$nodeInfo$.isAllStaff
268
+ 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) || [],
269
+ 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,
270
+ 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) || [],
271
+ 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
272
  });
242
273
  }, [data, plat.userKey, assistantMap]);
243
274
  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 +289,7 @@ var NodeItem = function NodeItem(props) {
258
289
  // }
259
290
  // };
260
291
 
261
- var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : _data$data10.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$workOrde = _data$data11.workOrderTemplateInfo) === null || _data$data11$workOrde === void 0 ? void 0 : _data$data11$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$workOrde = _data$data12.workOrderTemplateInfo) === null || _data$data12$workOrde === void 0 ? void 0 : _data$data12$workOrde.componentDtoList) || []))),
292
+ 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
293
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
263
294
  transData = _calcWorkOrderList2[0];
264
295
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
@@ -286,18 +317,18 @@ var NodeItem = function NodeItem(props) {
286
317
  display: open ? 'block' : 'none',
287
318
  marginTop: '16px'
288
319
  }
289
- }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$nodeInfo = _data$data13.nodeInfo) === null || _data$data13$nodeInfo === void 0 ? void 0 : _data$data13$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : _data$data14.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
290
- isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : (_data$data15$nodeInfo = _data$data15.nodeInfo) === null || _data$data15$nodeInfo === void 0 ? void 0 : _data$data15$nodeInfo.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
320
+ }, [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, {
321
+ 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
322
  plat: plat,
292
- templateDetail: data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo,
323
+ templateDetail: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : _data$data18.workOrderTemplateInfo,
293
324
  shopList: shopList,
294
- record: data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder,
325
+ record: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrder,
295
326
  accountName: plat.accountName,
296
327
  form: form,
297
328
  onOpenWangWang: onOpenWangWang,
298
329
  onJumpPage: onJumpPage,
299
330
  look: !editing || flowStatus === FlowStatus.STOPPING,
300
- shopId: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrder) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.shopId,
331
+ 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
332
  formProps: {
302
333
  className: 'customizeFormModalClassName',
303
334
  layout: 'vertical'
@@ -307,12 +338,12 @@ var NodeItem = function NodeItem(props) {
307
338
  firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
308
339
  // handleChangeTradeId={handleChangeTradeId}
309
340
  }) : /*#__PURE__*/React.createElement(RenderDetail, {
310
- workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
341
+ workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
311
342
  transData: transData,
312
343
  platform: plat.platform,
313
344
  onOpenWangWang: onOpenWangWang
314
345
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
315
- flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
346
+ flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData
316
347
  })));
317
348
  };
318
349
  export default NodeItem;
package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.d.ts CHANGED
@@ -2,5 +2,6 @@ import React from 'react';
2
2
  import { PlatFormInfo } from '../../../model/flowTemplateDetail/types';
3
3
  declare const RemarkListModal: (props: {
4
4
  plat: PlatFormInfo;
5
+ shopList: any;
5
6
  }) => React.JSX.Element;
6
7
  export default RemarkListModal;