Merge branch 'main' of https://fcd.gdyditc.com/itc/GAS-SCM/front into main

# Conflicts:
#	.env.development
#	.env.production
#	Dockerfile
#	docs/index.html
#	package.json
#	src/api/system/login/index.ts
#	src/api/system/subSystem/index.ts
#	src/components/SecondDev/OpinionDialog.vue
#	src/layouts/default/header/MultipleHeader.vue
#	src/layouts/default/sider/index.vue
#	src/model/workflow/workflowConfig.ts
#	src/router/guard/paramMenuGuard.ts
#	src/router/guard/permissionGuard.ts
#	src/store/modules/permission.ts
#	src/utils/env.ts
#	src/utils/http/axios/Axios.ts
#	src/utils/http/axios/index.ts
#	src/views/secondDev/Login.vue
#	src/views/secondDev/LoginForm.vue
#	src/views/secondDev/approveFlowPage.vue
#	src/views/system/loginSetting/loginInfo.vue
#	src/views/workflow/design/bpmn/components/BasicPanel.vue
#	src/views/workflow/design/bpmn/config/propertyConfig.ts
#	src/views/workflow/design/bpmn/config/sequenceConfig.ts
#	src/views/workflow/design/bpmn/panel/SequenceFlow.vue
#	src/views/workflow/design/bpmn/panel/User.vue
#	src/views/workflow/task/ProcessMonitor.vue
#	src/views/workflow/task/components/flow/ProcessInformation.vue
#	yarn.lock

src/api/system/subSystem/index.ts

@@ -11,11 +11,10 @@ enum Api {
 /**
  * @description: 查询当前用户授权子系统(不分页包括主系统)
  */
-export async function getSubSystemList(params,mode: ErrorMessageMode = 'modal') {
+export async function getSubSystemList(mode: ErrorMessageMode = 'modal') {
   return defHttp.get<any[]>(
     {
       url: Api.List,
-      params
     },
     {
       errorMessageMode: mode,

src/components/SecondDev/OpinionDialog.vue

@@ -81,7 +81,11 @@
     }
 
     function getNextNodesName() {
+<<<<<<< HEAD
         return flowNextNodes.value.length > 1 ? '多个节点，请选择流向节点' : flowNextNodes?.value[0]?.activityName;
+=======
+        return flowNextNodes.value.length > 1 ? '多个并行节点' : flowNextNodes.value[0].activityName;
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
     }
 
     function toggleDialog({ isClose, action, callback, rejectCancel, processId, taskId, nextNodes } = {}) {
@@ -104,7 +108,10 @@
             const nNode = nextNodes[0];
             //formState.nextNodeName = nNode.activityName;
             isEnd.value = nNode.isEnd;
+<<<<<<< HEAD
             const typeCount = nextNodes.length <= 1 ? nextNodes.length : (new Set(nextNodes.map(nNode => nNode.nodeType))).size;
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
             nextNodes.forEach((nNode) => {
                 if (!nNode.userList?.length) {
                     return;
@@ -127,6 +134,7 @@
                     nNode.assignees = nNode.userList.map((item) => item['F_UserId']);
                 }
                 nNode.chooseAssign = nNode.chooseAssign;
+<<<<<<< HEAD
 
                 if (nNode.nodeType === 'commitToNode') {
                     nNode.nodeTypeLabel = '提交到退回节点:';
@@ -144,6 +152,8 @@
                         nNode.hiddenNode = false;
                     }
                 }
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
             });
             flowNextNodes.value = nextNodes;
         }
@@ -152,6 +162,7 @@
         }
     }
 
+<<<<<<< HEAD
     function agreeNodeChange(node) {
         if (node.chooseNode) {
             // 如果是必选并行节点，取消选择时，警告并返回
@@ -189,6 +200,8 @@
 
     }
 
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
     function search(inputValue, option){
         return inputValue?(option.item.F_Account.indexOf(inputValue)>-1||option.item.F_RealName.indexOf(inputValue)>-1):true;
     }
@@ -230,6 +243,7 @@
     function onClickOK() {
         const nextTaskUser = {};
         if (_action.value === 'agree' && !isEnd.value) {
+<<<<<<< HEAD
             // 如果是同意，并且没有选择节点 报错
             const choose = flowNextNodes.value.find((node) => (node.chooseNode));
             if (!choose) {
@@ -241,6 +255,13 @@
                 return message.error('请选择审批人');
             }
             flowNextNodes.value.filter((node)=>node.chooseNode).forEach((nNode) => {
+=======
+            const isEmpty = flowNextNodes.value.find((node) => !node.assignees?.length);
+            if (isEmpty) {
+                return message.error('请选择审批人');
+            }
+            flowNextNodes.value.forEach((nNode) => {
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
                 nextTaskUser[nNode.activityId] = isEnd.value ? '' : (typeof(nNode.assignees) == 'string' ? nNode.assignees : nNode.assignees.join(','));
             });
         }
@@ -286,6 +307,7 @@
 </script>
 
 <style lang="less" scoped>
+<<<<<<< HEAD
 .dialog-wrap {
     padding: 10px 15px 0 0;
 }
@@ -311,4 +333,9 @@
     font-weight: 600;
     vertical-align: top;
 }
+=======
+    .dialog-wrap {
+        padding: 10px 15px 0 0;
+    }
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
 </style>