提交修改

backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -142,7 +142,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
      *
      * @param processEvent 参数
      */
-    @EventListener(condition = "#processEvent.flowCode.startsWith('leave')")
+    @EventListener(condition = "#processEvent.flowCode.startsWith('leave') || #processEvent.flowCode.startsWith('hzdyjs-qj')")
     public void processHandler(ProcessEvent processEvent) {
         log.info("当前任务执行了{}", processEvent.toString());
         TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessId()));
@@ -165,7 +165,8 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
 
     /**
      * 执行任务创建监听
-     * 示例：也可通过  @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断
+     * 示例：也可通过 @EventListener(condition =
+     * "#processTaskEvent.flowCode=='leave1'")进行判断
      * 在方法中判断流程节点key
      * if ("xxx".equals(processTaskEvent.getNodeCode())) {
      * //执行业务逻辑
@@ -173,7 +174,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
      *
      * @param processTaskEvent 参数
      */
-    @EventListener(condition = "#processTaskEvent.flowCode.startsWith('leave')")
+    @EventListener(condition = "#processTaskEvent.flowCode.startsWith('leave') || #processTaskEvent.flowCode.startsWith('hzdyjs-qj')")
     public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
         log.info("当前任务创建了{}", processTaskEvent.toString());
     }
@@ -185,7 +186,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
      *
      * @param processDeleteEvent 参数
      */
-    @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')")
+    @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave') || #processDeleteEvent.flowCode.startsWith('hzdyjs-qj')")
     public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
         log.info("监听删除流程事件，当前任务执行了{}", processDeleteEvent.toString());
         TestLeave testLeave = baseMapper.selectById(Long.valueOf(processDeleteEvent.getBusinessId()));

docs/变更管理/code-adjust-record-2025-01-27-fix-ossid-precision-loss.md

@@ -0,0 +1,103 @@
+# 文件下载功能ossId精度丢失问题修复记录
+
+**修复时间**: 2025-01-27  
+**修复人员**: Cursor AI  
+**问题描述**: 文件下载功能中`Number(ossId)`转换导致大整数精度丢失
+
+## 🔍 问题分析
+
+### 问题现象
+- 前端调用文件下载API时，使用`Number(ossId)`转换文件ID
+- JavaScript的`Number()`类型转换对大整数（超过2^53）会丢失精度
+- 导致传递给后端的ossId不正确，无法正确下载文件
+
+### 技术原因
+- 后端使用`Long`类型（64位整数）存储文件ID
+- 前端API接口定义中`ossId`参数类型为`number`
+- `Number()`转换大整数时会发生精度丢失
+
+## 🛠️ 修复方案
+
+### 1. 修改API接口类型定义
+**文件**: `web/src/api/system/file.ts`
+
+```typescript
+// 修改前
+export function getFileDownloadUrl(ossId: number, bucketPassword?: string, expireSeconds: number = 300)
+
+// 修改后  
+export function getFileDownloadUrl(ossId: number | string | bigint, bucketPassword?: string, expireSeconds: number = 300)
+```
+
+**涉及函数**:
+- `getFileDownloadUrl()` - 文件下载URL获取
+- `getFilePreviewUrl()` - 文件预览URL获取  
+- `getFileAccessUrl()` - 文件访问URL获取
+- `secureDownloadFile()` - 安全文件下载
+- `securePreviewFile()` - 安全文件预览
+
+### 2. 修改下载插件实现
+**文件**: `web/src/plugins/download.ts`
+
+```typescript
+// 修改前
+const { data: downloadUrl } = await getFileDownloadUrl(Number(ossId));
+
+// 修改后
+const { data: downloadUrl } = await getFileDownloadUrl(String(ossId));
+```
+
+**涉及方法**:
+- `oss()` - 基础文件下载方法
+- `secureOss()` - 安全文件下载方法
+
+## ✅ 修复效果
+
+### 解决的问题
+1. **精度丢失**: 使用`String()`转换避免大整数精度丢失
+2. **类型安全**: API接口支持多种类型输入，保持向后兼容
+3. **一致性**: 所有文件相关API接口类型定义统一
+
+### 技术优势
+- **兼容性**: 支持`number`、`string`、`bigint`三种类型输入
+- **安全性**: 避免大整数精度丢失问题
+- **可维护性**: 统一的类型定义，便于后续维护
+
+## 📋 验证要点
+
+### 功能验证
+- [ ] 小整数文件ID下载正常
+- [ ] 大整数文件ID下载正常（超过2^53）
+- [ ] 字符串类型文件ID下载正常
+- [ ] 文件预览功能正常
+- [ ] 文件访问功能正常
+
+### 兼容性验证
+- [ ] 现有代码调用不受影响
+- [ ] 类型检查通过
+- [ ] 编译无错误
+
+## 🔄 相关文档更新
+
+### 需要同步更新的文档
+- [ ] API文档中的文件下载接口说明
+- [ ] 前端开发规范中的文件处理最佳实践
+- [ ] 测试文档中的文件下载测试用例
+
+## 📝 经验总结
+
+### 最佳实践
+1. **大整数处理**: 避免使用`Number()`转换可能超过2^53的整数
+2. **类型设计**: API接口设计时考虑多种输入类型的兼容性
+3. **精度安全**: 涉及ID传递时优先使用字符串类型
+
+### 预防措施
+1. **代码审查**: 检查所有涉及ID转换的代码
+2. **类型检查**: 使用TypeScript严格模式进行类型检查
+3. **测试覆盖**: 增加大整数ID的测试用例
+
+---
+
+**修复状态**: ✅ 已完成  
+**测试状态**: ⏳ 待验证  
+**文档状态**: ⏳ 待更新 

