fix

apps/web-ele/src/views/workflow/components/actions/flow-actions.vue

@@ -3,19 +3,21 @@ import type { ApprovalType } from '../type';
 
 import type { TaskInfo } from '#/api/workflow/task/model';
 
-import { computed, ref } from 'vue';
+import { computed, ref, reactive } from 'vue';
 
 import { cn } from '@vben/utils';
 
-import { ElButton, ElDrawer, ElMessageBox, ElSpace } from 'element-plus';
+import { UploadFilled } from '@element-plus/icons-vue';
+import { ElButton, ElDrawer, ElForm, ElFormItem, ElInput, ElMessage, ElUpload, ElMessageBox, ElSpace, ElTreeSelect, ElSelect, ElOption } from 'element-plus';
 
 import {
   backProcess,
-  completeTask,
   deleteOrder,
   submitOrder,
   taskOperation,
 } from '#/api/workflow/task';
+import { requestClient } from '#/api/request';
+import { getSingleImageUploadConfig } from '#/components/upload/config';
 import CreatOrder from '#/views/workflow/order/creatOrder.vue';
 
 interface Props {
@@ -24,6 +26,10 @@ interface Props {
    */
   task?: TaskInfo;
   /**
+   * 工单详情
+   */
+  workOrderDetail?: any;
+  /**
    * 审批类型 根据不同类型显示按钮
    */
   type: ApprovalType;
@@ -56,6 +62,36 @@ const editableAndRemoveable = computed(() => {
 const drawerVisible = ref(false);
 const drawerId = ref<string>('');
 
+// 处理工单的抽屉
+const handleDrawerVisible = ref(false);
+const handleFormData = reactive({
+  attachments: '',
+  processContent: '',
+  taskId: '',
+});
+const handleFileList = ref([]);
+
+// 延时申请的抽屉
+const delayDrawerVisible = ref(false);
+const delayFormData = reactive({
+  applyFile: '',
+  delayDuration: 0,
+  delayReason: '',
+  taskId: 0,
+});
+const delayFileList = ref([]);
+
+// 抄送的抽屉
+const ccDrawerVisible = ref(false);
+const ccFormData = reactive({
+  ccUserIds: '',
+  taskId: 0,
+});
+const deptTree = ref([]);
+const userList = ref([]);
+const selectedDeptId = ref('');
+const selectedUsers = ref([]);
+
 // 编辑
 const handleEdit = () => {
   drawerId.value = props.task!.id;
@@ -80,6 +116,72 @@ const handleDrawerClosed = () => {
   drawerId.value = '';
 };
 
+// 上传成功回调
+const handleUploadSuccess = (response, file, fileList) => {
+  if (response.code === 200) {
+    // 将文件路径添加到attachments字段
+    const paths = fileList.map((f) => f.response.data.fileName).join(',');
+    handleFormData.attachments = paths;
+  } else {
+    ElMessage.error('文件上传失败');
+  }
+};
+
+// 上传失败回调
+const handleUploadError = (error) => {
+  ElMessage.error('文件上传失败');
+  console.error('文件上传失败:', error);
+};
+
+// 移除文件回调
+const handleFileRemove = (file, fileList) => {
+  // 更新attachments字段（文件名）
+  const fileNames = fileList.map((f) => f.response.data.fileName).join(',');
+  handleFormData.attachments = fileNames;
+};
+
+// 延时申请上传成功回调
+const handleDelayUploadSuccess = (response, file, fileList) => {
+  if (response.code === 200) {
+    // 将文件路径添加到applyFile字段
+    const paths = fileList.map((f) => f.response.data.fileName).join(',');
+    delayFormData.applyFile = paths;
+  } else {
+    ElMessage.error('附件上传失败');
+  }
+};
+
+// 延时申请移除文件回调
+const handleDelayFileRemove = (file, fileList) => {
+  // 更新applyFile字段（文件名）
+  const fileNames = fileList.map((f) => f.response.data.fileName).join(',');
+  delayFormData.applyFile = fileNames;
+};
+
+// 处理工单提交
+async function handleSubmitForm() {
+  try {
+    // 验证处理内容
+    if (!handleFormData.processContent.trim()) {
+      ElMessage.error('请输入处理内容');
+      return;
+    }
+
+    // 调用处理接口
+    await requestClient.put('/workOrder/order/handle', handleFormData);
+    ElMessage.success('工单处理成功');
+
+    // 关闭抽屉
+    handleDrawerVisible.value = false;
+
+    // 重新加载数据
+    emit('reload');
+  } catch (error) {
+    ElMessage.error('工单处理失败');
+    console.error('工单处理失败:', error);
+  }
+}
+
 // 删除
 function handleRemove() {
   ElMessageBox.confirm('确定删除该工单吗？', '提示', {
@@ -87,8 +189,7 @@ function handleRemove() {
     cancelButtonText: '取消',
     type: 'warning',
     center: true,
-  })
-    .then(async () => {
+  }).then(async () => {
       await deleteOrder([props.task!.id]);
       emit('reload');
     })
@@ -116,71 +217,148 @@ async function handleSubmit() {
 }
 
 // 处理
-async function handleApprove() {
+function handleApprove() {
+  // 重置表单数据
+  handleFormData.attachments = '';
+  handleFormData.processContent = '';
+  handleFormData.taskId = props.task!.taskId;
+  handleFileList.value = [];
+  
+  // 打开抽屉
+  handleDrawerVisible.value = true;
+}
+
+// 延时
+function handleDelay() {
+  // 重置表单数据
+  delayFormData.taskId = props.task!.taskId;
+  delayFormData.applyFile = '';
+  delayFormData.delayDuration = 0;
+  delayFormData.delayReason = '';
+  delayFileList.value = [];
+  
+  // 打开抽屉
+  delayDrawerVisible.value = true;
+}
+
+// 抄送
+function handleCopy() {
+  // 重置表单数据
+  ccFormData.taskId = props.task!.taskId;
+  ccFormData.ccUserIds = '';
+  selectedDeptId.value = '';
+  selectedUsers.value = [];
+  userList.value = [];
+  
+  // 加载部门树
+  loadDeptTree();
+  
+  // 打开抽屉
+  ccDrawerVisible.value = true;
+}
+
+// 加载部门树
+async function loadDeptTree() {
   try {
-    await ElMessageBox.confirm('确定要处理该工单吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      center: true,
-    });
-    await completeTask({
-      taskId: props.task!.taskId,
-      taskVariables: {},
-      variables: {},
-      assigneeMap: {},
-      messageType: [],
-      flowCopyList: [],
-    });
-    emit('reload');
-  } catch {
-    // 用户取消操作，不做任何处理
-    console.log('用户取消了处理操作');
+    const response = await requestClient.get('/system/user/deptTree');
+    if (response.code === 200) {
+      deptTree.value = response.data;
+    } else {
+      ElMessage.error('加载部门树失败');
+    }
+  } catch (error) {
+    ElMessage.error('加载部门树失败');
+    console.error('加载部门树失败:', error);
   }
 }
 
-// 延时
-async function handleDelay() {
+// 加载人员列表
+async function loadUserList(deptId) {
   try {
-    await ElMessageBox.confirm('确定要延时处理该工单吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      center: true,
-    });
-    await taskOperation(
-      {
-        taskId: props.task!.taskId,
-      },
-      'delegateTask',
-    );
+    const response = await requestClient.get(`/system/user/list?deptId=${deptId}&pageNum=1&pageSize=20`);
+    if (response.code === 200) {
+      userList.value = response.data.list || [];
+    } else {
+      ElMessage.error('加载人员列表失败');
+    }
+  } catch (error) {
+    ElMessage.error('加载人员列表失败');
+    console.error('加载人员列表失败:', error);
+  }
+}
+
+// 部门选择变化回调
+async function handleDeptChange(deptId) {
+  if (deptId) {
+    // 加载该部门下的人员
+    await loadUserList(deptId);
+  } else {
+    // 清空人员列表和选择
+    userList.value = [];
+    selectedUsers.value = [];
+    ccFormData.ccUserIds = '';
+  }
+}
+
+// 人员选择变化回调
+function handleUserChange(users) {
+  // 更新ccUserIds字段（用逗号分隔）
+  ccFormData.ccUserIds = users.join(',');
+}
+
+// 延时申请提交
+async function handleDelaySubmit() {
+  try {
+    // 验证表单
+    if (!delayFormData.delayReason.trim()) {
+      ElMessage.error('请输入延时原因');
+      return;
+    }
+    if (!delayFormData.delayDuration || delayFormData.delayDuration < 1) {
+      ElMessage.error('请输入有效的延时时长(至少1小时)');
+      return;
+    }
+    
+    // 调用延时API
+    await requestClient.put('/workOrder/order/delay', delayFormData);
+    ElMessage.success('延时申请提交成功');
+    
+    // 关闭抽屉
+    delayDrawerVisible.value = false;
+    
+    // 重新加载数据
     emit('reload');
-  } catch {
-    // 用户取消操作，不做任何处理
-    console.log('用户取消了延时操作');
+  } catch (error) {
+    ElMessage.error('延时申请提交失败');
+    console.error('延时申请失败:', error);
   }
 }
 
-// 抄送
-async function handleCopy() {
+// 抄送提交
+async function handleCCSubmit() {
   try {
-    await ElMessageBox.confirm('确定要抄送该工单吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      center: true,
-    });
-    await taskOperation(
-      {
-        taskId: props.task!.taskId,
-        userIds: [],
-      },
-      'addSignature',
-    );
+    // 验证表单
+    if (!selectedDeptId.value) {
+      ElMessage.error('请选择部门');
+      return;
+    }
+    if (!selectedUsers.value || selectedUsers.value.length === 0) {
+      ElMessage.error('请选择人员');
+      return;
+    }
+    
+    // 调用抄送API
+    await requestClient.put('/workOrder/order/cc', ccFormData);
+    ElMessage.success('抄送成功');
+    
+    // 关闭抽屉
+    ccDrawerVisible.value = false;
+    
+    // 重新加载数据
     emit('reload');
-  } catch {
-    // 用户取消操作，不做任何处理
-    console.log('用户取消了抄送操作');
+  } catch (error) {
+    ElMessage.error('抄送失败');
+    console.error('抄送失败:', error);
   }
 }
 
@@ -203,21 +381,9 @@ async function handleBack() {
   }
 }
 
-// 获取可用按钮
-const availableButtons = computed(() => {
-  if (!props.task || !props.task.button) {
-    return [];
-  }
-  return props.task.button.split(',');
-});
 
-// 检查按钮是否显示
-const showButton = (buttonType: string) => {
-  // 同时检查 availableButtons 和 buttonPermissions
-  const isInButtonList = availableButtons.value.includes(buttonType);
-  const hasPermission = !props.buttonPermissions || props.buttonPermissions[buttonType] !== false;
-  return isInButtonList && hasPermission;
-};
+
+
 </script>
 
 <template>
@@ -234,7 +400,6 @@ const showButton = (buttonType: string) => {
       <ElSpace v-if="type === 'myself'">
         <ElButton
           type="primary"
-          text
           v-if="buttonPermissions?.edit || editableAndRemoveable"
           @click="handleEdit"
         >
@@ -242,9 +407,7 @@ const showButton = (buttonType: string) => {
         </ElButton>
         <ElButton
           v-if="buttonPermissions?.delete || editableAndRemoveable"
-          danger
-          text
-          type="primary"
+          type="danger"
           @click="handleRemove"
         >
           删除
@@ -253,7 +416,6 @@ const showButton = (buttonType: string) => {
         <ElButton
           v-if="buttonPermissions?.submit"
           type="primary"
-          text
           @click="handleSubmit"
         >
           提交
@@ -263,23 +425,23 @@ const showButton = (buttonType: string) => {
       <!-- 审批操作按钮 -->
       <ElSpace v-if="type === 'waiting'">
         <ElButton
-          v-if="showButton('handle')"
+          v-if="buttonPermissions?.handle"
           type="primary"
           @click="handleApprove"
         >
           处理
         </ElButton>
         <ElButton
-          v-if="showButton('delay')"
+          v-if="buttonPermissions?.delay"
           type="warning"
           @click="handleDelay"
         >
           延时
         </ElButton>
-        <ElButton v-if="showButton('cc')" type="info" @click="handleCopy">
+        <ElButton v-if="buttonPermissions?.cc" type="info" @click="handleCopy">
           抄送
         </ElButton>
-        <ElButton v-if="showButton('back')" danger @click="handleBack">
+        <ElButton v-if="buttonPermissions?.back" danger @click="handleBack">
           退回
         </ElButton>
       </ElSpace>
@@ -295,12 +457,184 @@ const showButton = (buttonType: string) => {
     @close="handleDrawerClosed"
     @closed="handleDrawerClosed"
   >
-    <div class="drawer-content">
+    <div class="drawer-content pb-20">
       <CreatOrder
         :id="drawerId"
         ref="creatOrderRef"
         @close="handleCloseDrawer"
       />
     </div>
+    <div class="absolute bottom-0 left-0 right-0 border-t border-gray-200 p-4 bg-white">
+      <div class="flex justify-end space-x-2">
+        <ElButton @click="drawerVisible = false">取消</ElButton>
+        <ElButton type="primary" @click="handleConfirmEdit">保存</ElButton>
+      </div>
+    </div>
+  </ElDrawer>
+
+  <!-- 处理工单的抽屉组件 -->
+  <ElDrawer
+    v-model="handleDrawerVisible"
+    title="处理工单"
+    width="800px"
+    :close-on-click-modal="false">
+    <div class="drawer-content p-4 pb-20">
+      <ElForm
+        :model="handleFormData"
+        label-width="120px"
+        class="handle-order-form"
+      >
+        <!-- 处理内容 -->
+        <ElFormItem label="处理内容" required>
+          <ElInput
+            v-model="handleFormData.processContent"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入处理内容"
+          />
+        </ElFormItem>
+
+        <!-- 处理附件 -->
+        <ElFormItem label="处理附件">
+          <ElUpload
+            :file-list="handleFileList"
+            :action="getSingleImageUploadConfig().action"
+            :headers="getSingleImageUploadConfig().headers"
+            :on-success="handleUploadSuccess"
+            :on-error="handleUploadError"
+            :on-remove="handleFileRemove"
+            list-type="picture-card"
+            multiple
+            :limit="5"
+          >
+            <UploadFilled />
+            <template #tip>
+              <div class="el-upload__tip">
+                支持上传图片格式文件，最多5个，多个文件用逗号分隔
+              </div>
+            </template>
+          </ElUpload>
+        </ElFormItem>
+      </ElForm>
+    </div>
+    <div class="absolute bottom-0 left-0 right-0 border-t border-gray-200 p-4 bg-white">
+      <div class="flex justify-end space-x-2">
+        <ElButton @click="handleDrawerVisible = false">取消</ElButton>
+        <ElButton type="primary" @click="handleSubmitForm">提交</ElButton>
+      </div>
+    </div>
+  </ElDrawer>
+
+  <!-- 延时申请的抽屉组件 -->
+  <ElDrawer
+    v-model="delayDrawerVisible"
+    title="延时申请"
+    width="800px"
+    :close-on-click-modal="false">
+    <div class="drawer-content p-4 pb-20">
+      <ElForm
+        :model="delayFormData"
+        label-width="120px"
+        class="delay-order-form"
+      >
+        <!-- 延时原因 -->
+        <ElFormItem label="延时原因" required>
+          <ElInput
+            v-model="delayFormData.delayReason"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入延时原因"
+          />
+        </ElFormItem>
+
+        <!-- 延时时长 -->
+        <ElFormItem label="延时时长(小时)" required>
+          <ElInput
+            v-model.number="delayFormData.delayDuration"
+            type="number"
+            placeholder="请输入延时时长"
+            min="1"
+          />
+        </ElFormItem>
+
+        <!-- 申请附件 -->
+        <ElFormItem label="申请附件">
+          <ElUpload
+            :file-list="delayFileList"
+            :action="getSingleImageUploadConfig().action"
+            :headers="getSingleImageUploadConfig().headers"
+            :on-success="handleDelayUploadSuccess"
+            :on-error="handleUploadError"
+            :on-remove="handleDelayFileRemove"
+            list-type="picture-card"
+            multiple
+            :limit="5"
+          >
+            <UploadFilled />
+            <template #tip>
+              <div class="el-upload__tip">
+                支持上传图片格式文件，最多5个，多个文件用逗号分隔
+              </div>
+            </template>
+          </ElUpload>
+        </ElFormItem>
+      </ElForm>
+    </div>
+    <div class="absolute bottom-0 left-0 right-0 border-t border-gray-200 p-4 bg-white">
+      <div class="flex justify-end space-x-2">
+        <ElButton @click="delayDrawerVisible = false">取消</ElButton>
+        <ElButton type="primary" @click="handleDelaySubmit">提交</ElButton>
+      </div>
+    </div>
+  </ElDrawer>
+
+  <!-- 抄送的抽屉组件 -->
+  <ElDrawer
+    v-model="ccDrawerVisible"
+    title="抄送"
+    width="800px"
+    :close-on-click-modal="false">
+    <div class="drawer-content p-4 pb-20">
+      <ElForm
+        :model="ccFormData"
+        label-width="120px"
+        class="cc-order-form"
+      >
+        <!-- 部门选择 -->
+        <ElFormItem label="选择部门" required>
+          <ElTreeSelect
+            v-model="selectedDeptId"
+            :data="deptTree"
+            node-key="id"
+            :props="{ label: 'label', children: 'children' }"
+            placeholder="请选择部门"
+            @change="handleDeptChange"
+          />
+        </ElFormItem>
+
+        <!-- 人员选择 -->
+        <ElFormItem label="选择人员" required>
+          <ElSelect
+            v-model="selectedUsers"
+            multiple
+            placeholder="请选择人员"
+            @change="handleUserChange"
+          >
+            <ElOption
+              v-for="user in userList"
+              :key="user.id"
+              :label="user.nickname || user.username"
+              :value="user.id"
+            />
+          </ElSelect>
+        </ElFormItem>
+      </ElForm>
+    </div>
+    <div class="absolute bottom-0 left-0 right-0 border-t border-gray-200 p-4 bg-white">
+      <div class="flex justify-end space-x-2">
+        <ElButton @click="ccDrawerVisible = false">取消</ElButton>
+        <ElButton type="primary" @click="handleCCSubmit">提交</ElButton>
+      </div>
+    </div>
   </ElDrawer>
 </template>

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

@@ -14,7 +14,8 @@ defineOptions({
 });
 
 defineProps<{
-  task: TaskInfo;
+  task?: TaskInfo;
+  workOrderDetail?: any;
 }>();
 </script>
 
@@ -27,8 +28,8 @@ defineProps<{
     <!-- <component :is="flowComponentsMap[task.formPath as FlowComponentsMapMapKey]" :business-id="task.businessId" /> -->
     <component
       :is="flowComponentsMap['/workflow/leaveEdit/index']"
-      :task="task"
+      :work-order-detail="workOrderDetail"
     />
-    <ApprovalTimeline :id="task.id || task.orderId" />
+    <ApprovalTimeline :id="workOrderDetail?.id" />
   </div>
 </template>

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

@@ -42,6 +42,10 @@ interface Props {
    */
   task?: TaskInfo;
   /**
+   * 工单详情
+   */
+  workOrderDetail?: any;
+  /**
    * 审批类型
    */
   type: ApprovalType;
@@ -144,14 +148,14 @@ async function handleCopy(text: string) {
 <template>
   <div :class="cn('thin-scrollbar', 'flex flex-1 overflow-y-hidden')">
     <ElCard
-      v-if="task"
+      v-if="workOrderDetail"
       :body-style="{ overflowY: 'auto', height: '100%' }"
       :loading="loading"
       class="thin-scrollbar flex-1 overflow-y-hidden"
       size="small"
     >
       <template #extra>
-        <el-button size="small" @click="() => handleLoadInfo(task)">
+        <el-button size="small" @click="() => handleLoadInfo(workOrderDetail)">   
           <div class="flex items-center justify-center">
             <span class="icon-[material-symbols--refresh] size-24px"></span>
           </div>
@@ -162,36 +166,36 @@ async function handleCopy(text: string) {
         <div class="flex flex-col gap-3">
           <div class="flex items-center gap-2">
             <div class="text-2xl font-bold">
-              {{ task.orderNo }}
+              {{ workOrderDetail.orderNo }}
             </div>
-            <el-icon @click="() => handleCopy(task.orderNo)">
+            <el-icon @click="() => handleCopy(workOrderDetail.orderNo)">
               <CopyDocument />
             </el-icon>
             <div>
               <component
-                :is="renderDict(task.status, DictEnum.TICKET_STATUS)"
+                :is="renderDict(workOrderDetail.status, DictEnum.TICKET_STATUS)"
               />
             </div>
           </div>
 
           <div class="flex items-center gap-2">
             <VbenAvatar
-              :alt="task?.createBy ?? ''"
+              :alt="workOrderDetail?.createBy ?? ''" 
               class="bg-primary size-[28px] rounded-full text-white"
               src=""
             />
 
-            <span>{{ task.createBy }}</span>
+            <span>{{ workOrderDetail.createBy }}</span>
 
             <div class="flex items-center opacity-50">
               <div class="flex items-center gap-1">
                 <span class="icon-[bxs--category-alt] size-[16px]"></span>
-                流程分类: {{ task.ticketTypeName }}
+                流程分类: {{ workOrderDetail.ticketTypeName }}
               </div>
 
               <div class="flex items-center gap-1">
                 <span class="icon-[mdi--clock-outline] size-[16px]"></span>
-                提交时间: {{ task.createTime }}
+                提交时间: {{ workOrderDetail.createTime }}
               </div>
             </div>
           </div>
@@ -201,7 +205,7 @@ async function handleCopy(text: string) {
           <ElTabPane key="1" label="工单详情">
             <ApprovalDetails
               :current-flow-info="currentFlowInfo"
-              :task="task"
+              :work-order-detail="workOrderDetail"
             />
           </ElTabPane>
 
@@ -217,6 +221,7 @@ async function handleCopy(text: string) {
         v-if="showFooter"
         :type="type"
         :task="task"
+        :work-order-detail="workOrderDetail"
         :button-permissions="buttonPermissions"
         @reload="$emit('reload')"
       />

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

@@ -36,11 +36,13 @@ async function loadData() {
 
 // 组件挂载时加载数据
 onMounted(() => {
+  console.log(props.id);
   loadData();
 });
 
 // 监听id属性变化，当id变化时重新加载数据
 watch(() => props.id, () => {
+  console.log(props.id);
   loadData();
 });
 </script>

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

@@ -10,7 +10,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-const props = defineProps<{ task: LeaveVO }>();
+const props = defineProps<{ workOrderDetail: LeaveVO }>();
 
 // 附件数组，使用ref存储以保持引用稳定
 const attachmentsArray = ref<string[]>([]);
@@ -21,7 +21,7 @@ const previewIndex = ref(0);
 
 // 监听附件URL变化，更新附件数组
 watchEffect(() => {
-  if (!props.task?.attachmentsUrl) {
+  if (!props.workOrderDetail?.attachmentsUrl) {
     attachmentsArray.value = [];
     return;
   }
@@ -29,12 +29,12 @@ watchEffect(() => {
   let urls: string[] = [];
   
   // 如果已经是数组，确保每个元素都是字符串
-  if (Array.isArray(props.task.attachmentsUrl)) {
-    urls = props.task.attachmentsUrl.map(item => String(item));
+  if (Array.isArray(props.workOrderDetail.attachmentsUrl)) {
+    urls = props.workOrderDetail.attachmentsUrl.map(item => String(item));
   } else {
     try {
       // 尝试解析JSON字符串
-      const parsed = JSON.parse(String(props.task.attachmentsUrl));
+      const parsed = JSON.parse(String(props.workOrderDetail.attachmentsUrl));
       if (Array.isArray(parsed)) {
         urls = parsed.map(item => String(item));
       } else {
@@ -42,7 +42,7 @@ watchEffect(() => {
       }
     } catch (e) {
       // 解析失败，将整个字符串作为单个URL
-      urls = [String(props.task.attachmentsUrl)];
+      urls = [String(props.workOrderDetail.attachmentsUrl)];
     }
   }
   
@@ -64,21 +64,21 @@ function closePreview() {
 
 <template>
   <div class="rounded-[6px] border p-2">
-    <ElDescriptions v-if="props.task" :column="1">
+    <ElDescriptions v-if="props.workOrderDetail" :column="1">
       <ElDescriptionsItem label="工单类型：">
-        {{ props.task.ticketTypeName }}
+        {{ props.workOrderDetail.ticketTypeName }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="场站：">
-        {{ props.task.stationName || '无' }}
+        {{ props.workOrderDetail.stationName || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="联系人：">
-        {{ props.task.contact || '无' }}
+        {{ props.workOrderDetail.contact || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="联系电话：">
-        {{ props.task.phone || '无' }}
+        {{ props.workOrderDetail.phone || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="提报内容：">
-        {{ props.task.content || '无' }}
+        {{ props.workOrderDetail.content || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="附件：">
         <div v-if="attachmentsArray.length > 0" class="flex flex-wrap gap-2">

apps/web-ele/src/views/workflow/task/myDocument.vue

@@ -60,7 +60,7 @@ async function reload(resetFields: boolean = false) {
   cardContainerRef.value?.scroll({ top: 0, behavior: 'auto' });
 
   page.value = 1;
-  currentTask.value = undefined;
+  currentWorkOrderDetail.value = undefined;
   taskTotal.value = 0;
   lastSelectId.value = '';
 
@@ -106,7 +106,7 @@ async function reload(resetFields: boolean = false) {
   // 默认选中第一个
   if (taskList.value.length > 0) {
     const firstTask = taskList.value[0]!;
-    currentTask.value = firstTask;
+    currentWorkOrderDetail.value = firstTask;
     handleCardClick(firstTask);
   }
 }
@@ -167,14 +167,14 @@ const handleScroll = debounce(async (e: Event) => {
 }, 200);
 
 const lastSelectId = ref('');
-const currentTask = ref<TaskInfo>();
+const currentWorkOrderDetail = ref<any>();
 async function handleCardClick(item: TaskInfo) {
   const { id } = item;
   // 点击的是同一个
   if (lastSelectId.value === id) {
     return;
   }
-  currentTask.value = item;
+  currentWorkOrderDetail.value = item;
   // 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
   taskList.value.forEach((item) => {
     item.active = item.id === id;
@@ -187,11 +187,11 @@ const { refreshTab } = useTabs();
 // 按钮权限控制
 const currentTaskButtonPermissions = computed(() => {
   // 如果没有当前任务，返回空对象
-  if (!currentTask.value) {
+  if (!currentWorkOrderDetail.value) {
     return {};
   }
   // 根据任务状态判断工单类型
-  const { status } = currentTask.value;
+  const { status } = currentWorkOrderDetail.value;
   // 初始化权限对象
   const permissions: Record<string, boolean> = {};
   // 新工单 (status: "news")
@@ -291,7 +291,7 @@ const currentTaskButtonPermissions = computed(() => {
         </div>
       </div>
       <ApprovalPanel
-        :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
         :button-permissions="currentTaskButtonPermissions"
         type="myself"
         @reload="refreshTab"

apps/web-ele/src/views/workflow/task/taskWaiting.vue

@@ -158,6 +158,7 @@ const handleScroll = debounce(async (e: Event) => {
 
 const lastSelectId = ref('');
 const currentTask = ref<TaskInfo>();
+const currentWorkOrderDetail = ref<any>();
 const currentTaskButtonData = ref<any>('');
 async function handleCardClick(item: TaskInfo) {
   const { taskId, orderId } = item;
@@ -175,8 +176,8 @@ async function handleCardClick(item: TaskInfo) {
   // 调用获取工单详情的接口
   try {
     const detail = await getWorkOrderDetail(orderId);
-    // 可以在这里使用获取到的工单详情数据
-    currentTask.value = detail;
+    // 保存工单详情
+    currentWorkOrderDetail.value = detail;
   } catch (error) {
     console.error('获取工单详情失败:', error);
     ElMessage.error('获取工单详情失败');
@@ -214,13 +215,9 @@ const currentTaskButtonPermissions = computed(() => {
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-2">
-      <div
-        class="bg-background relative flex h-full min-w-[320px] max-w-[320px] flex-col rounded-lg"
-      >
+      <div class="bg-background relative flex h-full min-w-[320px] max-w-[320px] flex-col rounded-lg">
         <!-- 搜索条件 -->
-        <div
-          class="bg-background z-100 sticky left-0 top-0 w-full rounded-t-lg border-b-[1px] border-solid p-2"
-        >
+        <div class="bg-background z-100 sticky left-0 top-0 w-full rounded-t-lg border-b-[1px] border-solid p-2" >
           <div class="grid grid-cols-1 gap-2">
             <div class="flex items-center gap-1">
               <ElInput
@@ -275,6 +272,7 @@ const currentTaskButtonPermissions = computed(() => {
       </div>
       <ApprovalPanel
         :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
         :button-permissions="currentTaskButtonPermissions"
         type="waiting"
         @reload="refreshTab"