@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.5 → 2.2.13-beta.51

package/dist/esm/FlowTemplateDetailV2/common.d.ts

@@ -18,13 +18,14 @@ export declare const verifyHandle: (data: any, componentDtoList: Array<any>) =>
     success: boolean;
     message: string;
 };
-export declare const currentUserHasOperatorAuth: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, }: {
+export declare const currentUserHasOperatorAuth: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList, }: {
     currentUserKey: string;
     staffIds: Array<string>;
-    operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL';
+    operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL' | 'ONLY_THE_SAME_USER_GROUP';
     handlerList: Array<{
         userKey: string;
     }>;
     isAllStaff: boolean;
     assistantList: Array<Assistant>;
+    userGroupList: Array<string>;
 }) => boolean;

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -1,4 +1,5 @@
 import { NodeType } from "../model/flowTemplateDetail/types";
+import { intersection } from 'lodash';
 export var getTag = function getTag(item) {
   var tag = 'artificial'; // 人工节点
   // 先判断是什么节点类型 步骤/判断
@@ -63,16 +64,17 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
     operateDataPermission = _ref.operateDataPermission,
     handlerList = _ref.handlerList,
     isAllStaff = _ref.isAllStaff,
-    assistantList = _ref.assistantList;
-  // 节点配置为组操作
-  var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
+    assistantList = _ref.assistantList,
+    _ref$userGroupList = _ref.userGroupList,
+    userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
+  console.log('currentUserHasOperatorAuth', currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList);
   // handlerList为空数组是没有处理人，都可以处理
   if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
     return true;
   }
 
   // 可以处理所有任务
-  if (groupCanOperate) {
+  if (operateDataPermission === 'HANDLE_ALL') {
     // 判断是否是预备客服
     return isAllStaff || ( // 全部
     staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -82,6 +84,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
     }) // 人在groups中
     ;
   }
+  //仅可处理同用户组的工单
+  if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
+    //判断组用户中是否包含处理人 || 判断处理人是否是自己
+    var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
+      return item.userKey;
+    });
+    return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
+      return item.userKey === currentUserKey;
+    }));
+  }
 
   // 只能处理分配到自己的任务
   // 判断处理人是否是自己

package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js

@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
 import { message } from 'antd';
 import { useMemoizedFn } from 'ahooks';
+import { get, find } from 'lodash';
 import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
 import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
 import { modifyWorkOrder, restartAutoTask } from "../../../model/flowTemplateDetail/api";
@@ -30,7 +31,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
 import styles from "./index.module.less";
 import { PlatForm } from "../../../WorkOrder/types";
 import { useSignal } from "../../../hooks/useSignal";
-import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
+import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
 import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
 import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
@@ -40,7 +41,7 @@ var formProps = {
   layout: 'vertical'
 };
 var CurrentNode = function CurrentNode(props, ref) {
-  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;
+  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;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -87,6 +88,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   var operateParams = useSelector(selectOperateParams);
   var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
   var assistantMap = useSelector(selectNodeAssistantMap);
+  var useGroupMap = useSelector(selectNodeUserGroupMap);
   var tradeKey = useMemo(function () {
     var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
     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) {
 
   // 是否是当前节点处理人
   var isCurrentNodeHandler = useMemo(function () {
-    var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$no11, _currentNodeDetail$no12;
+    var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
     return currentUserHasOperatorAuth({
       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] || [],
+      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] || [],
       currentUserKey: plat.userKey,
-      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) || [],
-      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,
+      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) || [],
+      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,
       handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
-      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
+      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
     });
   }, [currentNodeDetail, plat.userKey, assistantMap]);
   var handleChangeTradeId = useMemoizedFn(function (tid) {
-    var _currentNodeDetail$no13;
+    var _currentNodeDetail$no15;
     // 非开始节点不进行订单重复校验逻辑
-    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) {
+    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) {
       return;
     }
     if (!tid) {
@@ -127,10 +130,10 @@ var CurrentNode = function CurrentNode(props, ref) {
         }
       });
     } else {
-      var _currentNodeDetail$no14;
+      var _currentNodeDetail$no16;
       // 查询当前订单号有多少的重复
       var params = {
-        flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
+        flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
         flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
         desensitizedFlag: false,
         pageNo: 1,
@@ -150,11 +153,11 @@ var CurrentNode = function CurrentNode(props, ref) {
   });
   // 当前节点是开始节点、并且携带订单号时，此时会进行订单重复提醒
   useEffect(function () {
-    var _currentNodeDetail$no15;
-    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) {
+    var _currentNodeDetail$no17;
+    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) {
       handleChangeTradeId(plat.orderNo);
     }
-  }, [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]);
+  }, [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]);
   var transData = useMemo(function () {
     if (flowStatus === FlowStatus.COMPLETED) {
       var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -165,11 +168,11 @@ var CurrentNode = function CurrentNode(props, ref) {
     }
   }, [flowStatus, currentNodeDetail]);
   var handleWithdraw = function handleWithdraw() {
-    var _currentNodeDetail$no17;
+    var _currentNodeDetail$no19;
     dispatch({
       type: 'setWithdrawWorkOrderDetail',
       payload: {
-        nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
+        nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
       }
     });
     dispatch({
@@ -201,7 +204,10 @@ var CurrentNode = function CurrentNode(props, ref) {
                 flowWorkOrderId: flowWorkOrderId,
                 workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.id,
                 workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.update
-              })
+              }),
+              shopUniqueKey: get(find(shopList, function (s) {
+                return s.shopId === formData.shopId;
+              }), 'accessToken', '')
             });
             _context.next = 7;
             return modifyWorkOrder(params);
