Merge branch 'dev' into 'dev-zn'

旧版流程详情页面报错修正

See merge request itc-framework/ma/2024/front!27

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
+              <div class="page-bg-wrap">
-              class="form-box"
+                <div class="top-toolbar">
-              v-if="item.formType == FormType.SYSTEM"
+                    <SystemForm
-              :systemComponent="item.systemComponent"
+                      class="form-box"
-              :isViewProcess="props.disabled"
+                      v-if="item.formType == FormType.SYSTEM"
-              :formModel="item.formModel"
+                      :systemComponent="item.systemComponent"
-              :workflowConfig="item"
+                      :isViewProcess="props.disabled"
-              :ref="setItemRef"
+                      :formModel="item.formModel"
-            />
+                      :workflowConfig="item"
-            <SimpleForm
+                      :ref="setItemRef"
-              v-else-if="item.formType == FormType.CUSTOM"
+                    />
-              class="form-box"
+                    <SimpleForm
-              :ref="setItemRef"
+                      v-else-if="item.formType == FormType.CUSTOM"
-              :formProps="item.formProps"
+                      class="form-box"
-              :formModel="item.formModel"
+                      :ref="setItemRef"
-              :isWorkFlow="true"
+                      :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>

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>