合并冲突

src/components/DetailComponent/SummaryDetail.vue

@@ -16,6 +16,11 @@
           <span>{{ localFormData.startTime }}</span>
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="结束时间" prop="endTime">
+          <span>{{ formData.endTime }}</span>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="所属公司" prop="companyName">
           <span>{{ localFormData.companyName }}</span>
@@ -132,14 +137,22 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <div class="approval-record">
+      <baseTitle title="审批记录"></baseTitle>
+      <div class="process">
+        <operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
+                          :state="processInstanceData.state"/>
+        <process-diagram-viewer v-if="processDiagramViewer"/>
+      </div>
+    </div>
   </el-form>
 
 </template>
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
-import { watch, watchEffect } from "vue";
-
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 const props = defineProps({
   formData: {
     type: Object,