@@ -237,7 +243,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   }();
   var handleRestartAutoTask = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
+      var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
       var _yield$restartAutoTas, success, _controllerRef$curren2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -249,7 +255,7 @@ var CurrentNode = function CurrentNode(props, ref) {
                 flowWorkOrderId: flowWorkOrderId,
                 workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
                 workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
-                nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
+                nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
               })
             });
           case 2:
@@ -303,17 +309,17 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleRestartAutoTask: handleRestartAutoTask,
     flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
     flowWorkOrderId: flowWorkOrderId || '',
-    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
+    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [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, {
+  }, [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, {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
-    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),
+    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),
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -101,6 +101,11 @@ var FormRender = function FormRender(props, ref) {
     });
     return json;
   }, [shopList]);
+  var userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
+  var canEditShopName = useMemo(function () {
+    var _userInfo$companyUser, _userInfo$companyUser2;
+    return (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$companyUser = userInfo.companyUserConfig) === null || _userInfo$companyUser === void 0 ? void 0 : (_userInfo$companyUser2 = _userInfo$companyUser.pc) === null || _userInfo$companyUser2 === void 0 ? void 0 : _userInfo$companyUser2.canEditShopName) || true;
+  }, [userInfo]);
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);
   }, [templateDetail]);
@@ -456,6 +461,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(_currentNodeTid, shopId);
             _context2.next = 27;
             return orderBack({
+              companyKey: companyKey,
               order_no: _currentNodeTid,
               form: form,
               shopId: shopId,
@@ -491,6 +497,7 @@ var FormRender = function FormRender(props, ref) {
             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);
             _context2.next = 38;
             return orderBack({
+              companyKey: companyKey,
               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")],
               form: form,
               shopId: shopId,
@@ -568,6 +575,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(orderNo, shopId);
             _context2.next = 63;
             return orderBack({
+              companyKey: companyKey,
               order_no: orderNo,
               form: form,
               shopId: shopId,
@@ -830,6 +838,7 @@ var FormRender = function FormRender(props, ref) {
             sessionStorage.setItem('order_no_test', order_no);
             _context5.next = 5;
             return orderBack({
+              companyKey: companyKey,
               order_no: order_no,
               form: form,
               shopId: shopId,
@@ -917,13 +926,6 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
-    if (workOrderComponentType === 'JY_SYSTEM_ORDER') {
-      jySystemOrderBackValues({
-        templateList: templateDetail,
-        value: value,
-        form: form
-      });
-    }
     if (workOrderComponentType === 'JST_SYSTEM_ORDER') {
       jstSystemOrderBackValues({
         templateList: templateDetail,
@@ -984,7 +986,12 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 8:
-            if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
+            if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
+            //test 测马奔腾
+            '6O47IBXFR26FJF4HUQ7WGO4H',
+            //prod 陈健企业工单
+            'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
+            ].includes(companyKey)) {
               _context6.next = 11;
               break;
             }
@@ -1190,6 +1197,7 @@ var FormRender = function FormRender(props, ref) {
       var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
       if (_tradeValue || paymentValue) {
         orderBack({
+          companyKey: companyKey,
           order_no: _tradeValue || paymentValue,
           form: form,
           shopId: val,
@@ -1606,7 +1614,7 @@ var FormRender = function FormRender(props, ref) {
     shopList: shopList,
     handleChangeShopId: handleChangeShopId,
     hidden: !isShowShopList,
-    disabled: !!workOrderId || look
+    disabled: (!!workOrderId || look) && !canEditShopName
   }), /*#__PURE__*/React.createElement(Form.Item, {
     name: "fixed_field_buyerOpenUid",
     hidden: true

package/dist/esm/FlowTemplateDetailV2/components/FormRender/skxOrderBack.js

@@ -6,7 +6,7 @@ import { get } from 'lodash';
 import { onBlurSkxLogisticsCode, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
 import { findComponentUniqueKeyByType } from "../../../common/utils/tools";
 var isMatchCompanyKey = function isMatchCompanyKey(companyKey) {
-  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey);
+  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT', '6O47IBXFR26FJF4HUQ7WGO4H'].includes(companyKey);
 };
 var existSkxReturnLogisticsComponent = function existSkxReturnLogisticsComponent(templateDetail) {
   return get(templateDetail, 'componentDtoList', []).some(function (item) {

package/dist/esm/FlowTemplateDetailV2/components/Item/index.js

@@ -20,12 +20,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useMemo, useEffect, useContext } from 'react';
 import { Form, message } from 'antd';
 import { useRequest } from 'ahooks';
+import { get, find } from 'lodash';
 import Header from "../Header";
 import FormRender from "../FormRender";
 import RenderDetail from "../RenderDetail";
 import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
-import { queryNodeDetail, queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
-import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams } from "../../store/selector";
+import { queryNodeDetail, queryMultiNodeAssistantInfo, queryUserGroupList } from "../../../model/flowTemplateDetail/api";
+import { selectPlatInfo, selectFlowStatus, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectOperateParams, selectNodeUserGroupMap } from "../../store/selector";
 import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
 import { modifyWorkOrder } from "../../../model/flowTemplateDetail/api";
 import { PlatForm } from "../../../WorkOrder/types";
@@ -34,7 +35,7 @@ import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
 import { AutoTaskDetail } from "../AutoTaskDetail";
 var NodeItem = function NodeItem(props) {
-  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;
+  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;
   var tag = props.tag,
     nodeId = props.nodeId,
     nodeName = props.nodeName,
@@ -75,6 +76,7 @@ var NodeItem = function NodeItem(props) {
   var flowStatus = useSelector(selectFlowStatus);
   var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
   var assistantMap = useSelector(selectNodeAssistantMap);
+  var useGroupMap = useSelector(selectNodeUserGroupMap);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -96,12 +98,12 @@ var NodeItem = function NodeItem(props) {
       manual: true,
       onSuccess: function () {
         var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
-          var _currentNodeDetail$wo, _currentNodeDetail$no, currentNodeDetail, handlerList, assistants, assistantRes, _assistantRes$data;
+          var _currentNodeDetail$wo, _currentNodeDetail$no, _assistants$groupIds, currentNodeDetail, handlerList, assistants, userRes, assistantRes, _assistantRes$data;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (!result.success) {
-                  _context.next = 17;
+                  _context.next = 24;
                   break;
                 }
                 setOpen(true);
@@ -110,20 +112,39 @@ var NodeItem = function NodeItem(props) {
                 currentNodeDetail = result === null || result === void 0 ? void 0 : result.data;
                 handlerList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.handlerList;
                 assistants = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no === void 0 ? void 0 : _currentNodeDetail$no.assistants;
+                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)) {
+                  _context.next = 13;
+                  break;
+                }
+                _context.next = 9;
+                return queryUserGroupList({
+                  groupUkList: (assistants === null || assistants === void 0 ? void 0 : assistants.groupIds) || []
+                });
+              case 9:
+                userRes = _context.sent;
+                if (userRes.success) {
+                  dispatch({
+                    type: 'setGroupUserList',
+                    payload: _defineProperty({}, nodeId, userRes.data || [])
+                  });
+                }
+                _context.next = 24;
+                break;
+              case 13:
                 if (!(Array.isArray(handlerList) && handlerList.length &&
                 // 有处理人
                 !(assistants !== null && assistants !== void 0 && assistants.isAllStaff) // 不是所有人都能处理，查询能够处理的人
                 )) {
-                  _context.next = 17;
+                  _context.next = 24;
                   break;
                 }
-                _context.prev = 7;
-                _context.next = 10;
+                _context.prev = 14;
+                _context.next = 17;
                 return queryMultiNodeAssistantInfo([{
                   flowTemplateId: flowTemplateId,
                   currentNodeId: nodeId
                 }]);
-              case 10:
+              case 17:
                 assistantRes = _context.sent;
                 if (assistantRes.success) {
                   dispatch({
@@ -131,17 +152,17 @@ var NodeItem = function NodeItem(props) {
                     payload: _defineProperty({}, nodeId, ((_assistantRes$data = assistantRes.data) === null || _assistantRes$data === void 0 ? void 0 : _assistantRes$data.userList) || [])
                   });
                 }
-                _context.next = 17;
+                _context.next = 24;
                 break;
-              case 14:
-                _context.prev = 14;
-                _context.t0 = _context["catch"](7);
+              case 21:
+                _context.prev = 21;
+                _context.t0 = _context["catch"](14);
                 console.error(_context.t0);
-              case 17:
+              case 24:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[7, 14]]);
+          }, _callee, null, [[14, 21]]);
         }));
         function onSuccess(_x2) {
           return _onSuccess.apply(this, arguments);
@@ -185,7 +206,10 @@ var NodeItem = function NodeItem(props) {
                 flowWorkOrderId: flowWorkOrderId,
                 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,
                 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
-              })
+              }),
+              shopUniqueKey: get(find(shopList, function (s) {
+                return s.shopId === formData.shopId;
+              }), 'accessToken', '')
             });
             _context2.next = 7;
             return modifyWorkOrder(params);
@@ -229,15 +253,16 @@ var NodeItem = function NodeItem(props) {
 
   // 是否是当前节点处理人
   var isCurrentNodeHandler = useMemo(function () {
-    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$;
+    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;
     return currentUserHasOperatorAuth({
       // assistantList: data?.data?.nodeInfo?.id && assistantMap['FN00278209550851436544'] || [],
       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] || [],
+      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] || [],
       currentUserKey: plat.userKey,
-      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) || [],
-      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,
-      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) || [],
-      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
+      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) || [],
+      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,
+      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) || [],
+      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
     });
   }, [data, plat.userKey, assistantMap]);
   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 +283,7 @@ var NodeItem = function NodeItem(props) {
   //   }
   // };
 
-  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) || []))),
+  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) || []))),
     _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
     transData = _calcWorkOrderList2[0];
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
@@ -286,18 +311,18 @@ var NodeItem = function NodeItem(props) {
       display: open ? 'block' : 'none',
       marginTop: '16px'
     }
-  }, [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, {
-    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),
+  }, [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, {
+    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),
     plat: plat,
-    templateDetail: data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo,
+    templateDetail: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : _data$data18.workOrderTemplateInfo,
     shopList: shopList,
-    record: data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder,
+    record: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrder,
     accountName: plat.accountName,
     form: form,
     onOpenWangWang: onOpenWangWang,
     onJumpPage: onJumpPage,
     look: !editing || flowStatus === FlowStatus.STOPPING,
-    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,
+    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,
     formProps: {
       className: 'customizeFormModalClassName',
       layout: 'vertical'
@@ -307,12 +332,12 @@ var NodeItem = function NodeItem(props) {
     firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
     // handleChangeTradeId={handleChangeTradeId}
   }) : /*#__PURE__*/React.createElement(RenderDetail, {
-    workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
+    workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
-    flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
+    flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData
   })));
 };
 export default NodeItem;

package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.d.ts

@@ -2,5 +2,6 @@ import React from 'react';
 import { PlatFormInfo } from '../../../model/flowTemplateDetail/types';
 declare const RemarkListModal: (props: {
     plat: PlatFormInfo;
+    shopList: any;
 }) => React.JSX.Element;
 export default RemarkListModal;