fix

apps/web-ele/src/views/oilstation/idphoto/idphoto-data.tsx

@@ -4,7 +4,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { DictEnum } from '@vben/constants';
 
 import { stationInfoList } from '#/api/system/infoEntry/stationInfo/stationInfo';
-import { getSingleImageUploadConfig } from '#/components/upload';
+import { getSingleImageUploadConfig,getFileUploadConfig } from '#/components/upload';
 // import { uploadFile } from '#/api/upload';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
@@ -352,7 +352,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     label: '证件扫描件',
     componentProps: (row: any) => {
       return {
-        ...getSingleImageUploadConfig(),
+        ...getFileUploadConfig('.pdf,.docx,.doc,.txt', 'text', 1, '/common/upload'),
         onSuccess: (res: any) => {
           if (res.code === 200) {
             row.certificateScanPath = res.data.fileName;

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

@@ -111,7 +111,7 @@ const approveDelayFormData = reactive({
 
 // 编辑
 const handleEdit = () => {
-  drawerId.value = props.task!.id;
+  drawerId.value = props.workOrderDetail!.id;
   drawerVisible.value = true;
 };
 
@@ -208,7 +208,7 @@ function handleRemove() {
     center: true,
   })
     .then(async () => {
-      await deleteOrder([props.task!.id]);
+      await deleteOrder([props.workOrderDetail!.id]);
       emit('reload');
     })
     .catch(() => {
@@ -226,7 +226,7 @@ async function handleSubmit() {
       type: 'warning',
       center: true,
     });
-    await submitOrder(props.task!.id);
+    await submitOrder(props.workOrderDetail!.id);
     emit('reload');
   } catch {
     // 用户取消操作，不做任何处理

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

@@ -31,32 +31,40 @@ function handleClick() {
 }
 
 const diffUpdateTimeString = computed(() => {
-  return getDiffTimeString(props.info.updateTime);
+  return getDiffTimeString(props.info.updateTime || props.info.createTime);
 });
 
-// 以下函数不再使用，已删除
-// // 处理数字类型的状态显示
-// function renderStatusNumber(status: number) {
-//   const statusMap = {
-//     0: { label: '待处理', color: 'warning' },
-//     1: { label: '处理中', color: 'info' },
-//     2: { label: '已处理', color: 'success' },
-//     3: { label: '已退回', color: 'danger' },
-//   };
-//   
-//   const statusInfo = statusMap[status as keyof typeof statusMap] || { label: '未知状态', color: 'default' };
-//   return <ElTag color={statusInfo.color}>{statusInfo.label}</ElTag>;
-// }
-
-// // 根据status类型选择渲染方式
-// function renderStatus() {
-//   const status = props.info.status;
-//   if (typeof status === 'number') {
-//     return renderStatusNumber(status);
-//   } else {
-//     return renderDict(status as string, DictEnum.TICKET_STATUS);
-//   }
-// }
+// 处理数字类型的状态显示
+function renderStatusNumber(status: number) {
+  const statusMap = {
+    0: { label: '待处理', type: 'warning' },
+    1: { label: '处理中', type: 'info' },
+    2: { label: '已处理', type: 'success' },
+    3: { label: '已退回', type: 'danger' },
+  };
+  
+  const statusInfo = statusMap[status as keyof typeof statusMap] || { label: '未知状态', type: 'default' };
+  return {
+    label: statusInfo.label,
+    type: statusInfo.type
+  };
+}
+
+// 处理数字类型的审批状态显示
+function renderApproveStatusNumber(approveStatus: number) {
+  const statusMap = {
+    0: { label: '未审批', type: 'info' },
+    1: { label: '已同意', type: 'success' },
+    2: { label: '已拒绝', type: 'danger' },
+    3: { label: '已废除', type: 'warning' },
+  };
+  
+  const statusInfo = statusMap[approveStatus as keyof typeof statusMap] || { label: '未知状态', type: 'default' };
+  return {
+    label: statusInfo.label,
+    type: statusInfo.type
+  };
+}
 </script>
 
 <template>
@@ -73,28 +81,26 @@ const diffUpdateTimeString = computed(() => {
       size="large"
     >
       <template #extra>
-        <!-- 根据status的类型选择不同的渲染方式 -->
-        <template v-if="typeof info.status === 'number'">
-          <ElTag
-            :color="{
-              0: 'warning',
-              1: 'info',
-              2: 'success',
-              3: 'danger'
-            }[info.status] || 'default'"
-          >
-            {{ {
-              0: '待处理',
-              1: '处理中',
-              2: '已处理',
-              3: '已退回'
-            }[info.status] || '未知状态' }}
-          </ElTag>
-        </template>
-        <component v-else :is="renderDict(info.status, DictEnum.TICKET_STATUS)" />
+        <div class="flex gap-2">
+          <!-- 根据status的类型选择不同的渲染方式 -->
+          <template v-if="typeof info.status === 'number'">
+            <ElTag :type="renderStatusNumber(info.status).type">
+              {{ renderStatusNumber(info.status).label }}
+            </ElTag>
+          </template>
+          <component v-else :is="renderDict(info.status, DictEnum.TICKET_STATUS)" />
+          
+          <!-- 显示审批状态 -->
+          <template v-if="typeof info.approveStatus === 'number'">
+            <ElTag :type="renderApproveStatusNumber(info.approveStatus).type">
+              {{ renderApproveStatusNumber(info.approveStatus).label }}
+            </ElTag>
+          </template>
+          <component v-else-if="info.approveStatus" :is="renderDict(info.approveStatus, DictEnum.TICKET_STATUS)" />
+        </div>
       </template>
       <ElDescriptionsItem>
-        <div class="font-bold">{{ info.content }}</div>
+        <div class="font-bold">{{ info.content || info.delayReason }}</div>
       </ElDescriptionsItem>
       <ElDescriptionsItem label="提交时间">
         {{ info.createTime }}
@@ -115,7 +121,7 @@ const diffUpdateTimeString = computed(() => {
         </span>
       </div>
       <div class="text-nowrap opacity-50">
-        <ElTooltip placement="top" :content="`更新时间: ${info.updateTime}`">
+        <ElTooltip placement="top" :content="`更新时间: ${info.updateTime || info.createTime}`">
           <div class="flex items-center gap-1">
             <span class="icon-[mdi--clock-outline] size-[16px]"></span>
             <span>{{ diffUpdateTimeString }}前更新</span>

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

@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import type { Flow } from '#/api/workflow/instance/model';
 
-import { computed, onMounted, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { VbenAvatar } from '@vben/common-ui';
 import { DictEnum } from '@vben/constants';
 import { cn } from '@vben/utils';
 
-import { Message, User } from '@element-plus/icons-vue';
-import { ElAvatar, ElTimelineItem } from 'element-plus';
-// import { ossInfo } from '#/api/system/oss';
+import { Message, User, Timer, Document } from '@element-plus/icons-vue';
+import { ElAvatar, ElTimelineItem, ElTag } from 'element-plus';
 import { renderDict } from '#/utils/render';
 
 defineOptions({
@@ -19,7 +18,6 @@ defineOptions({
 const props = defineProps<{ item: Flow }>();
 
 interface AttachmentInfo {
-  ossId: string;
   url: string;
   name: string;
 }
@@ -27,22 +25,43 @@ interface AttachmentInfo {
 /**
  * 处理附件信息
  */
-const attachmentInfo = ref<AttachmentInfo[]>([]);
-onMounted(async () => {
-  if (!props.item.ext) {
-    return null;
-  }
-  // const resp = await ossInfo(props.item.ext.split(','));
-  // attachmentInfo.value = resp.map((item) => ({
-  //   ossId: item.ossId,
-  //   url: item.url,
-  //   name: item.originalName,
-  // }));
+const processAttachments = computed(() => {
+  const records = props.item.workOrderProcessRecords?.[0];
+  if (!records?.attachments) return [];
+  const names = records.attachments.split(',');
+  const urls = records.attachmentsUrl || [];
+  return names.map((name, index) => ({
+    name,
+    url: urls[index] || ''
+  }));
+});
+
+const delayAttachments = computed(() => {
+  const delayData = props.item.workOrderDelay?.[0];
+  if (!delayData?.applyFile) return [];
+  const names = delayData.applyFile.split(',');
+  const urls = delayData.applyFileUrl || [];
+  return names.map((name, index) => ({
+    name,
+    url: urls[index] || ''
+  }));
 });
 
 const isMultiplePerson = computed(
   () => props.item.operatorName?.split(',').length > 1,
 );
+
+// 处理审批状态显示
+function renderApproveStatus(status: number) {
+  const statusMap = {
+    0: { label: '未审批', type: 'info' },
+    1: { label: '已同意', type: 'success' },
+    2: { label: '已拒绝', type: 'danger' },
+    3: { label: '已废除', type: 'warning' },
+  };
+  
+  return statusMap[status] || { label: '未知状态', type: 'default' };
+}
 </script>
 
 <template>
@@ -77,7 +96,7 @@ const isMultiplePerson = computed(
         <!-- 如果昵称中带, 这里的处理是不准确的 -->
         <div
           :class="cn('bg-foreground/5 flex items-center rounded-full', 'p-1')"
-          v-for="(name, index) in item.approveName.split(',')"
+          v-for="(name, index) in props.item.approveName.split(',')"
           :key="index">
           <span class="px-1">{{ name }}</span>
         </div>
@@ -85,29 +104,106 @@ const isMultiplePerson = computed(
       <div>{{ props.item.operatorName }}</div>
 
       <div>{{ props.item.operationTime }}</div>
+      
+      <!-- 处理工单内容 -->
+      <div v-if="props.item.operationType === 'PROCESS' && (props.item.workOrderProcessRecords?.[0]?.processContent || processAttachments.length > 0)" class="mt-2 rounded-lg border p-3">
+        <div v-if="props.item.workOrderProcessRecords?.[0]?.processContent" class="flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><Message /></el-icon>
+            <span>处理内容：</span>
+          </div>
+          <div class="text-foreground/75 break-all flex-1">{{ props.item.workOrderProcessRecords[0].processContent }}</div>
+        </div>
+        <div v-if="processAttachments.length > 0" class="mt-2 flex flex-wrap gap-2">
+          <div class="font-medium">附件：</div>
+          <div class="flex flex-wrap gap-2">
+            <a
+              v-for="(attachment, index) in processAttachments"
+              :key="index"
+              :href="attachment.url"
+              class="text-primary"
+              target="_blank"
+            >
+              <div class="flex items-center gap-1">
+                <span class="icon-[mingcute--attachment-line] size-[14px]"></span>
+                <span>{{ attachment.name }}</span>
+              </div>
+            </a>
+          </div>
+        </div>
+      </div>
+      
+      <!-- 申请延时内容 -->
+      <div v-else-if="props.item.operationType === 'APPLY_DELAY' && props.item.workOrderDelay?.[0] && (props.item.workOrderDelay[0].delayReason || props.item.workOrderDelay[0].delayDuration || delayAttachments.length > 0)" class="mt-2 rounded-lg border p-3">
+        <div v-if="props.item.workOrderDelay[0].delayReason" class="flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><Message /></el-icon>
+            <span>延时原因：</span>
+          </div>
+          <div class="text-foreground/75 break-all flex-1">{{ props.item.workOrderDelay[0].delayReason }}</div>
+        </div>
+        <div v-if="props.item.workOrderDelay[0].delayDuration" class="mt-2 flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><Timer /></el-icon>
+            <span>延时时长：</span>
+          </div>
+          <div class="text-foreground/75">{{ props.item.workOrderDelay[0].delayDuration }} 小时</div>
+        </div>
+        <div v-if="delayAttachments.length > 0" class="mt-2 flex flex-wrap gap-2">
+          <div class="font-medium">附件：</div>
+          <div class="flex flex-wrap gap-2">
+            <a
+              v-for="(attachment, index) in delayAttachments"
+              :key="index"
+              :href="attachment.url"
+              class="text-primary"
+              target="_blank"
+            >
+              <div class="flex items-center gap-1">
+                <span class="icon-[mingcute--attachment-line] size-[14px]"></span>
+                <span>{{ attachment.name }}</span>
+              </div>
+            </a>
+          </div>
+        </div>
+      </div>
+      
+      <!-- 审核延时内容 -->
+      <div v-else-if="props.item.operationType === 'AUDIT_DELAY' && props.item.workOrderDelay?.[0] && (props.item.workOrderDelay[0].approveRemark || props.item.workOrderDelay[0].approveStatus !== undefined || props.item.workOrderDelay[0].approveTime)" class="mt-2 rounded-lg border p-3">
+        <div v-if="props.item.workOrderDelay[0].approveRemark" class="flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><Message /></el-icon>
+            <span>审批意见：</span>
+          </div>
+          <div class="text-foreground/75 break-all flex-1">{{ props.item.workOrderDelay[0].approveRemark }}</div>
+        </div>
+        <div v-if="props.item.workOrderDelay[0].approveStatus !== undefined" class="mt-2 flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><User /></el-icon>
+            <span>审核状态：</span>
+          </div>
+          <ElTag :type="renderApproveStatus(props.item.workOrderDelay[0].approveStatus).type">
+            {{ renderApproveStatus(props.item.workOrderDelay[0].approveStatus).label }}
+          </ElTag>
+        </div>
+        <div v-if="props.item.workOrderDelay[0].approveTime" class="mt-2 flex flex-wrap gap-2">
+          <div class="flex items-center gap-1 font-medium">
+            <el-icon :size="16"><Timer /></el-icon>
+            <span>新截止时间：</span>
+          </div>
+          <div class="text-foreground/75">{{ props.item.workOrderDelay[0].approveTime }}</div>
+        </div>
+      </div>
+      
+      <!-- 原有消息内容 -->
       <div
-        v-if="props.item.message"
-        class="rounded-lg border px-3 py-1"
+        v-if="props.item.message && !['PROCESS', 'APPLY_DELAY', 'AUDIT_DELAY'].includes(props.item.operationType)"
+        class="mt-2 rounded-lg border px-3 py-1"
         :class="cn('flex gap-2')"
       >
         <Message />
         <div class="text-foreground/75 break-all">{{ props.item.message }}</div>
       </div>
-      <div v-if="attachmentInfo.length > 0" class="flex flex-wrap gap-2">
-        <!-- 这里下载的文件名不是原始文件名 -->
-        <a
-          v-for="attachment in attachmentInfo"
-          :key="attachment.ossId"
-          :href="attachment.url"
-          class="text-primary"
-          target="_blank"
-        >
-          <div class="flex items-center gap-1">
-            <span class="icon-[mingcute--attachment-line] size-[18px]"></span>
-            <span>{{ attachment.name }}</span>
-          </div>
-        </a>
-      </div>
     </div>
   </ElTimelineItem>
 </template>

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

@@ -64,7 +64,7 @@ function closePreview() {
 
 <template>
   <div class="rounded-[6px] border p-2">
-    <ElDescriptions v-if="props.workOrderDetail" :column="1">
+    <ElDescriptions v-if="props.workOrderDetail" :column="4" class="mb-2">
       <ElDescriptionsItem label="工单类型：">
         {{ props.workOrderDetail.ticketTypeName }}
       </ElDescriptionsItem>
@@ -77,6 +77,8 @@ function closePreview() {
       <ElDescriptionsItem label="联系电话：">
         {{ props.workOrderDetail.phone || '无' }}
       </ElDescriptionsItem>
+    </ElDescriptions>
+    <ElDescriptions v-if="props.workOrderDetail" :column="1">
       <ElDescriptionsItem label="提报内容：">
         {{ props.workOrderDetail.content || '无' }}
       </ElDescriptionsItem>

apps/web-ele/src/views/workflow/processDefinition/index.vue

@@ -347,6 +347,7 @@ const [ProcessDefinitionDeployDrawerComponent, deployDrawerApi] = useVbenDrawer(
               <ElPopconfirm title="确认删除" @confirm="confirmEvent(row)">
                 <template #reference>
                   <ElButton
+                    v-if="!row.isPublish && row.useExpression === 'N'"
                     size="small"
                     type="danger"
                     plain
@@ -411,15 +412,9 @@ const [ProcessDefinitionDeployDrawerComponent, deployDrawerApi] = useVbenDrawer(
                   </ElButton>
                 </template>
               </ElPopconfirm>
-              <ElButton
-                size="small"
-                type="primary"
-                plain
-                @click="handleExportXml(row)"
-                v-access:code="['workflow:definition:export']"
-              >
+              <!-- <ElButton size="small" type="primary" plain @click="handleExportXml(row)" v-access:code="['workflow:definition:export']" >
                 导出流程
-              </ElButton>
+              </ElButton> -->
             </ElSpace>
           </template>
         </BasicTable>

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

@@ -194,8 +194,13 @@ const currentTaskButtonPermissions = computed(() => {
   }
   // 初始化权限对象
   const permissions: Record<string, boolean> = {};
-
-  permissions.approveDelay = true;
+  const button = currentTaskButtonData.value;
+  if (button) {
+    const buttonArray = button.split(',');
+    // 设置对应按钮的权限
+    permissions.approveDelay = buttonArray.includes('approve_delay');
+  }
+  console.log('currentTaskButtonPermissions', permissions);
   return permissions;
 });
 </script>