Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-admin

apps/web-ele/.env.development

@@ -4,8 +4,8 @@ VITE_PORT=8081
 VITE_BASE=/
 
 # 接口地址
-# VITE_GLOB_API_URL=http://39.164.159.226:8088
-VITE_GLOB_API_URL=http://192.168.1.7:8080
+VITE_GLOB_API_URL=http://39.164.159.226:8088
+# VITE_GLOB_API_URL=http://192.168.1.7:8080
 # VITE_GLOB_API_URL=http://192.168.1.170:8080
 # VITE_GLOB_FLOW_URL=http://192.168.31.160:8082
 VITE_GLOB_FLOW_URL=http://192.168.1.21:8082

apps/web-ele/src/api/system/infoEntry/aidKitInfo/model.ts

@@ -11,4 +11,14 @@ export interface AidKitInfoModel {
   standardQuantity?: number;
   // 单位
   unit?: string;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
+  // 更新人
+  updateBy?: string;
+  // 更新时间
+  updateTime?: string;
+  // 备注
+  remark?: string;
 }

apps/web-ele/src/api/system/infoEntry/certificateSetting/certificateSetting.ts

@@ -0,0 +1,78 @@
+import type { CertificateSettingModel } from './model';
+
+import type { BaseResult } from '#/api/base-result';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+// API路径常量枚举
+enum Api {
+  // 导出
+  export = '/sysLicenseRule/rule/export',
+  // 列表查询
+  list = '/sysLicenseRule/rule/list',
+  // 基础路径
+  root = '/sysLicenseRule/rule',
+}
+
+/**
+ * 查询证照规则列表
+ * @param params 查询参数
+ * @returns 分页结果
+ */
+export function certificateSettingList(params: any) {
+  return requestClient.get<BaseResult<CertificateSettingModel[]>>(Api.list, {
+    params,
+  });
+}
+
+/**
+ * 获取证照规则详细信息
+ * @param id 证照规则ID
+ * @returns 证照规则详情
+ */
+export function getCertificateSettingDetail(id: number) {
+  return requestClient.get<CertificateSettingModel>(`${Api.root}/${id}`);
+}
+
+/**
+ * 新增证照规则
+ * @param data 证照规则数据
+ * @returns 操作结果
+ */
+export function addCertificateSetting(data: CertificateSettingModel) {
+  return requestClient.post(Api.root, data, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 修改证照规则
+ * @param data 证照规则数据
+ * @returns 操作结果
+ */
+export function updateCertificateSetting(data: CertificateSettingModel) {
+  return requestClient.put(Api.root, data, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 删除证照规则
+ * @param ids 证照规则ID数组
+ * @returns 操作结果
+ */
+export function deleteCertificateSetting(ids: number[]) {
+  return requestClient.delete(`${Api.root}/${ids.join(',')}`, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 导出证照规则列表
+ * @param data 导出参数
+ * @returns 导出结果
+ */
+export function exportCertificateSetting(data: Partial<CertificateSettingModel>) {
+  return commonExport(Api.export, data);
+}

apps/web-ele/src/api/system/infoEntry/certificateSetting/model.ts

@@ -0,0 +1,40 @@
+export interface CertificateSettingModel {
+  // 主键id
+  id?: number;
+  // 年审是否转任务：0-否，1-是
+  annualReviewToTask?: number;
+  // 年审xxlJob的id
+  annualReviewXxlJobId?: number;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
+  // 删除标记
+  delFlag?: number;
+  // 证照名称
+  licenseName?: string;
+  // 备注
+  remark?: string;
+  // 换证提前时间
+  renewAdvanceMonths?: number;
+  // 换证频率
+  renewFrequency?: string;
+  // 更换要求
+  renewRequirements?: string;
+  // 换证是否转任务：0-否，1-是
+  renewToTask?: number;
+  // 换证xxlJob的id
+  renewXxlJobId?: number;
+  // 油站集合
+  stationCollection?: any[];
+  // 任务截止时间
+  taskEndMonth?: number;
+  // 任务来源
+  taskSource?: number;
+  // 任务开始时间
+  taskStartMonth?: number;
+  // 更新人
+  updateBy?: string;
+  // 更新时间
+  updateTime?: string;
+}

apps/web-ele/src/api/workflow/instance/index.ts

@@ -87,6 +87,50 @@ export function pageByCurrent(params?: PageQuery) {
 }
 
 /**
+ * 获取当前登录人的待处理工单
+ * @param params
+ * @returns PageResult<TaskInfo>
+ */
+export function pageByPending(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list/pending',
+    { params },
+  );
+}
+
+/**
+ * 获取当前登录人的抄送工单
+ * @param params
+ * @returns PageResult<TaskInfo>
+ */
+export function pageByCc(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list/cc',
+    { params },
+  );
+}
+
+/**
+ * 获取当前登录人的已完成工单
+ * @param params
+ * @returns PageResult<TaskInfo>
+ */
+export function pageByCompleted(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list/over',
+    { params },
+  );
+}
+
+/**
+ * 获取当前登录人的延时审批工单
+ * @param params
+ * @returns PageResult<TaskInfo>
+ */
+export function pageByDelay(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list/delay',
+    { params },
+  );
+}
+
+/**
  * 获取工单详情
  * @param id 工单id
  * @returns TaskInfo
@@ -144,4 +188,4 @@ export function updateFlowVariable(data: {
     '/workflow/instance/updateVariable',
     data,
   );
-}
+}

apps/web-ele/src/api/workflow/task/index.ts

@@ -23,6 +23,21 @@ export function startWorkFlow(data: StartWorkFlowReqData) {
 }
 
 /**
+ * 提交工单
+ * @param taskId 任务id
+ */
+export function submitOrder(taskId: string) {
+  return requestClient.put<void>(`/workOrder/order/submit/${taskId}`);
+}
+
+/**
+ * 删除工单
+ * @param taskId 任务id
+ */
+export function deleteOrder(taskId: string) {
+  return requestClient.delete<void>(`/workOrder/order/${taskId}`);
+}
+/**
  * 办理任务
  * @param data
  */

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

@@ -5,6 +5,9 @@ export interface ButtonWithPermission {
 }
 
 export interface TaskInfo {
+  status: string;
+  taskId: string;
+  orderId: string;
   id: string;
   categoryName: string;
   createTime: string;
@@ -39,6 +42,10 @@ export interface TaskInfo {
   createByName: string;
   targetNodeName?: string;
   buttonList: ButtonWithPermission[];
+  /**
+   * 操作按钮，逗号分隔的字符串，如：handle,delay,cc,back
+   */
+  button?: string;
 }
 
 export interface CompleteTaskReqData {

apps/web-ele/src/views/Archive/HSSEManage/safetyHazardLedger/drawer.vue

@@ -238,16 +238,16 @@ const resetForm = (formEl: FormInstance | undefined) => {
             width="80%"
             :close-on-click-modal="true"
           >
-            <div style="text-align: center; padding: 12px 8px">
+            <div style=" padding: 12px 8px;text-align: center">
               <img
                 :src="ruleForm.cploadImage.dialogImageUrl"
                 alt="Preview Image"
                 style="
+                  display: inline-block;
                   width: 90vw;
                   max-height: 80vh;
-                  display: inline-block;
-                  object-fit: contain;
                   cursor: zoom-in;
+                  object-fit: contain;
                 "
               />
             </div>

apps/web-ele/src/views/oilstation/base/config-data.tsx

@@ -23,6 +23,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     label: '所属片区',
     componentProps: {
       placeholder: '请选择所属片区',
+      clearable: true,
       api: async () => {
         const resp = await selectAllSysStationAreaList();
         const data = resp || [];
@@ -151,6 +152,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
       },
       labelField: 'label',
       valueField: 'value',
+      clearable: true,
     },
     rules: 'required',
   },

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/oilstation/idphoto/index.vue

@@ -118,6 +118,7 @@ function openDrawer() {
 
 // 编辑证照
 function handleEdit(row: any) {
+  console.log(drawerApi);
   drawerApi.setData({ ...row, isUpdate: true }).open();
 }
 

apps/web-ele/src/views/system/infoEntry/aidKitInfo/aidKitInfo-data.tsx

@@ -96,4 +96,4 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     },
     rules: 'required',
   },
-];
+];

apps/web-ele/src/views/system/infoEntry/certificateSetting/certificateSetting-data.tsx

@@ -1,10 +1,13 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { requestClient } from '#/api/request';
+import { getDictOptions } from '#/utils/dict';
+
 export const queryFormSchema: FormSchemaGetter = () => [
   {
     component: 'Input',
-    fieldName: 'certificateName',
+    fieldName: 'licenseName',
     label: '证照名称',
     componentProps: {
       placeholder: '请输入证照名称',
@@ -12,37 +15,27 @@ export const queryFormSchema: FormSchemaGetter = () => [
   },
   {
     component: 'Select',
-    fieldName: 'annualInspection',
-    label: '年审',
-    componentProps: {
-      placeholder: '请选择年审',
-      options: [
-        { label: '转任务', value: '转任务' },
-        { label: '无', value: '无' },
-      ],
-    },
-  },
-  {
-    component: 'Select',
-    fieldName: 'annualInspectionTask',
-    label: '年审（转任务计算）',
+    fieldName: 'annualReviewToTask',
+    label: '年审转任务',
     componentProps: {
-      placeholder: '请选择年审（转任务计算）',
+      placeholder: '请选择年审转任务',
+      clearable: true,
       options: [
-        { label: '按时间', value: '按时间' },
-        { label: '按周期', value: '按周期' },
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
       ],
     },
   },
   {
     component: 'Select',
-    fieldName: 'renewal',
-    label: '换证',
+    fieldName: 'renewToTask',
+    label: '换证转任务',
     componentProps: {
-      placeholder: '请选择换证',
+      placeholder: '请选择换证转任务',
+      clearable: true,
       options: [
-        { label: '转任务', value: '转任务' },
-        { label: '无', value: '无' },
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
       ],
     },
   },
@@ -54,27 +47,43 @@ export const tableColumns: VxeGridProps['columns'] = [
     width: 80,
   },
   {
-    field: 'certificateName',
+    field: 'licenseName',
     title: '证照名称',
     minWidth: 150,
   },
   {
-    field: 'annualInspection',
-    title: '年审',
+    field: 'annualReviewToTask',
+    title: '年审是否转任务',
     minWidth: 120,
+    formatter: (params: { cellValue: number }) => {
+      return params.cellValue === 1 ? '是' : '否';
+    },
   },
   {
-    field: 'annualInspectionTask',
-    title: '年审（转任务计算）',
-    minWidth: 180,
+    field: 'renewToTask',
+    title: '换证是否转任务',
+    minWidth: 120,
+    formatter: (params: { cellValue: number }) => {
+      return params.cellValue === 1 ? '是' : '否';
+    },
   },
   {
-    field: 'renewal',
-    title: '换证',
+    field: 'renewFrequency',
+    title: '换证频率',
     minWidth: 120,
+   formatter: (params: { cellValue: string; column: any; row: any }) => {
+      const options =getDictOptions('renew_frequency');
+      const option = options.find((item) => item.value === params.cellValue);
+      return option ? option.label : params.cellValue;
+    },
   },
   {
-    field: 'replacementRequirements',
+    field: 'renewAdvanceMonths',
+    title: '换证提前时间/月',
+    minWidth: 120,
+  },
+  {
+    field: 'renewRequirements',
     title: '更换要求',
     minWidth: 200,
   },
@@ -98,7 +107,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
   },
   {
     component: 'Input',
-    fieldName: 'certificateName',
+    fieldName: 'licenseName',
     label: '证照名称',
     componentProps: {
       placeholder: '请输入证照名称',
@@ -108,92 +117,93 @@ export const drawerFormSchema: FormSchemaGetter = () => [
   },
   {
     component: 'RadioGroup',
-    fieldName: 'annualInspection',
-    label: '年审',
+    fieldName: 'annualReviewToTask',
+    label: '年审转任务',
     componentProps: {
       options: [
-        { label: '转任务', value: '转任务' },
-        { label: '转任务计算', value: '转任务计算' },
-        { label: '无', value: '无' },
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
       ],
     },
     rules: 'required',
   },
   {
-    component: 'DatePicker',
-    fieldName: 'taskStartTime',
+    component: 'Select',
+    fieldName: 'taskStartMonth',
     label: '任务开始时间',
     componentProps: {
       placeholder: '请选择任务开始时间',
-      type: 'date',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      options: Array.from({ length: 12 }, (_, i) => ({
+        label: `${i + 1}月`,
+        value: i + 1,
+      })),
     },
   },
   {
-    component: 'DatePicker',
-    fieldName: 'taskEndTime',
-    label: '任务结束时间',
+    component: 'Select',
+    fieldName: 'taskEndMonth',
+    label: '任务截止时间',
     componentProps: {
-      placeholder: '请选择任务结束时间',
-      type: 'date',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      placeholder: '请选择任务截止时间',
+      options: Array.from({ length: 12 }, (_, i) => ({
+        label: `${i + 1}月`,
+        value: i + 1,
+      })),
     },
   },
   {
     component: 'RadioGroup',
-    fieldName: 'renewal',
-    label: '换证',
+    fieldName: 'renewToTask',
+    label: '换证转任务',
     componentProps: {
       options: [
-        { label: '转任务', value: '转任务' },
-        { label: '无', value: '无' },
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
       ],
     },
     rules: 'required',
   },
   {
     component: 'Select',
-    fieldName: 'renewalFrequency',
-    label: '换证频率',
     componentProps: {
       placeholder: '请选择换证频率',
-      options: [
-        { label: '每年', value: '每年' },
-        { label: '每两年', value: '每两年' },
-        { label: '每三年', value: '每三年' },
-        { label: '每五年', value: '每五年' },
-      ],
+      options: getDictOptions('renew_frequency'),
     },
+    fieldName: 'renewFrequency',
+    label: '换证频率',
   },
   {
-    component: 'Input',
-    fieldName: 'renewalAdvanceTime',
-    label: '换证提前时间',
+    component: 'InputNumber',
+    fieldName: 'renewAdvanceMonths',
+    label: '换证提前时间/月',
     componentProps: {
-      placeholder: '请输入换证提前时间（天）',
-      type: 'number',
+      placeholder: '请输入换证提前时间（月）',
       min: 0,
     },
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
     fieldName: 'taskSource',
     label: '任务来源',
     componentProps: {
       placeholder: '请选择任务来源',
-      options: [
-        { label: '系统', value: '系统' },
-        { label: '手动', value: '手动' },
-        { label: '外部', value: '外部' },
-      ],
+      api: async () => {
+        const resp: any = await requestClient.get('/system/user/allList');
+        return Array.isArray(resp)
+          ? resp.map((item: any) => ({
+              label: item.nickName || item.userName,
+              value: item.userId.toString(),
+            }))
+          : [];
+      },
+      filterable: true,
+      labelField: 'label',
+      valueField: 'value',
     },
-    rules: 'required',
   },
   {
     component: 'Input',
-    fieldName: 'replacementRequirements',
+    fieldName: 'renewRequirements',
     label: '更换要求',
     componentProps: {
       placeholder: '请输入更换要求',
@@ -203,3 +213,4 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     },
   },
 ];
+

apps/web-ele/src/views/system/infoEntry/certificateSetting/certificateSetting-drawer.vue

@@ -3,6 +3,8 @@ import { onMounted, ref } from 'vue';
 
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
+import { addCertificateSetting, getCertificateSettingDetail, updateCertificateSetting } from '#/api/system/infoEntry/certificateSetting/certificateSetting';
+
 import { drawerFormSchema } from './certificateSetting-data';
 
 const emit = defineEmits<{
@@ -26,21 +28,9 @@ const [Drawer, drawerApi] = useVbenDrawer({
       const { id, isUpdate } = drawerApi.getData();
       isUpdateRef.value = isUpdate;
       if (isUpdate && id) {
-        // 模拟获取详情数据
-        const mockDetail = {
-          id,
-          certificateName: `证照规则${id}`,
-          annualInspection: '转任务',
-          annualInspectionTask: '按时间',
-          taskStartTime: '2023-01-01',
-          taskEndTime: '2023-12-31',
-          renewal: '转任务',
-          renewalFrequency: '每年',
-          renewalAdvanceTime: 30,
-          taskSource: '系统',
-          replacementRequirements: '这是一个模拟的更换要求',
-        };
-        await formApi.setValues(mockDetail);
+        const res = await getCertificateSettingDetail(id);
+        const detailData = res?.data || res;
+        await formApi.setValues(detailData);
       }
     } catch (error) {
       console.error('获取证照规则详情失败:', error);
@@ -57,9 +47,10 @@ const [Drawer, drawerApi] = useVbenDrawer({
         return;
       }
       const data = await formApi.getValues();
-      // 模拟提交数据
-      console.log('提交数据:', data);
-      // 模拟成功
+      
+      await (isUpdateRef.value
+        ? updateCertificateSetting(data)
+        : addCertificateSetting(data));
       emit('reload');
       drawerApi.close();
     } catch (error) {

apps/web-ele/src/views/system/infoEntry/certificateSetting/index.vue

@@ -11,6 +11,9 @@ import { ElMessageBox } from 'element-plus';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
+import { certificateSettingList, deleteCertificateSetting, exportCertificateSetting } from '#/api/system/infoEntry/certificateSetting/certificateSetting';
+import { commonDownloadExcel } from '#/utils/file/download';
+
 import { queryFormSchema, tableColumns } from './certificateSetting-data';
 import CertificateSettingDrawerComp from './certificateSetting-drawer.vue';
 
@@ -25,53 +28,6 @@ const formOptions: VbenFormProps = {
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4',
 };
 
-// 模拟数据
-const mockData = {
-  rows: [
-    {
-      id: 1,
-      certificateName: '营业执照',
-      annualInspection: '转任务',
-      annualInspectionTask: '按时间',
-      renewal: '转任务',
-      replacementRequirements: '每年进行一次审核，确保信息准确',
-    },
-    {
-      id: 2,
-      certificateName: '税务登记证',
-      annualInspection: '转任务计算',
-      annualInspectionTask: '按周期',
-      renewal: '无',
-      replacementRequirements: '无需定期更换，信息变更时更新',
-    },
-    {
-      id: 3,
-      certificateName: '组织机构代码证',
-      annualInspection: '无',
-      annualInspectionTask: '',
-      renewal: '转任务',
-      replacementRequirements: '有效期内使用，到期前30天办理换证',
-    },
-    {
-      id: 4,
-      certificateName: '安全生产许可证',
-      annualInspection: '转任务',
-      annualInspectionTask: '按时间',
-      renewal: '转任务',
-      replacementRequirements: '每3年更换一次，提前60天申请',
-    },
-    {
-      id: 5,
-      certificateName: '消防许可证',
-      annualInspection: '转任务计算',
-      annualInspectionTask: '按周期',
-      renewal: '无',
-      replacementRequirements: '每年进行消防检查，合格后延续使用',
-    },
-  ],
-  total: 5,
-};
-
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
     highlight: true,
@@ -84,32 +40,12 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        // 模拟API请求
-        console.log('查询参数:', formValues, page);
-        // 模拟过滤
-        let filteredRows = [...mockData.rows];
-        if (formValues.certificateName) {
-          filteredRows = filteredRows.filter(row => 
-            row.certificateName.includes(formValues.certificateName)
-          );
-        }
-        if (formValues.annualInspection) {
-          filteredRows = filteredRows.filter(row => row.annualInspection === formValues.annualInspection);
-        }
-        if (formValues.annualInspectionTask) {
-          filteredRows = filteredRows.filter(row => row.annualInspectionTask === formValues.annualInspectionTask);
-        }
-        if (formValues.renewal) {
-          filteredRows = filteredRows.filter(row => row.renewal === formValues.renewal);
-        }
-        // 模拟分页
-        const start = (page.currentPage - 1) * page.pageSize;
-        const end = start + page.pageSize;
-        const paginatedRows = filteredRows.slice(start, end);
-        return { 
-          items: paginatedRows, 
-          total: filteredRows.length 
-        };
+        const resp = await certificateSettingList({
+          ...formValues,
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+        });
+        return { items: resp.rows, total: resp.total };
       },
     },
   },
@@ -121,7 +57,7 @@ const gridOptions: VxeGridProps = {
     refresh: true,
     zoom: true,
   },
-  id: 'system-checklis-labelManage-index',
+  id: 'system-infoEntry-certificateSetting-index',
 };
 
 const [BasicTable, basicTableApi] = useVbenVxeGrid({
@@ -140,13 +76,14 @@ function openDrawer() {
 
 // 编辑证照规则
 function handleEdit(row: any) {
+  console.log(row);
+  // row.taskSource = row.taskSource
   drawerApi.setData({ ...row, isUpdate: true }).open();
 }
 
 // 单个删除证照规则
 async function confirmEvent(row: any) {
-  // 模拟删除操作
-  console.log('删除证照规则:', row.id);
+  await deleteCertificateSetting([row.id]);
   await basicTableApi.reload();
 }
 
@@ -163,11 +100,19 @@ function deleteHandle() {
     cancelButtonText: '取消',
     type: 'warning',
   }).then(async () => {
-    // 模拟批量删除操作
-    console.log('批量删除证照规则:', ids);
+    await deleteCertificateSetting(ids);
     await basicTableApi.reload();
   });
 }
+
+// 导出证照规则数据
+async function exportHandle() {
+  await commonDownloadExcel(
+    exportCertificateSetting,
+    '证照规则数据',
+    basicTableApi.formApi.form.values,
+  );
+}
 </script>
 
 <template>
@@ -176,6 +121,12 @@ function deleteHandle() {
       <template #toolbar-tools>
         <ElSpace>
           <ElButton
+            type="warning"
+            @click="exportHandle"
+          >
+            导出
+          </ElButton>
+          <ElButton
             type="danger"
             :disabled="
               !(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)

apps/web-ele/src/views/system/infoEntry/emergencyInfo/emergencyInfo-data.tsx

@@ -1,6 +1,7 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
 import { getDictOptions } from '#/utils/dict';
 
 // 字典标识常量
@@ -13,13 +14,48 @@ const DICT_KEYS = {
 const getEmergencyProtectionTypes = () =>
   getDictOptions(DICT_KEYS.EMERGENCY_PROTECTION_TYPE);
 
+// 缓存片区列表
+let areaList: any[] = [];
+
+// 获取片区列表
+const getAreaList = async () => {
+  if (areaList.length === 0) {
+    const resp = await selectAllSysStationAreaList();
+    areaList = Array.isArray(resp) ? resp : [];
+  }
+  return areaList;
+};
+
+// 获取片区名称
+const getAreaName = (areaId: string | number) => {
+  const area = areaList.find(item => item.id === areaId);
+  return area ? area.areaName : areaId;
+};
+
+// 导出获取片区列表的函数
+export const loadAreaList = async () => {
+  await getAreaList();
+};
+
 export const queryFormSchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
+    component: 'ApiSelect',
     fieldName: 'belongArea',
     label: '我方油站',
     componentProps: {
-      placeholder: '请输入我方油站',
+      placeholder: '请选择我方油站',
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
@@ -43,7 +79,9 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '我方油站',
     minWidth: 120,
     formatter: (params: { cellValue: string; column: any; row: any }) => {
-      return params.cellValue;
+      // 确保片区列表已加载
+      
+      return getAreaName(params.cellValue);
     },
   },
   {
@@ -102,11 +140,24 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     fieldName: 'id',
   },
   {
-    component: 'Input',
+    component: 'ApiSelect',
     fieldName: 'belongArea',
     label: '我方油站',
     componentProps: {
-      placeholder: '请输入我方油站',
+      placeholder: '请选择我方油站',
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
+      clearable: true,
     },
     rules: 'required',
   },

apps/web-ele/src/views/system/infoEntry/emergencyInfo/index.vue

@@ -18,7 +18,7 @@ import {
 import { getDictOptions } from '#/utils/dict';
 import { commonDownloadExcel } from '#/utils/file/download';
 
-import { queryFormSchema, tableColumns } from './emergencyInfo-data';
+import { queryFormSchema, tableColumns, loadAreaList } from './emergencyInfo-data';
 import EmergencyInfoDrawerComp from './emergencyInfo-drawer.vue';
 
 // 字典标识常量
@@ -86,6 +86,8 @@ const protectionTypes = ref<any[]>([]);
 onMounted(async () => {
   // 获取字典数据
   protectionTypes.value = getDictOptions(DICT_KEYS.EMERGENCY_PROTECTION_TYPE);
+  // 加载片区列表
+  await loadAreaList();
 });
 
 // 新增应急防护用品

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

@@ -6,7 +6,7 @@ import { computed } from 'vue';
 import { VbenAvatar } from '@vben/common-ui';
 import { DictEnum } from '@vben/constants';
 
-import { ElDescriptions, ElDescriptionsItem, ElTooltip } from 'element-plus';
+import { ElDescriptions, ElDescriptionsItem, ElTooltip, ElTag } from 'element-plus';
 
 import { renderDict } from '#/utils/render';
 
@@ -31,8 +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: '待处理', 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>
@@ -49,10 +81,26 @@ const diffUpdateTimeString = computed(() => {
       size="large"
     >
       <template #extra>
-        <component :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 }}
@@ -73,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>
@@ -93,3 +141,7 @@ const diffUpdateTimeString = computed(() => {
   padding-bottom: 8px !important;
 }
 </style>
+
+
+
+

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" />
+    <ApprovalTimeline :id="workOrderDetail?.id" />
   </div>
 </template>

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

@@ -42,9 +42,17 @@ interface Props {
    */
   task?: TaskInfo;
   /**
+   * 工单详情
+   */
+  workOrderDetail?: any;
+  /**
    * 审批类型
    */
   type: ApprovalType;
+  /**
+   * 按钮权限（可选，外部传入覆盖内部计算）
+   */
+  buttonPermissions?: Record<string, boolean>;
 }
 
 /**
@@ -55,6 +63,11 @@ const onlyForBtnPermissionTask = ref<TaskInfo>();
  * 按钮权限
  */
 const buttonPermissions = computed(() => {
+  // 如果外部传入了buttonPermissions，优先使用
+  if (props.buttonPermissions) {
+    return props.buttonPermissions;
+  }
+  
   const record: Record<string, boolean> = {};
   if (!onlyForBtnPermissionTask.value) {
     return record;
@@ -135,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>
@@ -153,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>
@@ -192,7 +205,7 @@ async function handleCopy(text: string) {
           <ElTabPane key="1" label="工单详情">
             <ApprovalDetails
               :current-flow-info="currentFlowInfo"
-              :task="task"
+              :work-order-detail="workOrderDetail"
             />
           </ElTabPane>
 
@@ -208,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')"
       />
@@ -218,3 +232,4 @@ async function handleCopy(text: string) {
     </slot>
   </div>
 </template>
+

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, Users } from '@element-plus/icons-vue';
-// import { Avatar } 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,34 +25,53 @@ 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.approver?.split(',').length > 1,
+  () => 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>
   <ElTimelineItem>
     <template #dot>
       <div class="relative rounded-full border">
-        <ElAvatar class="bg-primary-400" v-if="isMultiplePerson" :size="36">
-          <!-- <Users /> -->
-        </ElAvatar>
+        <ElAvatar class="bg-primary-400" v-if="isMultiplePerson" :size="36"/>
         <VbenAvatar
           v-else
-          :alt="item?.approveName ?? 'unknown'"
+          :alt="props.item?.operatorName ?? 'unknown'"
           class="bg-primary size-[36px] rounded-full text-white"
           src=""
         />
@@ -69,54 +86,127 @@ const isMultiplePerson = computed(
         ></div>
       </div>
     </template>
-    <div class="mb-5 ml-2 flex flex-col gap-1">
+    <div class="mb-5 ml-2 flex flex-col gap-1" style="padding-left: 15px;">
       <div class="flex items-center gap-1">
-        <div class="font-bold">{{ item.nodeName }}</div>
-        <component :is="renderDict(item.flowStatus, DictEnum.WF_TASK_STATUS)" />
+        <div class="font-bold">{{ props.item.operationContent }}</div>
+        <component :is="renderDict(props.item.status, DictEnum.TICKET_STATUS)" />
       </div>
 
       <div :class="cn('mt-2 flex flex-wrap gap-2')" v-if="isMultiplePerson">
         <!-- 如果昵称中带, 这里的处理是不准确的 -->
         <div
           :class="cn('bg-foreground/5 flex items-center rounded-full', 'p-1')"
-          v-for="(name, index) in item.approveName.split(',')"
-          :key="index"
-        >
-          <Avatar
-            class="bg-primary-400 flex items-center justify-center"
-            :size="24"
-          >
-            <User />
-          </Avatar>
+          v-for="(name, index) in props.item.approveName.split(',')"
+          :key="index">
           <span class="px-1">{{ name }}</span>
         </div>
       </div>
-      <div v-else>{{ item.approveName }}</div>
+      <div>{{ props.item.operatorName }}</div>
 
-      <div>{{ item.updateTime }}</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="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">{{ 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 class="text-foreground/75 break-all">{{ props.item.message }}</div>
       </div>
     </div>
   </ElTimelineItem>
 </template>
+
+
+

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, shallowRef } from 'vue';
+import { onMounted, shallowRef, watch } from 'vue';
 
 import { ElEmpty, ElMessage, ElTimeline } from 'element-plus';
 
@@ -8,30 +8,53 @@ import { requestClient } from '#/api/request';
 import ApprovalTimelineItem from './approval-timeline-item.vue';
 
 interface Props {
-  id: string;
+  id?: string | number; // 修改为同时接受字符串和数字类型
 }
 
 const props = defineProps<Props>();
 const list = shallowRef([]);
 
-onMounted(async () => {
-  if (!props.id) return;
+// 提取数据加载逻辑为单独函数
+async function loadData() {
+  // 使用更严格的检查，确保id为有效字符串或数字时才执行请求
+  if (!props.id || props.id === 'undefined' || props.id === 0) {
+    list.value = [];
+    return;
+  }
 
   try {
+    // 将id转换为字符串类型，确保API请求参数类型正确
+    const orderId = String(props.id);
     const resp = await requestClient.get('/workOrderRecord/record/list', {
-      params: { orderId: props.id },
+      params: { orderId },
     });
-    list.value = resp.data;
-    console.log(resp.data);
+    list.value = resp.rows || [];
   } catch {
     ElMessage.error('获取工单记录失败');
   }
+}
+
+// 组件挂载时加载数据
+onMounted(() => {
+  console.log(props.id);
+  loadData();
+});
+
+// 监听id属性变化，当id变化时重新加载数据
+watch(() => props.id, () => {
+  console.log(props.id);
+  loadData();
 });
 </script>
 
 <template>
-  <ElTimeline v-if="id">
-    <ApprovalTimelineItem v-for="item in list" :key="item.id" :item="item" />
+  <ElTimeline v-if="id" style="padding-top: 20px; margin-top: 20px; border-top: 1px solid #e5e5e5;">
+    <ApprovalTimelineItem v-for="item in list" :key="item.id" :item="item"  style="padding-left: 15px;"/>
   </ElTimeline>
   <ElEmpty v-else />
 </template>
+
+
+
+
+

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

@@ -1,50 +1,113 @@
 <script setup lang="ts">
 import type { LeaveVO } from '../leave/api/model';
 
-import { onMounted, shallowRef } from 'vue';
-
 import dayjs from 'dayjs';
+import { ref, watchEffect } from 'vue';
+import { ElImage, ElImageViewer } from 'element-plus';
 
 defineOptions({
   name: 'LeaveDescription',
   inheritAttrs: false,
 });
 
-const props = defineProps<{ task: LeaveVO }>();
+const props = defineProps<{ workOrderDetail: LeaveVO }>();
+
+// 附件数组，使用ref存储以保持引用稳定
+const attachmentsArray = ref<string[]>([]);
+
+// 图片预览相关
+const previewVisible = ref(false);
+const previewIndex = ref(0);
 
-const data = shallowRef<LeaveVO>();
-onMounted(async () => {
-  data.value = props.task;
+// 监听附件URL变化，更新附件数组
+watchEffect(() => {
+  if (!props.workOrderDetail?.attachmentsUrl) {
+    attachmentsArray.value = [];
+    return;
+  }
+  
+  let urls: string[] = [];
+  
+  // 如果已经是数组，确保每个元素都是字符串
+  if (Array.isArray(props.workOrderDetail.attachmentsUrl)) {
+    urls = props.workOrderDetail.attachmentsUrl.map(item => String(item));
+  } else {
+    try {
+      // 尝试解析JSON字符串
+      const parsed = JSON.parse(String(props.workOrderDetail.attachmentsUrl));
+      if (Array.isArray(parsed)) {
+        urls = parsed.map(item => String(item));
+      } else {
+        urls = [String(parsed)];
+      }
+    } catch (e) {
+      // 解析失败，将整个字符串作为单个URL
+      urls = [String(props.workOrderDetail.attachmentsUrl)];
+    }
+  }
+  
+  // 过滤掉空字符串
+  attachmentsArray.value = urls.filter(url => url.trim() !== '');
 });
 
-function formatDate(date: string) {
-  return dayjs(date).format('YYYY-MM-DD');
+// 图片预览函数
+function handlePreview(index: number) {
+  previewIndex.value = index;
+  previewVisible.value = true;
+}
+
+// 关闭预览
+function closePreview() {
+  previewVisible.value = false;
 }
 </script>
 
 <template>
   <div class="rounded-[6px] border p-2">
-    <ElDescriptions v-if="data" :column="1">
+    <ElDescriptions v-if="props.workOrderDetail" :column="4" class="mb-2">
       <ElDescriptionsItem label="工单类型：">
-        {{ data.ticketTypeName }}
+        {{ props.workOrderDetail.ticketTypeName }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="场站：">
-        {{ data.stationName || '无' }}
+        {{ props.workOrderDetail.stationName || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="联系人：">
-        {{ data.contact || '无' }}
+        {{ props.workOrderDetail.contact || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="联系电话：">
-        {{ data.phone || '无' }}
+        {{ props.workOrderDetail.phone || '无' }}
       </ElDescriptionsItem>
+    </ElDescriptions>
+    <ElDescriptions v-if="props.workOrderDetail" :column="1">
       <ElDescriptionsItem label="提报内容：">
-        {{ data.content || '无' }}
+        {{ props.workOrderDetail.content || '无' }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="附件：">
-        {{ data.attachment || '无' }}
+        <div v-if="attachmentsArray.length > 0" class="flex flex-wrap gap-2">
+          <div
+            v-for="(url, index) in attachmentsArray"
+            :key="index"
+            class="w-20 h-20 cursor-pointer rounded overflow-hidden"
+            @click="handlePreview(index)"
+          >
+            <ElImage
+              :src="url"
+              fit="cover"
+              class="w-full h-full"
+            />
+          </div>
+        </div>
+        <span v-else>无</span>
       </ElDescriptionsItem>
     </ElDescriptions>
 
     <ElSkeleton active v-else :rows="4" />
+    <!-- 图片预览组件 -->
+  <ElImageViewer
+    v-if="previewVisible"
+    :url-list="attachmentsArray"
+    :initial-index="previewIndex"
+    @close="closePreview"
+  />
   </div>
 </template>

apps/web-ele/src/views/workflow/order/creatOrder.vue

@@ -1,12 +1,41 @@
 <script lang="ts" setup>
-import { ref, reactive } from 'vue';
+import { onMounted, reactive, ref, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
 import { Page } from '@vben/common-ui';
-import { ElForm, ElFormItem, ElInput, ElSelect, ElUpload, ElSwitch, ElButton, ElMessage, ElTreeSelect } from 'element-plus';
+
 import { UploadFilled } from '@element-plus/icons-vue';
-import { categoryTree } from '#/api/workflow/category/index';
+import {
+  ElButton,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElMessage,
+  ElSelect,
+  ElSwitch,
+  ElTreeSelect,
+  ElUpload,
+} from 'element-plus';
+
+import { requestClient } from '#/api/request';
 import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { categoryTree } from '#/api/workflow/category/index';
+import { getWorkOrderDetail } from '#/api/workflow/instance/index';
 import { getSingleImageUploadConfig } from '#/components/upload/config';
-import { requestClient } from '#/api/request';
+
+// 接收props参数
+const props = defineProps<{
+  id?: string;
+}>();
+
+// 定义emit事件
+const emit = defineEmits<{
+  close: [];
+}>();
+
+// 路由相关
+const route = useRoute();
+const router = useRouter();
 
 // 表单数据
 const formData = reactive({
@@ -16,19 +45,25 @@ const formData = reactive({
   phone: '',
   content: '',
   attachments: '',
-  isSubmit: false
+  isSubmit: false,
 });
 
 // 表单规则
 const formRules = reactive({
-  ticketType: [{ required: true, message: '请选择工单类型', trigger: 'change' }],
+  ticketType: [
+    { required: true, message: '请选择工单类型', trigger: 'change' },
+  ],
   stationId: [{ required: true, message: '请选择场站', trigger: 'change' }],
   contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
   phone: [
     { required: true, message: '请输入联系电话', trigger: 'blur' },
-    { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+    {
+      pattern: /^1[3-9]\d{9}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur',
+    },
   ],
-  content: [{ required: true, message: '请输入提报内容', trigger: 'blur' }]
+  content: [{ required: true, message: '请输入提报内容', trigger: 'blur' }],
 });
 
 // 工单类型选项
@@ -70,7 +105,7 @@ const handleUploadSuccess = (response, file, fileList) => {
   if (response.code === 200) {
     // 将文件路径添加到attachments字段
     console.log(response, file, fileList);
-    const paths = fileList.map(f => f.response.data.fileName).join(',');
+    const paths = fileList.map((f) => f.response.data.fileName).join(',');
     formData.attachments = paths;
   } else {
     ElMessage.error('文件上传失败');
@@ -85,35 +120,95 @@ const handleUploadError = (error) => {
 
 // 移除文件回调
 const handleRemove = (file, fileList) => {
-  // 更新attachments字段
-  const paths = fileList.map(f => f.response.data.url).join(',');
-  formData.attachments = paths;
+  // 更新attachments字段（文件名）
+  const fileNames = fileList.map((f) => f.response.data.fileName).join(',');
+  formData.attachments = fileNames;
+};
+
+// 获取工单详情
+const getOrderDetail = async (orderId?: string) => {
+  const id = orderId || props.id || route.query.id;
+  if (!id) return;
+
+  try {
+    const detail = await getWorkOrderDetail(id as string);
+    console.log('工单详情:', detail);
+    // 填充表单数据
+    formData.ticketType = Number(detail.ticketType) || '';
+    formData.stationId = Number(detail.stationId) || '';
+    formData.contact = detail.contact || '';
+    formData.phone = detail.phone || '';
+    formData.content = detail.content || '';
+    formData.attachments = detail.attachments || '';
+    formData.isSubmit = detail.isSubmit || false;
+
+    // 处理附件文件列表
+    if (detail.attachmentsUrl && Array.isArray(detail.attachmentsUrl)) {
+      const fileNames = formData.attachments
+        ? formData.attachments.split(',')
+        : [];
+      fileList.value = detail.attachmentsUrl.map((url, index) => ({
+        name: fileNames[index] || `file-${index}`,
+        url,
+        response: {
+          data: { url, fileName: fileNames[index] || `file-${index}` },
+        },
+      }));
+    }
+  } catch (error) {
+    ElMessage.error('获取工单详情失败');
+    console.error('获取工单详情失败:', error);
+  }
 };
 
+// 监听props.id变化，获取工单详情
+watch(
+  () => props.id,
+  (newId) => {
+    if (newId) {
+      getOrderDetail(newId);
+    }
+  },
+  { immediate: true },
+);
+
 // 表单提交
 const handleSubmit = async () => {
   if (!formRef.value) return;
-  
+
   try {
     await formRef.value.validate();
     console.log(formData);
-    // 调用创建工单接口
-    await requestClient.post('/workOrder/order', formData);
-    
-    ElMessage.success('工单创建成功');
-    
-    // 重置表单
-    formRef.value.resetFields();
-    fileList.value = [];
-    formData.attachments = '';
+    const id = props.id || route.query.id;
+
+    if (id) {
+      // 更新工单
+      await requestClient.put(`/workOrder/order/${id}`, formData);
+      ElMessage.success('工单更新成功');
+
+      // 如果是在drawer中打开的，需要关闭drawer
+      if (props.id) {
+        // 触发close事件通知drawer关闭
+        emit('close');
+      }
+    } else {
+      // 创建工单
+      await requestClient.post('/workOrder/order', formData);
+      ElMessage.success('工单创建成功');
+
+      // 重置表单
+      formRef.value.resetFields();
+      fileList.value = [];
+      formData.attachments = '';
+    }
   } catch (error) {
     if (error.name === 'ValidationError') {
       // 表单验证失败，Element Plus会自动提示错误信息
       return;
     }
-    
-    ElMessage.error('工单创建失败');
-    console.error('工单创建失败:', error);
+
+    ElMessage.error(id ? '工单更新失败' : '工单创建失败');
+    console.error('工单操作失败:', error);
   }
 };
 
@@ -121,10 +216,22 @@ const handleSubmit = async () => {
 const initData = () => {
   getTicketTypes();
   getStations();
+  // 只有在非drawer模式下（没有props.id）才调用getOrderDetail
+  // drawer模式下由watch监听props.id变化来获取数据
+  if (!props.id) {
+    getOrderDetail();
+  }
 };
 
 // 页面加载时初始化数据
-initData();
+onMounted(() => {
+  initData();
+});
+
+// 暴露方法给父组件
+defineExpose({
+  handleSubmit,
+});
 </script>
 
 <template>
@@ -147,7 +254,7 @@ initData();
             style="width: 100%"
             :props="{ label: 'label', value: 'id', children: 'children' }"
             filterable
-          ></ElTreeSelect>
+          />
         </ElFormItem>
 
         <!-- 场站 -->
@@ -162,24 +269,18 @@ initData();
               :key="option.id"
               :label="option.stationName"
               :value="option.id"
-            ></ElOption>
+            />
           </ElSelect>
         </ElFormItem>
 
         <!-- 联系人 -->
         <ElFormItem label="联系人" prop="contact">
-          <ElInput
-            v-model="formData.contact"
-            placeholder="请输入联系人"
-          ></ElInput>
+          <ElInput v-model="formData.contact" placeholder="请输入联系人" />
         </ElFormItem>
 
         <!-- 联系电话 -->
         <ElFormItem label="联系电话" prop="phone">
-          <ElInput
-            v-model="formData.phone"
-            placeholder="请输入联系电话"
-          ></ElInput>
+          <ElInput v-model="formData.phone" placeholder="请输入联系电话" />
         </ElFormItem>
 
         <!-- 提报内容 -->
@@ -189,7 +290,7 @@ initData();
             type="textarea"
             :rows="4"
             placeholder="请输入提报内容"
-          ></ElInput>
+          />
         </ElFormItem>
 
         <!-- 提报附件 -->
@@ -216,11 +317,11 @@ initData();
 
         <!-- 是否提交 -->
         <ElFormItem label="是否提交">
-          <ElSwitch v-model="formData.isSubmit"></ElSwitch>
+          <ElSwitch v-model="formData.isSubmit" />
         </ElFormItem>
 
-        <!-- 提交按钮 -->
-        <ElFormItem>
+        <!-- 提交按钮 - 仅在创建模式下显示 -->
+        <ElFormItem v-if="!props.id">
           <ElButton type="primary" @click="handleSubmit">创建工单</ElButton>
         </ElFormItem>
       </ElForm>
@@ -239,8 +340,3 @@ initData();
   max-width: 600px;
 }
 </style>
-
-
-
-
-

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

@@ -0,0 +1,287 @@
+<!-- eslint-disable no-use-before-define -->
+<script setup lang="ts">
+import type { TaskInfo } from '#/api/workflow/task/model';
+
+import { computed, onMounted, ref, useTemplateRef } from 'vue';
+
+import { Page } from '@vben/common-ui';
+import { useTabs } from '@vben/hooks';
+
+import { Refresh, Search } from '@element-plus/icons-vue';
+import { ElButton, ElEmpty, ElInput, ElMessage, ElTooltip } from 'element-plus';
+import { cloneDeep, debounce } from 'lodash-es';
+
+import { getWorkOrderDetail, pageByDelay } from '#/api/workflow/instance';
+
+import { ApprovalCard, ApprovalPanel } from '../components';
+import { bottomOffset } from './constant';
+
+const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;
+
+const taskList = ref<(TaskInfo & { active: boolean })[]>([]);
+const taskTotal = ref(0);
+const page = ref(1);
+const loading = ref(false);
+
+const defaultFormData = {
+  searchKeyword: '', // 通用搜索关键词
+  nodeName: '', // 任务名称
+  flowCode: '', // 流程定义编码
+  category: null as null | number, // 流程分类
+};
+const formData = ref(cloneDeep(defaultFormData));
+
+/**
+ * 是否已经加载全部数据 即 taskList.length === taskTotal
+ */
+const isLoadComplete = computed(
+  () => taskList.value.length === taskTotal.value,
+);
+
+// 卡片父容器的ref
+const cardContainerRef = useTemplateRef('cardContainerRef');
+
+/**
+ * @param resetFields 是否清空查询参数
+ */
+async function reload(resetFields: boolean = false) {
+  // 需要先滚动到顶部
+  cardContainerRef.value?.scroll({ top: 0, behavior: 'auto' });
+
+  page.value = 1;
+  currentTask.value = undefined;
+  taskTotal.value = 0;
+  lastSelectId.value = '';
+
+  if (resetFields) {
+    formData.value = cloneDeep(defaultFormData);
+  }
+
+  loading.value = true;
+  try {
+    // 根据搜索关键词类型动态决定搜索字段
+    const searchParams = { ...formData.value };
+    const { searchKeyword, ...otherParams } = searchParams;
+
+    // 如果有搜索关键词
+    if (searchKeyword) {
+      // 检查是否为数字
+      if (/^\d+$/.test(searchKeyword)) {
+        // 数字搜索orderNo
+        otherParams.orderNo = searchKeyword;
+      } else {
+        // 文字搜索content
+        otherParams.content = searchKeyword;
+      }
+    }
+
+    const resp = await pageByDelay({
+      pageSize: 10,
+      pageNum: page.value,
+      ...otherParams,
+    });
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
+    taskTotal.value = resp.total;
+  } catch {
+    ElMessage.error('加载任务列表失败');
+  } finally {
+    loading.value = false;
+  }
+
+  // 默认选中第一个
+  if (taskList.value.length > 0) {
+    const firstTask = taskList.value[0]!;
+    currentTask.value = firstTask;
+    currentTaskButtonData.value = firstTask.button;
+    handleCardClick(firstTask);
+  }
+}
+
+onMounted(reload);
+
+const handleScroll = debounce(async (e: Event) => {
+  if (!e.target) {
+    return;
+  }
+  // e.target.scrollTop 是元素顶部到当前可视区域顶部的距离，即已滚动的高度。
+  // e.target.clientHeight 是元素的可视高度。
+  // e.target.scrollHeight 是元素的总高度。
+  const { scrollTop, clientHeight, scrollHeight } = e.target as HTMLElement;
+  // 判断是否滚动到底部
+  const isBottom = scrollTop + clientHeight >= scrollHeight - bottomOffset;
+
+  // 滚动到底部且没有加载完成
+  if (isBottom && !isLoadComplete.value) {
+    loading.value = true;
+    try {
+      page.value += 1;
+
+      // 根据搜索关键词类型动态决定搜索字段
+      const searchParams = { ...formData.value };
+      const { searchKeyword, ...otherParams } = searchParams;
+
+      // 如果有搜索关键词
+      if (searchKeyword) {
+        // 检查是否为数字
+        if (/^\d+$/.test(searchKeyword)) {
+          // 数字搜索orderNo
+          otherParams.orderNo = searchKeyword;
+        } else {
+          // 文字搜索content
+          otherParams.content = searchKeyword;
+        }
+      }
+
+      const resp = await pageByDelay({
+        pageSize: 10,
+        pageNum: page.value,
+        ...otherParams,
+      });
+      taskList.value.push(
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
+      );
+    } catch {
+      ElMessage.error('加载更多任务失败');
+    } finally {
+      loading.value = false;
+    }
+  }
+}, 200);
+
+const lastSelectId = ref('');
+const currentTask = ref<TaskInfo>();
+const currentWorkOrderDetail = ref<any>();
+const currentTaskButtonData = ref<any>('');
+async function handleCardClick(item: TaskInfo) {
+  const { taskId, orderId } = item;
+  // 点击的是同一个
+  if (lastSelectId.value === taskId) {
+    return;
+  }
+  currentTask.value = item;
+  currentTaskButtonData.value = item.button;
+  // 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
+  taskList.value.forEach((item) => {
+    item.active = item.taskId === taskId;
+  });
+  lastSelectId.value = taskId;
+  // 调用获取工单详情的接口
+  try {
+    const detail = await getWorkOrderDetail(orderId);
+    // 保存工单详情
+    currentWorkOrderDetail.value = detail;
+  } catch (error) {
+    console.error('获取工单详情失败:', error);
+    ElMessage.error('获取工单详情失败');
+  }
+}
+
+const { refreshTab } = useTabs();
+
+// 按钮权限控制
+const currentTaskButtonPermissions = computed(() => {
+  // 如果没有当前任务，返回空对象
+  if (!currentTaskButtonData.value) {
+    return {};
+  }
+  // 初始化权限对象
+  const permissions: Record<string, boolean> = {};
+  const button = currentTaskButtonData.value;
+  if (button) {
+    const buttonArray = button.split(',');
+    // 设置对应按钮的权限
+    permissions.approveDelay = buttonArray.includes('approve_delay');
+  }
+  console.log('currentTaskButtonPermissions', permissions);
+  return permissions;
+});
+</script>
+
+<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 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
+                v-model="formData.searchKeyword"
+                placeholder="输入数字搜索工单号，输入文字搜索内容"
+                clearable
+                class="w-full"
+                :suffix-icon="Search"
+                @keyup.enter="reload(false)"
+              />
+              <ElTooltip placement="top" content="重置">
+                <ElButton @click="reload(true)" :icon="Refresh" />
+              </ElTooltip>
+            </div>
+          </div>
+        </div>
+        <div
+          ref="cardContainerRef"
+          class="thin-scrollbar flex flex-1 flex-col gap-2 overflow-y-auto py-3"
+          @scroll="handleScroll"
+        >
+          <template v-if="taskList.length > 0">
+            <ApprovalCard
+              v-for="item in taskList"
+              :key="item.id"
+              :info="item"
+              class="mx-2"
+              @click="handleCardClick(item)"
+            />
+          </template>
+          <ElEmpty v-else :image="emptyImage" description="暂无数据" />
+          <div
+            v-if="isLoadComplete && taskList.length > 0"
+            class="flex items-center justify-center text-[14px] opacity-50"
+          >
+            没有更多数据了
+          </div>
+          <!-- 遮罩loading层 -->
+          <div
+            v-if="loading"
+            class="absolute left-0 top-0 flex h-full w-full items-center justify-center bg-[rgba(0,0,0,0.1)]"
+          ></div>
+        </div>
+        <!-- total显示 -->
+        <div
+          class="bg-background sticky bottom-0 w-full rounded-b-lg border-t-[1px] py-2"
+        >
+          <div class="flex items-center justify-center">
+            共 {{ taskTotal }} 条记录
+          </div>
+        </div>
+      </div>
+      <ApprovalPanel
+        :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
+        :button-permissions="currentTaskButtonPermissions"
+        type="delay"
+        @reload="refreshTab"
+      />
+    </div>
+  </Page>
+</template>
+
+<style lang="scss" scoped>
+.thin-scrollbar {
+  &::-webkit-scrollbar {
+    width: 5px;
+  }
+}
+</style>

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

@@ -5,17 +5,26 @@ import type { TaskInfo } from '#/api/workflow/task/model';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { DictEnum } from '@vben/constants';
 import { useTabs } from '@vben/hooks';
 
-import { Filter, Refresh, Search } from '@element-plus/icons-vue';
-import { ElButton, ElEmpty, ElForm, ElFormItem, ElInput, ElMessage, ElPopover, ElTooltip } from 'element-plus';
-
+import { Refresh, Search } from '@element-plus/icons-vue';
+import {
+  ElButton,
+  ElEmpty,
+  ElInput,
+  ElMessage,
+  ElOption,
+  ElSelect,
+  ElTooltip,
+} from 'element-plus';
 import { cloneDeep, debounce } from 'lodash-es';
 
-import { pageByCurrent, getWorkOrderDetail } from '#/api/workflow/instance';
+import { pageByCurrent } from '#/api/workflow/instance';
+import { getDictOptions } from '#/utils/dict';
 
-import { bottomOffset } from './constant';
 import { ApprovalCard, ApprovalPanel } from '../components';
+import { bottomOffset } from './constant';
 
 const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;
 
@@ -25,10 +34,8 @@ const page = ref(1);
 const loading = ref(false);
 
 const defaultFormData = {
-  flowName: '', // 流程定义名称
-  nodeName: '', // 任务名称
-  flowCode: '', // 流程定义编码
-  category: null as null | number, // 流程分类
+  searchKeyword: '', // 通用搜索关键词
+  status: null as null | number, // 工单状态
 };
 const formData = ref(cloneDeep(defaultFormData));
 
@@ -39,6 +46,9 @@ const isLoadComplete = computed(
   () => taskList.value.length === taskTotal.value,
 );
 
+// 获取状态下拉框选项
+const statusOptions = getDictOptions(DictEnum.TICKET_STATUS);
+
 // 卡片父容器的ref
 const cardContainerRef = useTemplateRef('cardContainerRef');
 
@@ -50,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 = '';
 
@@ -60,13 +70,32 @@ async function reload(resetFields: boolean = false) {
 
   loading.value = true;
   try {
+    // 根据搜索关键词类型动态决定搜索字段
+    const searchParams = { ...formData.value };
+    const { searchKeyword, ...otherParams } = searchParams;
+
+    // 如果有搜索关键词
+    if (searchKeyword) {
+      // 检查是否为数字
+      if (/^\d+$/.test(searchKeyword)) {
+        // 数字搜索orderNo
+        otherParams.orderNo = searchKeyword;
+      } else {
+        // 文字搜索content
+        otherParams.content = searchKeyword;
+      }
+    }
+
     const resp = await pageByCurrent({
       pageSize: 10,
       pageNum: page.value,
-      ...formData.value,
+      ...otherParams,
     });
-    console.log(resp);
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
@@ -77,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);
   }
 }
@@ -100,14 +129,34 @@ const handleScroll = debounce(async (e: Event) => {
     loading.value = true;
     try {
       page.value += 1;
+
+      // 根据搜索关键词类型动态决定搜索字段
+      const searchParams = { ...formData.value };
+      const { searchKeyword, ...otherParams } = searchParams;
+
+      // 如果有搜索关键词
+      if (searchKeyword) {
+        // 检查是否为数字
+        if (/^\d+$/.test(searchKeyword)) {
+          // 数字搜索orderNo
+          otherParams.orderNo = searchKeyword;
+        } else {
+          // 文字搜索content
+          otherParams.content = searchKeyword;
+        }
+      }
+
       const resp = await pageByCurrent({
         pageSize: 10,
         pageNum: page.value,
-        ...formData.value,
+        ...otherParams,
       });
-      console.log(resp);
       taskList.value.push(
-        ...resp.rows.map((item) => ({ ...item, active: false })),
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
       );
     } catch {
       ElMessage.error('加载更多任务失败');
@@ -118,33 +167,49 @@ 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;
   });
   lastSelectId.value = id;
-  console.log(lastSelectId.value);
-  
-  // 调用获取工单详情的接口
-  try {
-    const detail = await getWorkOrderDetail(id);
-    console.log('工单详情:', detail);
-    // 可以在这里使用获取到的工单详情数据
-  } catch (error) {
-    console.error('获取工单详情失败:', error);
-    ElMessage.error('获取工单详情失败');
-  }
 }
 
 const { refreshTab } = useTabs();
+
+// 按钮权限控制
+const currentTaskButtonPermissions = computed(() => {
+  // 如果没有当前任务，返回空对象
+  if (!currentWorkOrderDetail.value) {
+    return {};
+  }
+  // 根据任务状态判断工单类型
+  const { status } = currentWorkOrderDetail.value;
+  // 初始化权限对象
+  const permissions: Record<string, boolean> = {};
+  // 新工单 (status: "news")
+  if (status === 'new') {
+    // 新工单可以进行的操作
+    permissions.edit = true; // 编辑
+    permissions.submit = true; // 提交
+    permissions.delete = true; // 删除
+  }
+  // 已处理工单 (status: "processed")
+  else if (status === 'processed') {
+    // 已处理工单可以进行的操作
+    permissions.edit = false; // 编辑
+    permissions.submit = false; // 提交
+    permissions.delete = false; // 删除
+  }
+  return permissions;
+});
 </script>
 
 <template>
@@ -157,46 +222,36 @@ const { refreshTab } = useTabs();
         <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="flex items-center gap-1">
-            <ElInput
-              v-model="formData.flowName"
-              placeholder="流程名称搜索"
-              clearable
-              class="w-full"
-              :suffix-icon="Search"
-              @keyup.enter="reload(false)"
-            />
-            <ElTooltip placement="top" content="重置">
-              <ElButton @click="reload(true)" :icon="Refresh" />
-            </ElTooltip>
-            <ElPopover placement="top-end" trigger="click">
-              <template #reference>
-                <ElButton :icon="Filter"  style="margin-left: 0;" />
-              </template>
-              <template #default>
-                <ElForm
-                  :model="formData"
-                  label-width="80px"
-                  class="w-[300px]"
-                  @submit.prevent="reload(false)"
-                >
-                  <ElFormItem label="任务名称">
-                    <ElInput v-model="formData.nodeName" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem label="流程编码">
-                    <ElInput v-model="formData.flowCode" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem>
-                    <div class="flex justify-end gap-2">
-                      <ElButton type="primary" @click="reload(false)">
-                        搜索
-                      </ElButton>
-                      <ElButton @click="reload(true)"> 重置 </ElButton>
-                    </div>
-                  </ElFormItem>
-                </ElForm>
-              </template>
-            </ElPopover>
+          <div class="grid grid-cols-1 gap-2">
+            <div class="flex items-center gap-1">
+              <ElInput
+                v-model="formData.searchKeyword"
+                placeholder="输入数字搜索工单号，输入文字搜索内容"
+                clearable
+                class="w-full"
+                :suffix-icon="Search"
+                @keyup.enter="reload(false)"
+              />
+            </div>
+            <div class="flex items-center gap-1">
+              <ElSelect
+                v-model="formData.status"
+                placeholder="状态"
+                clearable
+                class="w-full"
+                @change="reload(false)"
+              >
+                <ElOption
+                  v-for="option in statusOptions"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+                />
+              </ElSelect>
+              <ElTooltip placement="top" content="重置">
+                <ElButton @click="reload(true)" :icon="Refresh" />
+              </ElTooltip>
+            </div>
           </div>
         </div>
         <div
@@ -235,7 +290,12 @@ const { refreshTab } = useTabs();
           </div>
         </div>
       </div>
-      <ApprovalPanel :task="currentTask" type="myself" @reload="refreshTab" />
+      <ApprovalPanel
+        :work-order-detail="currentWorkOrderDetail"
+        :button-permissions="currentTaskButtonPermissions"
+        type="myself"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>
@@ -251,4 +311,3 @@ const { refreshTab } = useTabs();
   @apply thin-scrollbar;
 }
 </style>
-

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

@@ -5,12 +5,13 @@ import type { TaskInfo } from '#/api/workflow/task/model';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { useTabs } from '@vben/hooks';
 
-import { ElEmpty, ElMessage } from 'element-plus';
-
+import { Refresh, Search } from '@element-plus/icons-vue';
+import { ElButton, ElEmpty, ElInput, ElMessage, ElTooltip } from 'element-plus';
 import { cloneDeep, debounce } from 'lodash-es';
 
-import { pageByTaskCopy } from '#/api/workflow/task';
+import { getWorkOrderDetail, pageByCc } from '#/api/workflow/instance';
 
 import { ApprovalCard, ApprovalPanel } from '../components';
 import { bottomOffset } from './constant';
@@ -23,7 +24,7 @@ const page = ref(1);
 const loading = ref(false);
 
 const defaultFormData = {
-  flowName: '', // 流程定义名称
+  searchKeyword: '', // 通用搜索关键词
   nodeName: '', // 任务名称
   flowCode: '', // 流程定义编码
   category: null as null | number, // 流程分类
@@ -58,12 +59,32 @@ async function reload(resetFields: boolean = false) {
 
   loading.value = true;
   try {
-    const resp = await pageByTaskCopy({
+    // 根据搜索关键词类型动态决定搜索字段
+    const searchParams = { ...formData.value };
+    const { searchKeyword, ...otherParams } = searchParams;
+
+    // 如果有搜索关键词
+    if (searchKeyword) {
+      // 检查是否为数字
+      if (/^\d+$/.test(searchKeyword)) {
+        // 数字搜索orderNo
+        otherParams.orderNo = searchKeyword;
+      } else {
+        // 文字搜索content
+        otherParams.content = searchKeyword;
+      }
+    }
+
+    const resp = await pageByCc({
       pageSize: 10,
       pageNum: page.value,
-      ...formData.value,
+      ...otherParams,
     });
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
@@ -75,6 +96,7 @@ async function reload(resetFields: boolean = false) {
   if (taskList.value.length > 0) {
     const firstTask = taskList.value[0]!;
     currentTask.value = firstTask;
+    currentTaskButtonData.value = firstTask.button;
     handleCardClick(firstTask);
   }
 }
@@ -97,13 +119,34 @@ const handleScroll = debounce(async (e: Event) => {
     loading.value = true;
     try {
       page.value += 1;
-      const resp = await pageByTaskCopy({
+
+      // 根据搜索关键词类型动态决定搜索字段
+      const searchParams = { ...formData.value };
+      const { searchKeyword, ...otherParams } = searchParams;
+
+      // 如果有搜索关键词
+      if (searchKeyword) {
+        // 检查是否为数字
+        if (/^\d+$/.test(searchKeyword)) {
+          // 数字搜索orderNo
+          otherParams.orderNo = searchKeyword;
+        } else {
+          // 文字搜索content
+          otherParams.content = searchKeyword;
+        }
+      }
+
+      const resp = await pageByCc({
         pageSize: 10,
         pageNum: page.value,
-        ...formData.value,
+        ...otherParams,
       });
       taskList.value.push(
-        ...resp.rows.map((item) => ({ ...item, active: false })),
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
       );
     } catch {
       ElMessage.error('加载更多任务失败');
@@ -115,19 +158,58 @@ 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 { id } = item;
+  const { taskId, orderId } = item;
   // 点击的是同一个
-  if (lastSelectId.value === id) {
+  if (lastSelectId.value === taskId) {
     return;
   }
   currentTask.value = item;
+  currentTaskButtonData.value = item.button;
   // 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
   taskList.value.forEach((item) => {
-    item.active = item.id === id;
+    item.active = item.taskId === taskId;
   });
-  lastSelectId.value = id;
+  lastSelectId.value = taskId;
+  // 调用获取工单详情的接口
+  try {
+    const detail = await getWorkOrderDetail(orderId);
+    // 保存工单详情
+    currentWorkOrderDetail.value = detail;
+  } catch (error) {
+    console.error('获取工单详情失败:', error);
+    ElMessage.error('获取工单详情失败');
+  }
 }
+
+const { refreshTab } = useTabs();
+
+// 按钮权限控制
+const currentTaskButtonPermissions = computed(() => {
+  // 如果没有当前任务，返回空对象
+  if (!currentTaskButtonData.value) {
+    return {};
+  }
+  // 初始化权限对象
+  const permissions: Record<string, boolean> = {};
+
+  // 获取 button 字段
+  const button = currentTaskButtonData.value;
+  // 如果 button 字段存在，解析为数组
+  if (button) {
+    const buttonArray = button.split(',');
+    console.log('buttonArray', buttonArray);
+    // 设置对应按钮的权限
+    permissions.handle = buttonArray.includes('handle');
+    permissions.delay = buttonArray.includes('delay');
+    permissions.cc = buttonArray.includes('cc');
+    permissions.back = buttonArray.includes('back');
+  }
+  console.log('currentTaskButtonPermissions', permissions);
+  return permissions;
+});
 </script>
 
 <template>
@@ -140,49 +222,20 @@ async function handleCardClick(item: TaskInfo) {
         <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="flex items-center gap-1">
-            <ElInput
-              v-model="formData.flowName"
-              placeholder="流程名称搜索"
-              clearable
-              class="w-full"
-              @keyup.enter="reload(false)"
-            />
-            <ElTooltip placement="top" content="重置">
-              <ElButton @click="reload(true)" circle>
-                <Refresh />
-              </ElButton>
-            </ElTooltip>
-            <ElPopover placement="top-end" trigger="click">
-              <template #reference>
-                <ElButton circle>
-                  <Filter />
-                </ElButton>
-              </template>
-              <template #default>
-                <ElForm
-                  :model="formData"
-                  label-width="80px"
-                  class="w-[300px]"
-                  @submit.prevent="reload(false)"
-                >
-                  <ElFormItem label="任务名称">
-                    <ElInput v-model="formData.nodeName" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem label="流程编码">
-                    <ElInput v-model="formData.flowCode" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem>
-                    <div class="flex justify-end gap-2">
-                      <ElButton type="primary" @click="reload(false)">
-                        搜索
-                      </ElButton>
-                      <ElButton @click="reload(true)"> 重置 </ElButton>
-                    </div>
-                  </ElFormItem>
-                </ElForm>
-              </template>
-            </ElPopover>
+          <div class="grid grid-cols-1 gap-2">
+            <div class="flex items-center gap-1">
+              <ElInput
+                v-model="formData.searchKeyword"
+                placeholder="输入数字搜索工单号，输入文字搜索内容"
+                clearable
+                class="w-full"
+                :suffix-icon="Search"
+                @keyup.enter="reload(false)"
+              />
+              <ElTooltip placement="top" content="重置">
+                <ElButton @click="reload(true)" :icon="Refresh" />
+              </ElTooltip>
+            </div>
           </div>
         </div>
         <div
@@ -210,9 +263,7 @@ async function handleCardClick(item: TaskInfo) {
           <div
             v-if="loading"
             class="absolute left-0 top-0 flex h-full w-full items-center justify-center bg-[rgba(0,0,0,0.1)]"
-          >
-            <Spin tip="加载中..." />
-          </div>
+          ></div>
         </div>
         <!-- total显示 -->
         <div
@@ -223,7 +274,13 @@ async function handleCardClick(item: TaskInfo) {
           </div>
         </div>
       </div>
-      <ApprovalPanel :task="currentTask" type="readonly" />
+      <ApprovalPanel
+        :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
+        :button-permissions="currentTaskButtonPermissions"
+        type="waiting"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>
@@ -234,8 +291,4 @@ async function handleCardClick(item: TaskInfo) {
     width: 5px;
   }
 }
-
-:deep(.el-card__body) {
-  @apply thin-scrollbar;
-}
 </style>

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

@@ -5,22 +5,13 @@ import type { TaskInfo } from '#/api/workflow/task/model';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { useTabs } from '@vben/hooks';
 
-import { Filter, Refresh } from '@element-plus/icons-vue';
-import {
-  ElButton,
-  ElEmpty,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElPopover,
-  ElTooltip,
-} from 'element-plus';
-
+import { Refresh, Search } from '@element-plus/icons-vue';
+import { ElButton, ElEmpty, ElInput, ElMessage, ElTooltip } from 'element-plus';
 import { cloneDeep, debounce } from 'lodash-es';
 
-import { pageByTaskFinish } from '#/api/workflow/task';
+import { getWorkOrderDetail, pageByCompleted } from '#/api/workflow/instance';
 
 import { ApprovalCard, ApprovalPanel } from '../components';
 import { bottomOffset } from './constant';
@@ -33,9 +24,10 @@ const page = ref(1);
 const loading = ref(false);
 
 const defaultFormData = {
-  flowName: '', // 流程定义名称
+  searchKeyword: '', // 通用搜索关键词
   nodeName: '', // 任务名称
   flowCode: '', // 流程定义编码
+  category: null as null | number, // 流程分类
 };
 const formData = ref(cloneDeep(defaultFormData));
 
@@ -67,22 +59,44 @@ async function reload(resetFields: boolean = false) {
 
   loading.value = true;
   try {
-    const resp = await pageByTaskFinish({
+    // 根据搜索关键词类型动态决定搜索字段
+    const searchParams = { ...formData.value };
+    const { searchKeyword, ...otherParams } = searchParams;
+
+    // 如果有搜索关键词
+    if (searchKeyword) {
+      // 检查是否为数字
+      if (/^\d+$/.test(searchKeyword)) {
+        // 数字搜索orderNo
+        otherParams.orderNo = searchKeyword;
+      } else {
+        // 文字搜索content
+        otherParams.content = searchKeyword;
+      }
+    }
+
+    const resp = await pageByCompleted({
       pageSize: 10,
       pageNum: page.value,
-      ...formData.value,
+      ...otherParams,
     });
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
   } finally {
     loading.value = false;
   }
+
   // 默认选中第一个
   if (taskList.value.length > 0) {
     const firstTask = taskList.value[0]!;
     currentTask.value = firstTask;
+    currentTaskButtonData.value = firstTask.button;
     handleCardClick(firstTask);
   }
 }
@@ -105,13 +119,34 @@ const handleScroll = debounce(async (e: Event) => {
     loading.value = true;
     try {
       page.value += 1;
-      const resp = await pageByTaskFinish({
+
+      // 根据搜索关键词类型动态决定搜索字段
+      const searchParams = { ...formData.value };
+      const { searchKeyword, ...otherParams } = searchParams;
+
+      // 如果有搜索关键词
+      if (searchKeyword) {
+        // 检查是否为数字
+        if (/^\d+$/.test(searchKeyword)) {
+          // 数字搜索orderNo
+          otherParams.orderNo = searchKeyword;
+        } else {
+          // 文字搜索content
+          otherParams.content = searchKeyword;
+        }
+      }
+
+      const resp = await pageByCompleted({
         pageSize: 10,
         pageNum: page.value,
-        ...formData.value,
+        ...otherParams,
       });
       taskList.value.push(
-        ...resp.rows.map((item) => ({ ...item, active: false })),
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
       );
     } catch {
       ElMessage.error('加载更多任务失败');
@@ -123,19 +158,58 @@ 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 { id } = item;
+  const { taskId, orderId } = item;
   // 点击的是同一个
-  if (lastSelectId.value === id) {
+  if (lastSelectId.value === taskId) {
     return;
   }
   currentTask.value = item;
+  currentTaskButtonData.value = item.button;
   // 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
   taskList.value.forEach((item) => {
-    item.active = item.id === id;
+    item.active = item.taskId === taskId;
   });
-  lastSelectId.value = id;
+  lastSelectId.value = taskId;
+  // 调用获取工单详情的接口
+  try {
+    const detail = await getWorkOrderDetail(orderId);
+    // 保存工单详情
+    currentWorkOrderDetail.value = detail;
+  } catch (error) {
+    console.error('获取工单详情失败:', error);
+    ElMessage.error('获取工单详情失败');
+  }
 }
+
+const { refreshTab } = useTabs();
+
+// 按钮权限控制
+const currentTaskButtonPermissions = computed(() => {
+  // 如果没有当前任务，返回空对象
+  if (!currentTaskButtonData.value) {
+    return {};
+  }
+  // 初始化权限对象
+  const permissions: Record<string, boolean> = {};
+
+  // 获取 button 字段
+  const button = currentTaskButtonData.value;
+  // 如果 button 字段存在，解析为数组
+  if (button) {
+    const buttonArray = button.split(',');
+    console.log('buttonArray', buttonArray);
+    // 设置对应按钮的权限
+    permissions.handle = buttonArray.includes('handle');
+    permissions.delay = buttonArray.includes('delay');
+    permissions.cc = buttonArray.includes('cc');
+    permissions.back = buttonArray.includes('back');
+  }
+  console.log('currentTaskButtonPermissions', permissions);
+  return permissions;
+});
 </script>
 
 <template>
@@ -148,49 +222,20 @@ async function handleCardClick(item: TaskInfo) {
         <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="flex items-center gap-1">
-            <ElInput
-              v-model="formData.flowName"
-              placeholder="流程名称搜索"
-              clearable
-              class="w-full"
-              @keyup.enter="reload(false)"
-            />
-            <ElTooltip placement="top" content="重置">
-              <ElButton @click="reload(true)" circle>
-                <Refresh />
-              </ElButton>
-            </ElTooltip>
-            <ElPopover placement="top-end" trigger="click">
-              <template #reference>
-                <ElButton circle>
-                  <Filter />
-                </ElButton>
-              </template>
-              <template #default>
-                <ElForm
-                  :model="formData"
-                  label-width="80px"
-                  class="w-[300px]"
-                  @submit.prevent="reload(false)"
-                >
-                  <ElFormItem label="任务名称">
-                    <ElInput v-model="formData.nodeName" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem label="流程编码">
-                    <ElInput v-model="formData.flowCode" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem>
-                    <div class="flex justify-end gap-2">
-                      <ElButton type="primary" @click="reload(false)">
-                        搜索
-                      </ElButton>
-                      <ElButton @click="reload(true)"> 重置 </ElButton>
-                    </div>
-                  </ElFormItem>
-                </ElForm>
-              </template>
-            </ElPopover>
+          <div class="grid grid-cols-1 gap-2">
+            <div class="flex items-center gap-1">
+              <ElInput
+                v-model="formData.searchKeyword"
+                placeholder="输入数字搜索工单号，输入文字搜索内容"
+                clearable
+                class="w-full"
+                :suffix-icon="Search"
+                @keyup.enter="reload(false)"
+              />
+              <ElTooltip placement="top" content="重置">
+                <ElButton @click="reload(true)" :icon="Refresh" />
+              </ElTooltip>
+            </div>
           </div>
         </div>
         <div
@@ -229,7 +274,13 @@ async function handleCardClick(item: TaskInfo) {
           </div>
         </div>
       </div>
-      <ApprovalPanel :task="currentTask" type="readonly" />
+      <ApprovalPanel
+        :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
+        :button-permissions="currentTaskButtonPermissions"
+        type="waiting"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>
@@ -240,8 +291,4 @@ async function handleCardClick(item: TaskInfo) {
     width: 5px;
   }
 }
-
-:deep(.el-card__body) {
-  @apply thin-scrollbar;
-}
 </style>

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

@@ -7,21 +7,11 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-import { Filter, Refresh } from '@element-plus/icons-vue';
-import {
-  ElButton,
-  ElEmpty,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElPopover,
-  ElTooltip,
-} from 'element-plus';
-
+import { Refresh, Search } from '@element-plus/icons-vue';
+import { ElButton, ElEmpty, ElInput, ElMessage, ElTooltip } from 'element-plus';
 import { cloneDeep, debounce } from 'lodash-es';
 
-import { pageByTaskWait } from '#/api/workflow/task';
+import { getWorkOrderDetail, pageByPending } from '#/api/workflow/instance';
 
 import { ApprovalCard, ApprovalPanel } from '../components';
 import { bottomOffset } from './constant';
@@ -34,9 +24,10 @@ const page = ref(1);
 const loading = ref(false);
 
 const defaultFormData = {
-  flowName: '', // 流程定义名称
+  searchKeyword: '', // 通用搜索关键词
   nodeName: '', // 任务名称
   flowCode: '', // 流程定义编码
+  category: null as null | number, // 流程分类
 };
 const formData = ref(cloneDeep(defaultFormData));
 
@@ -68,22 +59,44 @@ async function reload(resetFields: boolean = false) {
 
   loading.value = true;
   try {
-    const resp = await pageByTaskWait({
+    // 根据搜索关键词类型动态决定搜索字段
+    const searchParams = { ...formData.value };
+    const { searchKeyword, ...otherParams } = searchParams;
+
+    // 如果有搜索关键词
+    if (searchKeyword) {
+      // 检查是否为数字
+      if (/^\d+$/.test(searchKeyword)) {
+        // 数字搜索orderNo
+        otherParams.orderNo = searchKeyword;
+      } else {
+        // 文字搜索content
+        otherParams.content = searchKeyword;
+      }
+    }
+
+    const resp = await pageByPending({
       pageSize: 10,
       pageNum: page.value,
-      ...formData.value,
+      ...otherParams,
     });
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
   } finally {
     loading.value = false;
   }
+
   // 默认选中第一个
   if (taskList.value.length > 0) {
     const firstTask = taskList.value[0]!;
     currentTask.value = firstTask;
+    currentTaskButtonData.value = firstTask.button;
     handleCardClick(firstTask);
   }
 }
@@ -104,91 +117,121 @@ const handleScroll = debounce(async (e: Event) => {
   // 滚动到底部且没有加载完成
   if (isBottom && !isLoadComplete.value) {
     loading.value = true;
-    page.value += 1;
-    const resp = await pageByTaskWait({
-      pageSize: 10,
-      pageNum: page.value,
-      ...formData.value,
-    });
-    taskList.value.push(
-      ...resp.rows.map((item) => ({ ...item, active: false })),
-    );
-    loading.value = false;
+    try {
+      page.value += 1;
+
+      // 根据搜索关键词类型动态决定搜索字段
+      const searchParams = { ...formData.value };
+      const { searchKeyword, ...otherParams } = searchParams;
+
+      // 如果有搜索关键词
+      if (searchKeyword) {
+        // 检查是否为数字
+        if (/^\d+$/.test(searchKeyword)) {
+          // 数字搜索orderNo
+          otherParams.orderNo = searchKeyword;
+        } else {
+          // 文字搜索content
+          otherParams.content = searchKeyword;
+        }
+      }
+
+      const resp = await pageByPending({
+        pageSize: 10,
+        pageNum: page.value,
+        ...otherParams,
+      });
+      taskList.value.push(
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
+      );
+    } catch {
+      ElMessage.error('加载更多任务失败');
+    } finally {
+      loading.value = false;
+    }
   }
 }, 200);
 
 const lastSelectId = ref('');
 const currentTask = ref<TaskInfo>();
+const currentWorkOrderDetail = ref<any>();
+const currentTaskButtonData = ref<any>('');
 async function handleCardClick(item: TaskInfo) {
-  const { id } = item;
+  const { taskId, orderId } = item;
   // 点击的是同一个
-  if (lastSelectId.value === id) {
+  if (lastSelectId.value === taskId) {
     return;
   }
   currentTask.value = item;
+  currentTaskButtonData.value = item.button;
   // 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
   taskList.value.forEach((item) => {
-    item.active = item.id === id;
+    item.active = item.taskId === taskId;
   });
-  lastSelectId.value = id;
+  lastSelectId.value = taskId;
+  // 调用获取工单详情的接口
+  try {
+    const detail = await getWorkOrderDetail(orderId);
+    // 保存工单详情
+    currentWorkOrderDetail.value = detail;
+  } catch (error) {
+    console.error('获取工单详情失败:', error);
+    ElMessage.error('获取工单详情失败');
+  }
 }
 
 const { refreshTab } = useTabs();
+
+// 按钮权限控制
+const currentTaskButtonPermissions = computed(() => {
+  // 如果没有当前任务，返回空对象
+  if (!currentTaskButtonData.value) {
+    return {};
+  }
+  // 初始化权限对象
+  const permissions: Record<string, boolean> = {};
+
+  // 获取 button 字段
+  const button = currentTaskButtonData.value;
+  // 如果 button 字段存在，解析为数组
+  if (button) {
+    const buttonArray = button.split(',');
+    console.log('buttonArray', buttonArray);
+    // 设置对应按钮的权限
+    permissions.handle = buttonArray.includes('handle');
+    permissions.delay = buttonArray.includes('delay');
+    permissions.cc = buttonArray.includes('cc');
+    permissions.back = buttonArray.includes('back');
+  }
+  console.log('currentTaskButtonPermissions', permissions);
+  return permissions;
+});
 </script>
 
 <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="flex items-center gap-1">
-            <ElInput
-              v-model="formData.flowName"
-              placeholder="流程名称搜索"
-              clearable
-              class="w-full"
-              @keyup.enter="reload(false)"
-            />
-            <ElTooltip placement="top" content="重置">
-              <ElButton @click="reload(true)" circle>
-                <Refresh />
-              </ElButton>
-            </ElTooltip>
-            <ElPopover placement="top-end" trigger="click">
-              <template #reference>
-                <ElButton circle>
-                  <Filter />
-                </ElButton>
-              </template>
-              <template #default>
-                <ElForm
-                  :model="formData"
-                  label-width="80px"
-                  class="w-[300px]"
-                  @submit.prevent="reload(false)"
-                >
-                  <ElFormItem label="任务名称">
-                    <ElInput v-model="formData.nodeName" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem label="流程编码">
-                    <ElInput v-model="formData.flowCode" placeholder="请输入" />
-                  </ElFormItem>
-                  <ElFormItem>
-                    <div class="flex justify-end gap-2">
-                      <ElButton type="primary" @click="reload(false)">
-                        搜索
-                      </ElButton>
-                      <ElButton @click="reload(true)"> 重置 </ElButton>
-                    </div>
-                  </ElFormItem>
-                </ElForm>
-              </template>
-            </ElPopover>
+        <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
+                v-model="formData.searchKeyword"
+                placeholder="输入数字搜索工单号，输入文字搜索内容"
+                clearable
+                class="w-full"
+                :suffix-icon="Search"
+                @keyup.enter="reload(false)"
+              />
+              <ElTooltip placement="top" content="重置">
+                <ElButton @click="reload(true)" :icon="Refresh" />
+              </ElTooltip>
+            </div>
           </div>
         </div>
         <div
@@ -227,7 +270,13 @@ const { refreshTab } = useTabs();
           </div>
         </div>
       </div>
-      <ApprovalPanel :task="currentTask" type="approve" @reload="refreshTab" />
+      <ApprovalPanel
+        :task="currentTask"
+        :work-order-detail="currentWorkOrderDetail"
+        :button-permissions="currentTaskButtonPermissions"
+        type="waiting"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>
@@ -238,8 +287,4 @@ const { refreshTab } = useTabs();
     width: 5px;
   }
 }
-
-:deep(.el-card__body) {
-  @apply thin-scrollbar;
-}
 </style>