@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13 → 2.2.14-beta.1

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,16 @@ 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;
   // 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 +83,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, _currentNodeDetail$no24, _currentNodeDetail$wo23;
   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,
@@ -330,6 +336,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleChangeTradeId: handleChangeTradeId,
     canModifyPayment: true,
     flowAllShowHideRules: allShowHideRules,
+    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),
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
     autoSubmit: autoSubmit
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {

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

@@ -32,6 +32,7 @@ declare type FormRenderProps = {
     firstOrderBackfill?: boolean;
     isErpUse?: boolean;
     autoSubmit?: boolean;
+    isStartNodeWaiting?: boolean;
 };
 declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
@@ -93,6 +93,8 @@ var FormRender = function FormRender(props, ref) {
     isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
     _props$autoSubmit = props.autoSubmit,
     autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
+    _props$isStartNodeWai = props.isStartNodeWaiting,
+    isStartNodeWaiting = _props$isStartNodeWai === void 0 ? false : _props$isStartNodeWai,
     onJumpPage = props.onJumpPage;
   var shopIdToUniqueKeyMap = useMemo(function () {
     var json = {};
@@ -101,6 +103,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 && (_userInfo$companyUser = userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 && (_userInfo$companyUser2 = _userInfo$companyUser.pc) !== null && _userInfo$companyUser2 !== void 0 && _userInfo$companyUser2.canEditShopName);
+  }, [userInfo]);
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);
   }, [templateDetail]);
@@ -456,6 +463,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 +499,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 +577,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(orderNo, shopId);
             _context2.next = 63;
             return orderBack({
+              companyKey: companyKey,
               order_no: orderNo,
               form: form,
               shopId: shopId,
@@ -648,6 +658,7 @@ var FormRender = function FormRender(props, ref) {
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
+    console.log('batchFillByMapping-----processing');
     for (var _key in values) {
       fillByMapping(_key, values[_key]);
     }
@@ -664,6 +675,7 @@ var FormRender = function FormRender(props, ref) {
     // 如果有映射关系，则修改对应组件的值
     var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[triggerUniqueKey];
     if (mapping !== null && mapping !== void 0 && mapping[triggerValue]) {
+      console.debug('重置表单值1', mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
@@ -672,6 +684,7 @@ var FormRender = function FormRender(props, ref) {
           resetSet.add(uniqueKey);
         }
       }
+      console.debug('重置表单值2', _toConsumableArray(resetSet));
       form.resetFields(_toConsumableArray(resetSet));
     }
     resetMappingHideComponents();
@@ -830,6 +843,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,
@@ -924,6 +938,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'JY_SYSTEM_ORDER') {
+      jySystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (activeLogisticsComponents && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
       setLogisticsInfo({
         logisticsMappingConfig: activeLogisticsComponents,
@@ -970,7 +991,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;
             }
@@ -1120,7 +1146,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -1131,6 +1157,7 @@ var FormRender = function FormRender(props, ref) {
           case 'KM_LOGISTICS':
           case 'BS_E3_LOGISTICS':
           case 'GY_LOGISTICS':
+          case 'JY_LOGISTICS':
           case 'SKX_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
@@ -1149,6 +1176,7 @@ var FormRender = function FormRender(props, ref) {
           case 'WDT_SEND_GOOD':
           case 'KM_SEND_GOOD':
           case 'GY_SEND_GOOD':
+          case 'JY_SEND_GOOD':
             prv[next.uniqueKey] = [{
               sendName: '',
               sendId: ''
@@ -1174,6 +1202,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,
@@ -1330,9 +1359,7 @@ var FormRender = function FormRender(props, ref) {
       currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = true;
       if (Reflect.has(idConditionListMap, instance.id)) {
         var currentIdDependenceOtherFields = idConditionListMap[instance.id];
-        // console.group('当前组件', instance.id, instance.name);
         var dependencies = findAllDependencies(instance.id, idConditionListMap);
-        // console.log('当前组件所依赖项: ', dependencies);
         var currentDependenciesMappingComponent = _toConsumableArray(new Set(dependencies.concat(instance.id))).reduce(function (cur, nxt) {
           var _findValueDependencie, _findValueDependencie2;
           var mappingDependencies = (_findValueDependencie = findValueDependencies(nxt, mappingConfig.config)) === null || _findValueDependencie === void 0 ? void 0 : (_findValueDependencie2 = _findValueDependencie.dependencies) === null || _findValueDependencie2 === void 0 ? void 0 : _findValueDependencie2.map(function (item) {
@@ -1341,9 +1368,6 @@ var FormRender = function FormRender(props, ref) {
           cur = cur.concat(mappingDependencies);
           return cur;
         }, []);
-        // console.log('当前组件所依赖项+值映射依赖项: ', currentDependenciesMappingComponent);
-        // console.groupEnd();
-        // 需要增加显隐处理逻辑
         return /*#__PURE__*/React.createElement(Form.Item, {
           noStyle: true,
           dependencies: _toConsumableArray(new Set(dependencies.concat(currentDependenciesMappingComponent)))
@@ -1367,6 +1391,13 @@ var FormRender = function FormRender(props, ref) {
               return conditionItemResult(item, getFieldValue);
             });
           }, false);
+          console.debug(instance.name, {
+            '名字': instance.name,
+            '依赖项': _toConsumableArray(new Set(dependencies.concat(currentDependenciesMappingComponent))),
+            '显影设置': show,
+            '映射值': mappingHideComponents.includes(uniqueKey),
+            '最终状态': !show || mappingHideComponents.includes(uniqueKey)
+          });
           // TODO: 当组件的显影状态发生变化
           // TODO: 为什么不直接使用form.setFieldsValue这个API呢？handleWatchFormValueChange这个方法只会在UI层面的onChange才会促发，这里需要手动在调用一次
           if (currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] !== show) {
@@ -1558,6 +1589,18 @@ var FormRender = function FormRender(props, ref) {
     labelList: labelList,
     shopId: shopId
   }));
+  var shopNameDisabled = useMemo(function () {
+    if (isStartNodeWaiting && !look) {
+      return false;
+    }
+    if (canEditShopName && !look) {
+      return false;
+    }
+    if (look || !!workOrderId) {
+      return true;
+    }
+    return false;
+  }, [workOrderId, look, canEditShopName, isStartNodeWaiting]);
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {
@@ -1590,7 +1633,7 @@ var FormRender = function FormRender(props, ref) {
     shopList: shopList,
     handleChangeShopId: handleChangeShopId,
     hidden: !isShowShopList,
-    disabled: !!workOrderId || look
+    disabled: shopNameDisabled
   }), /*#__PURE__*/React.createElement(Form.Item, {
     name: "fixed_field_buyerOpenUid",
     hidden: true

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

@@ -9,6 +9,7 @@ interface NodeItem {
     onOpenWangWang?: (nick: string, id: string) => void;
     onJumpPage?: (val: any) => void;
     queryRemarkList: () => void;
+    updateShopId?: () => void;
     openCloseCallback?: () => void;
     handler: string;
     canWithdraw: boolean;