fix

apps/web-ele/src/views/workflow/components/approval-details.vue

@@ -3,9 +3,6 @@
 动态渲染要显示的内容 需要再flowDescripionsMap先定义好组件
 -->
 <script setup lang="ts">
-import type { FlowComponentsMapMapKey } from '../register';
-
-import type { FlowInfoResponse } from '#/api/workflow/instance/model';
 import type { TaskInfo } from '#/api/workflow/task/model';
 
 import { ApprovalTimeline } from '.';
@@ -17,7 +14,6 @@ defineOptions({
 });
 
 defineProps<{
-  currentFlowInfo: FlowInfoResponse;
   task: TaskInfo;
 }>();
 </script>
@@ -28,10 +24,11 @@ defineProps<{
      动态渲染要显示的内容 需要再flowDescripionsMap先定义好组件
      business-id为业务ID 必传
     -->
+    <!-- <component :is="flowComponentsMap[task.formPath as FlowComponentsMapMapKey]" :business-id="task.businessId" /> -->
     <component
-      :is="flowComponentsMap[task.formPath as FlowComponentsMapMapKey]"
-      :business-id="task.businessId"
+      :is="flowComponentsMap['/workflow/leaveEdit/index']"
+      :task="task"
     />
-    <ApprovalTimeline :list="currentFlowInfo.list" />
+    <ApprovalTimeline :id="task.id" />
   </div>
 </template>

apps/web-ele/src/views/workflow/components/approval-panel.vue

@@ -19,13 +19,10 @@ import { CopyDocument } from '@element-plus/icons-vue';
 import { useClipboard } from '@vueuse/core';
 import { ElCard, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
-import { flowInfo } from '#/api/workflow/instance';
-import { getTaskByTaskId } from '#/api/workflow/task';
 import { renderDict } from '#/utils/render';
 
 import { FlowActions } from './actions';
 import ApprovalDetails from './approval-details.vue';
-import FlowPreview from './flow-preview.vue';
 
 defineOptions({
   name: 'ApprovalPanel',
@@ -158,7 +155,9 @@ async function handleCopy(text: string) {
             <div class="text-2xl font-bold">
               {{ task.orderNo }}
             </div>
-            <el-icon @click="() => handleCopy(task.orderNo)"><CopyDocument /></el-icon>
+            <el-icon @click="() => handleCopy(task.orderNo)">
+              <CopyDocument />
+            </el-icon>
             <div>
               <component
                 :is="renderDict(task.status, DictEnum.TICKET_STATUS)"
@@ -197,9 +196,9 @@ async function handleCopy(text: string) {
             />
           </ElTabPane>
 
-          <ElTabPane key="2" label="审批流程图">
+          <!-- <ElTabPane key="2" label="审批流程图">
             <FlowPreview :instance-id="currentFlowInfo.instanceId" />
-          </ElTabPane>
+          </ElTabPane> -->
         </ElTabs>
       </div>
 
@@ -219,4 +218,3 @@ async function handleCopy(text: string) {
     </slot>
   </div>
 </template>
-

apps/web-ele/src/views/workflow/components/approval-timeline.vue

@@ -1,19 +1,37 @@
 <script setup lang="ts">
-import type { Flow } from '#/api/workflow/instance/model';
+import { onMounted, shallowRef } from 'vue';
+
+import { ElEmpty, ElMessage, ElTimeline } from 'element-plus';
+
+import { requestClient } from '#/api/request';
 
-// import { Empty, Timeline } from 'ant-design-vue';
 import ApprovalTimelineItem from './approval-timeline-item.vue';
 
 interface Props {
-  list: Flow[];
+  id: string;
 }
 
-defineProps<Props>();
+const props = defineProps<Props>();
+const list = shallowRef([]);
+
+onMounted(async () => {
+  if (!props.id) return;
+
+  try {
+    const resp = await requestClient.get('/workOrderRecord/record/list', {
+      params: { orderId: props.id },
+    });
+    list.value = resp.data;
+    console.log(resp.data);
+  } catch {
+    ElMessage.error('获取工单记录失败');
+  }
+});
 </script>
 
 <template>
-  <Timeline v-if="list.length > 0">
+  <ElTimeline v-if="id">
     <ApprovalTimelineItem v-for="item in list" :key="item.id" :item="item" />
-  </Timeline>
-  <Empty v-else />
+  </ElTimeline>
+  <ElEmpty v-else />
 </template>

apps/web-ele/src/views/workflow/leave/api/model.d.ts

@@ -7,11 +7,41 @@ export interface LeaveVO {
   id: number | string;
 
   /**
+   * 工单类型
+   */
+  ticketTypeName: string;
+
+  /**
+   * 场站名称
+   */
+  stationName: string;
+
+  /**
+   * 填报内容
+   */
+  content: string;
+
+  /**
+   * 附件
+   */
+  attachment: string;
+
+  /**
    * 请假类型
    */
   leaveType: string;
 
   /**
+   * 联系人
+   */
+  contact: string;
+
+  /**
+   * 联系电话
+   */
+  phone: string;
+
+  /**
    * 开始时间
    */
   startDate: string;
@@ -32,7 +62,7 @@ export interface LeaveVO {
   remark: string;
 
   /**
-   *
+   * 状态 0：草稿 1：已提交 2：已同意 3：已拒绝
    */
   status: string;
   applyCode?: string;

apps/web-ele/src/views/workflow/leave/leave-description.vue

@@ -1,32 +1,20 @@
 <script setup lang="ts">
 import type { LeaveVO } from '../leave/api/model';
 
-import { computed, onMounted, shallowRef } from 'vue';
+import { onMounted, shallowRef } from 'vue';
 
-import { Descriptions, DescriptionsItem, Skeleton } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
-import { leaveInfo } from './api';
-import { leaveTypeOptions } from './data';
-
 defineOptions({
   name: 'LeaveDescription',
   inheritAttrs: false,
 });
 
-const props = defineProps<{ businessId: number | string }>();
+const props = defineProps<{ task: LeaveVO }>();
 
 const data = shallowRef<LeaveVO>();
 onMounted(async () => {
-  const resp = await leaveInfo(props.businessId);
-  data.value = resp;
-});
-
-const leaveType = computed(() => {
-  return (
-    leaveTypeOptions.find((item) => item.value === data.value?.leaveType)
-      ?.label ?? '未知'
-  );
+  data.value = props.task;
 });
 
 function formatDate(date: string) {
@@ -36,21 +24,27 @@ function formatDate(date: string) {
 
 <template>
   <div class="rounded-[6px] border p-2">
-    <Descriptions v-if="data" :column="1" size="middle">
-      <DescriptionsItem label="请假类型">
-        {{ leaveType }}
-      </DescriptionsItem>
-      <DescriptionsItem label="请假时间">
-        {{ formatDate(data.startDate) }} - {{ formatDate(data.endDate) }}
-      </DescriptionsItem>
-      <DescriptionsItem label="请假时长">
-        {{ data.leaveDays }}天
-      </DescriptionsItem>
-      <DescriptionsItem label="请假原因">
-        {{ data.remark || '无' }}
-      </DescriptionsItem>
-    </Descriptions>
-
-    <Skeleton active v-else />
+    <ElDescriptions v-if="data" :column="1">
+      <ElDescriptionsItem label="工单类型：">
+        {{ data.ticketTypeName }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="场站：">
+        {{ data.stationName || '无' }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="联系人：">
+        {{ data.contact || '无' }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="联系电话：">
+        {{ data.phone || '无' }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="提报内容：">
+        {{ data.content || '无' }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="附件：">
+        {{ data.attachment || '无' }}
+      </ElDescriptionsItem>
+    </ElDescriptions>
+
+    <ElSkeleton active v-else :rows="4" />
   </div>
 </template>

apps/web-ele/src/views/workflow/register.ts

@@ -1,3 +1,5 @@
+import { defineAsyncComponent, markRaw } from 'vue';
+
 /**
  * 这里定义流程描述组件
  */
@@ -13,7 +15,7 @@ export const flowComponentsMap = {
   /**
    * 请假申请 详情
    */
-  '/workflow/leaveEdit/index': null,
+  '/workflow/leaveEdit/index': markRaw(LeaveDescription),
 };
 
 export type FlowComponentsMapMapKey = keyof typeof flowComponentsMap;