web/src/api/system/file.ts

@@ -7,7 +7,7 @@ import request from '@/utils/request'
  * @param expireSeconds 过期时间（秒），默认300秒
  * @returns 临时访问URL
  */
-export function getFileAccessUrl(ossId: number, bucketPassword?: string, expireSeconds: number = 300) {
+export function getFileAccessUrl(ossId: number | string | bigint, bucketPassword?: string, expireSeconds: number = 300) {
   return request({
     url: `/resource/file/access/${ossId}`,
     method: 'get',
@@ -44,9 +44,9 @@ export function getBatchFileAccessUrl(ossIds: number[], bucketPassword?: string,
  * @param expireSeconds 过期时间（秒），默认300秒
  * @returns 下载URL
  */
-export function getFileDownloadUrl(ossId: number, bucketPassword?: string, expireSeconds: number = 300) {
+export function getFileDownloadUrl(ossId: number | string | bigint, bucketPassword?: string, expireSeconds: number = 300) {
   return request({
-    url: `/resource/file/download/${ossId}`,
+    url: `/resource/oss/download/${ossId}`,
     method: 'get',
     params: {
       bucketPassword,
@@ -62,7 +62,7 @@ export function getFileDownloadUrl(ossId: number, bucketPassword?: string, expir
  * @param expireSeconds 过期时间（秒），默认300秒
  * @returns 预览URL
  */
-export function getFilePreviewUrl(ossId: number, bucketPassword?: string, expireSeconds: number = 300) {
+export function getFilePreviewUrl(ossId: number | string | bigint, bucketPassword?: string, expireSeconds: number = 300) {
   return request({
     url: `/resource/file/preview/${ossId}`,
     method: 'get',
@@ -80,7 +80,7 @@ export function getFilePreviewUrl(ossId: number, bucketPassword?: string, expire
  * @param bucketPassword bucket访问密码
  * @returns Promise<void>
  */
-export async function secureDownloadFile(ossId: number, fileName: string, bucketPassword?: string) {
+export async function secureDownloadFile(ossId: number | string | bigint, fileName: string, bucketPassword?: string) {
   try {
     // 获取临时下载URL
     const { data: downloadUrl } = await getFileDownloadUrl(ossId, bucketPassword)
@@ -119,7 +119,7 @@ export async function secureDownloadFile(ossId: number, fileName: string, bucket
  * @param bucketPassword bucket访问密码
  * @returns Promise<string> 预览URL
  */
-export async function securePreviewFile(ossId: number, contentType?: string, bucketPassword?: string) {
+export async function securePreviewFile(ossId: number | string | bigint, contentType?: string, bucketPassword?: string) {
   try {
     // 获取临时预览URL
     const { data: previewUrl } = await getFilePreviewUrl(ossId, bucketPassword)

web/src/components/FileUpload/index.vue

@@ -33,11 +33,12 @@
     <!-- 文件列表 -->
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
-        <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
+        <!-- <el-link :href="`${file.url}`" :underline="false" target="_blank"> -->
+        <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        <!-- </el-link> -->
         <div class="ele-upload-list__item-content-action">
           <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
+          <el-button type="danger" v-if="!disabled" link @click="handleDownloadAttachment(file)">下载</el-button>
         </div>
       </li>
     </transition-group>
@@ -48,6 +49,8 @@
 import { propTypes } from '@/utils/propTypes';
 import { delOss, listByIds } from '@/api/system/oss';
 import { globalHeaders } from '@/utils/request';
+import request from '@/utils/request';
+import { vLoading, ElLoading } from 'element-plus';
 
 const props = defineProps({
   modelValue: {
@@ -116,6 +119,64 @@ watch(
   { deep: true, immediate: true }
 );
 
+/** 下载附件 */
+const handleDownloadAttachment = async (file: any) => {
+  let downloadUrl = file.ossId;
+  let fileName = file.name || 'attachment';
+
+  if (!downloadUrl) {
+    proxy?.$modal.msgError('无法获取文件下载地址');
+    return;
+  }
+
+  // 对于服务器文件，使用fetch获取内容强制下载
+  try {
+    const loading = ElLoading.service({
+      text: '正在下载文件...',
+      target: document.body
+    });
+
+    // const response = await fetch(downloadUrl);
+    // if (!response.ok) {
+    //   throw new Error(`HTTP error! status: ${response.status}`);
+    // }
+    // 通过fetch获取文件内容，强制下载
+    // const response = await req('/resource/oss/download/' + attachment.filePath);
+    const response = await request({
+      url: '/resource/oss/download/' + downloadUrl,
+      method: 'get',
+      responseType: 'blob',
+      timeout: 300000 // 300秒超时
+    });
+    // 由于axios响应拦截器对blob类型响应直接返回blob数据
+    // 这里response直接就是blob对象，而不是包含data属性的响应对象
+    const blob = response;
+
+    // 验证响应数据
+    if (!blob) {
+      throw new Error('响应数据为空');
+    }
+
+    // const blob = await response.blob();
+    const url = window.URL.createObjectURL(blob);
+
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = fileName;
+    link.style.display = 'none';
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+
+    window.URL.revokeObjectURL(url);
+    loading?.close();
+    console.log('下载服务器文件成功:', fileName);
+  } catch (error) {
+    console.error('下载文件失败:', error);
+    proxy?.$modal.msgError('下载文件失败，请稍后重试');
+  }
+};
+
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
   // 校检文件类型

web/src/components/ImageUpload/index.vue

@@ -160,7 +160,7 @@ const getPreviewImageBlobUrl = async (imageUrl: string): Promise<string> => {
       url: imageUrl,
       method: 'get',
       responseType: 'blob',
-      timeout: 30000 // 30秒超时
+      timeout: 300000 // 300秒超时
     });
 
     // 由于request响应拦截器对blob类型响应直接返回blob数据

web/src/components/Process/approvalRecord.vue

@@ -44,7 +44,7 @@
                       <el-table-column prop="originalName" width="202" :show-overflow-tooltip="true" label="附件名称"></el-table-column>
                       <el-table-column prop="name" width="80" align="center" :show-overflow-tooltip="true" label="操作">
                         <template #default="tool">
-                          <el-button type="text" @click="handleDownload(tool.row.ossId)">下载</el-button>
+                          <el-button type="text" @click="handleDownload(tool.row.ossId, tool.row.originalName)">下载</el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -106,8 +106,9 @@ const getIds = async (ids: string | number) => {
 };
 
 /** 下载按钮操作 */
-const handleDownload = (ossId: string) => {
-  proxy?.$download.oss(ossId);
+const handleDownload = (ossId: string, originalName: string) => {
+  console.log(ossId);
+  proxy?.$download.secureOss(ossId, originalName);
 };
 
 /**

web/src/plugins/download.ts

@@ -5,6 +5,7 @@ import { blobValidate } from '@/utils/ruoyi';
 import { LoadingInstance } from 'element-plus/es/components/loading/src/loading.mjs';
 import { globalHeaders } from '@/utils/request';
 import { getFileDownloadUrl } from '@/api/system/file';
+import request from '@/utils/request';
 
 const baseURL = import.meta.env.VITE_APP_BASE_API;
 let downloadLoadingInstance: LoadingInstance;
@@ -12,16 +13,23 @@ export default {
   async oss(ossId: string | number) {
     downloadLoadingInstance = ElLoading.service({ text: '正在获取文件访问链接，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
     try {
-      // 使用新的安全下载方法
-      const { data: downloadUrl } = await getFileDownloadUrl(Number(ossId));
+      // 使用新的安全下载方法，避免Number()转换导致的大整数精度丢失
+      // const { data: downloadUrl } = await getFileDownloadUrl(String(ossId));
 
-      // 使用fetch下载文件
-      const response = await fetch(downloadUrl);
-      if (!response.ok) {
-        throw new Error('下载失败');
+      const response = await request({
+        url: "/resource/oss/download/" + ossId,
+        method: 'get',
+        responseType: 'blob',
+        timeout: 300000 // 300秒超时
+      });
+      // 由于axios响应拦截器对blob类型响应直接返回blob数据
+      // 这里response直接就是blob对象，而不是包含data属性的响应对象
+      const blob = response;
+
+      // 验证响应数据
+      if (!blob) {
+        throw new Error('响应数据为空');
       }
-
-      const blob = await response.blob();
       const filename = response.headers.get('content-disposition')?.split('filename=')[1]?.replace(/"/g, '') || `file_${ossId}`;
 
       FileSaver.saveAs(blob, decodeURIComponent(filename));
@@ -35,18 +43,27 @@ export default {
 
   // 新增：安全下载文件方法
   async secureOss(ossId: string | number, fileName?: string) {
+    console.log(ossId, fileName);
     downloadLoadingInstance = ElLoading.service({ text: '正在获取文件访问链接，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
     try {
-      // 获取临时下载URL
-      const { data: downloadUrl } = await getFileDownloadUrl(Number(ossId));
+      // 获取临时下载URL，避免Number()转换导致的大整数精度丢失
+      // const { data: downloadUrl } = await getFileDownloadUrl(String(ossId));
 
-      // 使用fetch下载文件
-      const response = await fetch(downloadUrl);
-      if (!response.ok) {
-        throw new Error('下载失败');
+      const response = await request({
+        url: "/resource/oss/download/" + ossId,
+        method: 'get',
+        responseType: 'blob',
+        timeout: 300000 // 300秒超时
+      });
+      // 由于axios响应拦截器对blob类型响应直接返回blob数据
+      // 这里response直接就是blob对象，而不是包含data属性的响应对象
+      const blob = response;
+
+      // 验证响应数据
+      if (!blob) {
+        throw new Error('响应数据为空');
       }
 
-      const blob = await response.blob();
       const finalFileName = fileName || response.headers.get('content-disposition')?.split('filename=')[1]?.replace(/"/g, '') || `file_${ossId}`;
 
       FileSaver.saveAs(blob, decodeURIComponent(finalFileName));
@@ -66,6 +83,7 @@ export default {
         method: 'get',
         url: url,
         responseType: 'blob',
+        timeout: 300000 ,// 300秒超时
         headers: globalHeaders()
       });
       const isBlob = blobValidate(res.data);

web/src/views/hq/pm/repairOrder/index.vue

@@ -2743,7 +2743,7 @@ const downloadAttachment = async (attachment: any) => {
       url: '/resource/oss/download/' + attachment.filePath,
       method: 'get',
       responseType: 'blob',
-      timeout: 30000 // 30秒超时
+      timeout: 300000 // 300秒超时
     });
     // 由于axios响应拦截器对blob类型响应直接返回blob数据
     // 这里response直接就是blob对象，而不是包含data属性的响应对象

web/src/views/xg/xsjcxx/xsqj/index.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="search">
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form-item label="请假天数" prop="startLeaveDays">
+            <el-input v-model="queryParams.startLeaveDays" placeholder="请输入请假天数" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item prop="endLeaveDays"> 至 </el-form-item>
+          <el-form-item prop="endLeaveDays">
+            <el-input v-model="queryParams.endLeaveDays" placeholder="请输入请假天数" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button v-hasPermi="['workflow:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column v-if="false" label="主键" align="center" prop="id" />
+        <el-table-column label="请假类型" align="center">
+          <template #default="scope">
+            <el-tag>{{ options.find((e) => e.value === scope.row.leaveType)?.label }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始时间" align="center" prop="startDate">
+          <template #default="scope">
+            <span>{{ proxy.parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endDate">
+          <template #default="scope">
+            <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="请假天数" align="center" prop="leaveDays" />
+        <el-table-column label="请假原因" align="center" prop="remark" />
+        <el-table-column align="center" label="流程状态" min-width="70">
+          <template #default="scope">
+            <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="162">
+          <template #default="scope">
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                >
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                  >删除</el-button
+                >
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
+                <el-button size="small" type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">撤销</el-button>
+              </el-col>
+            </el-row>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { delLeave, listLeave } from '@/api/workflow/leave';
+import { cancelProcessApply } from '@/api/workflow/instance';
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const leaveList = ref<LeaveVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const options = [
+  {
+    value: '1',
+    label: '事假'
+  },
+  {
+    value: '2',
+    label: '调休'
+  },
+  {
+    value: '3',
+    label: '病假'
+  },
+  {
+    value: '4',
+    label: '婚假'
+  }
+];
+
+const queryFormRef = ref<ElFormInstance>();
+
+const data = reactive<PageData<LeaveForm, LeaveQuery>>({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    startLeaveDays: undefined,
+    endLeaveDays: undefined
+  },
+  rules: {}
+});
+
+const { queryParams } = toRefs(data);
+
+/** 查询请假列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listLeave(queryParams.value);
+  leaveList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: LeaveVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/xg/xsjcxx/xsqj/leaveEdit/index`,
+    query: {
+      type: 'add'
+    }
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = (row?: LeaveVO) => {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/xg/xsjcxx/xsqj/leaveEdit/index`,
+    query: {
+      id: row.id,
+      type: 'update'
+    }
+  });
+};
+
+/** 查看按钮操作 */
+const handleView = (row?: LeaveVO) => {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/xg/xsjcxx/xsqj/leaveEdit/index`,
+    query: {
+      id: row.id,
+      type: 'view'
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: LeaveVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除请假编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delLeave(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'workflow/leave/export',
+    {
+      ...queryParams.value
+    },
+    `leave_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 撤销按钮操作 */
+const handleCancelProcessApply = async (id: string) => {
+  await proxy?.$modal.confirm('是否确认撤销当前单据？');
+  loading.value = true;
+  const data = {
+    businessId: id,
+    message: '申请人撤销流程！'
+  };
+  await cancelProcessApply(data).finally(() => (loading.value = false));
+  await getList();
+  proxy?.$modal.msgSuccess('撤销成功');
+};
+onMounted(() => {
+  getList();
+});
+</script>

web/src/views/xg/xsjcxx/xsqj/leaveEdit.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <approvalButton
+        @submitForm="submitForm"
+        @approvalVerifyOpen="approvalVerifyOpen"
+        @handleApprovalRecord="handleApprovalRecord"
+        :buttonLoading="buttonLoading"
+        :id="form.id"
+        :status="form.status"
+        :pageType="routeParams.type"
+      />
+    </el-card>
+    <el-card shadow="never" style="height: 78vh; overflow-y: auto">
+      <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="请假类型" prop="leaveType">
+          <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="请假时间" required>
+          <el-date-picker
+            v-model="leaveTime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            range-separator="To"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+            @change="changeLeaveTime()"
+          />
+        </el-form-item>
+        <el-form-item label="请假天数" prop="leaveDays">
+          <el-input v-model="form.leaveDays" disabled type="number" placeholder="请输入请假天数" />
+        </el-form-item>
+        <el-form-item label="请假原因" prop="remark">
+          <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入请假原因" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <!-- 提交组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+    <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose" width="500">
+      <el-select v-model="flowCode" placeholder="Select" style="width: 240px">
+        <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="submitFlow()"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { addLeave, getLeave, updateLeave } from '@/api/workflow/leave';
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { AxiosResponse } from 'axios';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const buttonLoading = ref(false);
+const loading = ref(true);
+const leaveTime = ref<Array<string>>([]);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const options = [
+  {
+    value: '1',
+    label: '事假'
+  },
+  {
+    value: '2',
+    label: '调休'
+  },
+  {
+    value: '3',
+    label: '病假'
+  },
+  {
+    value: '4',
+    label: '婚假'
+  }
+];
+const flowCodeOptions = [
+  {
+    value: 'hzdyjs-qj',
+    label: '学生请假流程-杭州第一技师'
+  },
+  {
+    value: 'leave1',
+    label: '请假申请-普通'
+  },
+  {
+    value: 'leave2',
+    label: '请假申请-排他网关'
+  },
+  {
+    value: 'leave3',
+    label: '请假申请-并行网关'
+  },
+  {
+    value: 'leave4',
+    label: '请假申请-会签'
+  },
+  {
+    value: 'leave5',
+    label: '请假申请-并行会签网关'
+  },
+  {
+    value: 'leave6',
+    label: '请假申请-排他并行会签'
+  }
+];
+
+const flowCode = ref<string>('');
+
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+
+const leaveFormRef = ref<ElFormInstance>();
+
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData: LeaveForm = {
+  id: undefined,
+  leaveType: undefined,
+  startDate: undefined,
+  endDate: undefined,
+  leaveDays: undefined,
+  remark: undefined,
+  status: undefined
+};
+const data = reactive<PageData<LeaveForm, LeaveQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    startLeaveDays: undefined,
+    endLeaveDays: undefined
+  },
+  rules: {
+    id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
+    leaveType: [{ required: true, message: '请假类型不能为空', trigger: 'blur' }],
+    leaveTime: [{ required: true, message: '请假时间不能为空', trigger: 'blur' }],
+    leaveDays: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }]
+  }
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveTime.value = [];
+  leaveFormRef.value?.resetFields();
+};
+
+const changeLeaveTime = () => {
+  const startDate = new Date(leaveTime.value[0]).getTime();
+  const endDate = new Date(leaveTime.value[1]).getTime();
+  const diffInMilliseconds = endDate - startDate;
+  form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)) + 1;
+};
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getLeave(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    console.log('res.data:', res.data);
+    console.log('form.value:', form.value);
+    // 为了确保 Element Plus 日期区间组件能够正确渲染，需要直接替换绑定数组引用
+    // 同时将后端返回的日期统一格式化为组件要求的 "YYYY-MM-DD HH:mm:ss"
+    // 后端仅返回 "YYYY-MM-DD"，需要为日期补齐时间，符合 value-format="YYYY-MM-DD HH:mm:ss"
+    const ensureDateTime = (dateStr: string | undefined, endFlag = false) => {
+      if (!dateStr) return '';
+      // 如果已包含时间段，直接返回
+      if (/\d{2}:\d{2}:\d{2}$/.test(dateStr)) {
+        return dateStr;
+      }
+      return endFlag ? `${dateStr} 23:59:59` : `${dateStr} 00:00:00`;
+    };
+    const start = ensureDateTime(form.value.startDate, false);
+    const end = ensureDateTime(form.value.endDate, true);
+    leaveTime.value = [start, end];
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status: string) => {
+  if (leaveTime.value.length === 0) {
+    proxy?.$modal.msgError('请假时间不能为空');
+    return;
+  }
+  try {
+    leaveFormRef.value?.validate(async (valid: boolean) => {
+      form.value.startDate = leaveTime.value[0];
+      form.value.endDate = leaveTime.value[1];
+      if (valid) {
+        buttonLoading.value = true;
+        let res: AxiosResponse<LeaveVO>;
+        if (form.value.id) {
+          res = await updateLeave(form.value).finally(() => (buttonLoading.value = false));
+        } else {
+          res = await addLeave(form.value).finally(() => (buttonLoading.value = false));
+        }
+        form.value = res.data;
+        if (status === 'draft') {
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('暂存成功');
+          proxy.$tab.closePage(proxy.$route);
+          proxy.$router.go(-1);
+        } else {
+          if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+            flowCode.value = flowCodeOptions[0].value;
+            dialogVisible.visible = true;
+            return;
+          }
+          //说明启动过先随意穿个参数
+          if (flowCode.value === '' || flowCode.value === null) {
+            flowCode.value = 'xx';
+          }
+          await handleStartWorkFlow(res.data);
+        }
+      }
+    });
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave2/6 使用的流程变量
+      leaveDays: data.leaveDays,
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</script>