From cc8de75eb4c6950dfeadf7967ce6f96894c22179 Mon Sep 17 00:00:00 2001
From: yaoyn <cyyz58@163.com>
Date: Thu, 23 Jan 2025 16:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E7=89=88=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20=E6=B5=81=E7=A8=8B=E5=9B=BE=E8=8A=82=E7=82=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/components/flow/FormInformation.vue  | 48 ++++++++++++-------
 .../components/flow/ProcessInformation.vue    |  2 +-
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/views/workflow/task/components/flow/FormInformation.vue b/src/views/workflow/task/components/flow/FormInformation.vue
index 91d8038..9b29162 100644
--- a/src/views/workflow/task/components/flow/FormInformation.vue
+++ b/src/views/workflow/task/components/flow/FormInformation.vue
@@ -27,23 +27,27 @@
       <div class="form-right" :style="{ paddingLeft: formRight }">
         <div v-for="(item, index) in forms.configs" :key="index" :tab="item.formName">
           <div v-show="activeIndex == index">
-            <SystemForm
-              class="form-box"
-              v-if="item.formType == FormType.SYSTEM"
-              :systemComponent="item.systemComponent"
-              :isViewProcess="props.disabled"
-              :formModel="item.formModel"
-              :workflowConfig="item"
-              :ref="setItemRef"
-            />
-            <SimpleForm
-              v-else-if="item.formType == FormType.CUSTOM"
-              class="form-box"
-              :ref="setItemRef"
-              :formProps="item.formProps"
-              :formModel="item.formModel"
-              :isWorkFlow="true"
-            />
+              <div class="page-bg-wrap">
+                <div class="top-toolbar">
+                    <SystemForm
+                      class="form-box"
+                      v-if="item.formType == FormType.SYSTEM"
+                      :systemComponent="item.systemComponent"
+                      :isViewProcess="props.disabled"
+                      :formModel="item.formModel"
+                      :workflowConfig="item"
+                      :ref="setItemRef"
+                    />
+                    <SimpleForm
+                      v-else-if="item.formType == FormType.CUSTOM"
+                      class="form-box"
+                      :ref="setItemRef"
+                      :formProps="item.formProps"
+                      :formModel="item.formModel"
+                      :isWorkFlow="true"
+                    />
+                </div>
+              </div>
           </div>
         </div>
       </div>
@@ -469,4 +473,14 @@
       padding-top: 20px;
     }
   }
+
+  .page-bg-wrap {
+      background-color: #fff;
+  }
+
+  .top-toolbar {
+      min-height: 44px;
+      margin-bottom: 12px;
+      border-bottom: 1px solid #eee;
+  }
 </style>
diff --git a/src/views/workflow/task/components/flow/ProcessInformation.vue b/src/views/workflow/task/components/flow/ProcessInformation.vue
index 60b4e92..1c0082d 100644
--- a/src/views/workflow/task/components/flow/ProcessInformation.vue
+++ b/src/views/workflow/task/components/flow/ProcessInformation.vue
@@ -2,7 +2,7 @@
     <div style="margin:20px;">
         当前流程审批人：{{currentTaskAssigneeNames.replaceAll(",","、")}}
     </div>
-    <div style="margin:20px;">
+    <div style="margin:20px;" v-if="currentTaskAssignees">
         节点审批人：
         <div v-for="(assignees,taskKey) in currentTaskAssignees" :key="taskKey">
             <span>{{assignees[0].taskName}}{{currentTaskInfo?.taskDefinitionKey==taskKey?'（当前审批节点）':''}}：</span>