fix

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/workflow/task/index.ts

@@ -1,181 +1,187 @@
-import type {
-  CompleteTaskReqData,
-  NextNodeInfo,
-  StartWorkFlowReqData,
-  TaskInfo,
-  TaskOperationData,
-  TaskOperationType,
-} from './model';
-
-import type { ID, IDS, PageQuery, PageResult } from '#/api/common';
-
-import { requestClient } from '#/api/request';
-
-/**
- * 启动任务
- * @param data
- */
-export function startWorkFlow(data: StartWorkFlowReqData) {
-  return requestClient.post<{
-    processInstanceId: string;
-    taskId: string;
-  }>('/workflow/task/startWorkFlow', data);
-}
-
-/**
- * 提交工单
- * @param taskId 任务id
- */
-export function submitOrder(taskId: string) {
-  return requestClient.put<void>(`/workOrder/order/submit/${taskId}`);
-}
-
-/**
- * 办理任务
- * @param data
- */
-export function completeTask(data: CompleteTaskReqData) {
-  return requestClient.postWithMsg<void>('/workflow/task/completeTask', data);
-}
-
-/**
- * 查询当前用户的待办任务
- * @param params
- */
-export function pageByTaskWait(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/task/pageByTaskWait',
-    { params },
-  );
-}
-
-/**
- * 查询当前用户的已办任务
- * @param params
- */
-export function pageByTaskFinish(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/task/pageByTaskFinish',
-    { params },
-  );
-}
-
-/**
- * 查询所有待办任务
- * @param params
- */
-export function pageByAllTaskWait(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/task/pageByAllTaskWait',
-    { params },
-  );
-}
-
-/**
- * 查询已办任务
- * @param params
- */
-export function pageByAllTaskFinish(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/task/pageByAllTaskFinish',
-    { params },
-  );
-}
-
-/**
- * 查询当前用户的抄送
- * @param params
- */
-export function pageByTaskCopy(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/task/pageByTaskCopy',
-    { params },
-  );
-}
-
-/**
- * 根据taskId查询代表任务
- * @param taskId 任务id
- * @returns info
- */
-export function getTaskByTaskId(taskId: string) {
-  return requestClient.get<TaskInfo>(`/workflow/task/getTask/${taskId}`);
-}
-
-/**
- * 终止任务
- */
-export function terminationTask(data: { comment?: string; taskId: string }) {
-  return requestClient.postWithMsg<void>(
-    '/workflow/task/terminationTask',
-    data,
-  );
-}
-
-/**
- * 任务操作
- * @param taskOperationData 参数
- * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
- */
-export function taskOperation(
-  taskOperationData: TaskOperationData,
-  taskOperation: TaskOperationType,
-) {
-  return requestClient.postWithMsg<void>(
-    `/workflow/task/taskOperation/${taskOperation}`,
-    taskOperationData,
-  );
-}
-
-/**
- * 修改任务办理人
- * @param taskIdList 任务id
- * @param userId 办理人id
- */
-export function updateAssignee(taskIdList: IDS, userId: ID) {
-  return requestClient.putWithMsg<void>(
-    `/workflow/task/updateAssignee/${userId}`,
-    taskIdList,
-  );
-}
-
-/**
- * 驳回审批
- * @param data 参数
- */
-export function backProcess(data: any) {
-  return requestClient.postWithMsg<void>('/workflow/task/backProcess', data);
-}
-
-/**
- * 获取可驳回节点
- * @param taskId 任务ID
- * @param nodeCode 当前节点编码
- */
-export function getBackTaskNode(taskId: string, nodeCode: string) {
-  return requestClient.get<{ nodeCode: string; nodeName: string }[]>(
-    `/workflow/task/getBackTaskNode/${taskId}/${nodeCode}`,
-  );
-}
-
-/**
- * 获取当前任务的所有办理人
- * @param taskId 任务id
- */
-export function currentTaskAllUser(taskId: ID) {
-  return requestClient.get<any>(`/workflow/task/currentTaskAllUser/${taskId}`);
-}
-
-/**
- * 获取下一节点
- * @param data data
- * @param data.taskId taskId
- * @returns NextNodeInfo
- */
-export function getNextNodeList(data: { taskId: string }) {
-  return requestClient.post<NextNodeInfo[]>(
-    '/workflow/task/getNextNodeList',
-    data,
-  );
-}
-
+import type {
+  CompleteTaskReqData,
+  NextNodeInfo,
+  StartWorkFlowReqData,
+  TaskInfo,
+  TaskOperationData,
+  TaskOperationType,
+} from './model';
+
+import type { ID, IDS, PageQuery, PageResult } from '#/api/common';
+
+import { requestClient } from '#/api/request';
+
+/**
+ * 启动任务
+ * @param data
+ */
+export function startWorkFlow(data: StartWorkFlowReqData) {
+  return requestClient.post<{
+    processInstanceId: string;
+    taskId: string;
+  }>('/workflow/task/startWorkFlow', data);
+}
+
+/**
+ * 提交工单
+ * @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
+ */
+export function completeTask(data: CompleteTaskReqData) {
+  return requestClient.postWithMsg<void>('/workflow/task/completeTask', data);
+}
+
+/**
+ * 查询当前用户的待办任务
+ * @param params
+ */
+export function pageByTaskWait(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>(
+    '/workflow/task/pageByTaskWait',
+    { params },
+  );
+}
+
+/**
+ * 查询当前用户的已办任务
+ * @param params
+ */
+export function pageByTaskFinish(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>(
+    '/workflow/task/pageByTaskFinish',
+    { params },
+  );
+}
+
+/**
+ * 查询所有待办任务
+ * @param params
+ */
+export function pageByAllTaskWait(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>(
+    '/workflow/task/pageByAllTaskWait',
+    { params },
+  );
+}
+
+/**
+ * 查询已办任务
+ * @param params
+ */
+export function pageByAllTaskFinish(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>(
+    '/workflow/task/pageByAllTaskFinish',
+    { params },
+  );
+}
+
+/**
+ * 查询当前用户的抄送
+ * @param params
+ */
+export function pageByTaskCopy(params?: PageQuery) {
+  return requestClient.get<PageResult<TaskInfo>>(
+    '/workflow/task/pageByTaskCopy',
+    { params },
+  );
+}
+
+/**
+ * 根据taskId查询代表任务
+ * @param taskId 任务id
+ * @returns info
+ */
+export function getTaskByTaskId(taskId: string) {
+  return requestClient.get<TaskInfo>(`/workflow/task/getTask/${taskId}`);
+}
+
+/**
+ * 终止任务
+ */
+export function terminationTask(data: { comment?: string; taskId: string }) {
+  return requestClient.postWithMsg<void>(
+    '/workflow/task/terminationTask',
+    data,
+  );
+}
+
+/**
+ * 任务操作
+ * @param taskOperationData 参数
+ * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
+ */
+export function taskOperation(
+  taskOperationData: TaskOperationData,
+  taskOperation: TaskOperationType,
+) {
+  return requestClient.postWithMsg<void>(
+    `/workflow/task/taskOperation/${taskOperation}`,
+    taskOperationData,
+  );
+}
+
+/**
+ * 修改任务办理人
+ * @param taskIdList 任务id
+ * @param userId 办理人id
+ */
+export function updateAssignee(taskIdList: IDS, userId: ID) {
+  return requestClient.putWithMsg<void>(
+    `/workflow/task/updateAssignee/${userId}`,
+    taskIdList,
+  );
+}
+
+/**
+ * 驳回审批
+ * @param data 参数
+ */
+export function backProcess(data: any) {
+  return requestClient.postWithMsg<void>('/workflow/task/backProcess', data);
+}
+
+/**
+ * 获取可驳回节点
+ * @param taskId 任务ID
+ * @param nodeCode 当前节点编码
+ */
+export function getBackTaskNode(taskId: string, nodeCode: string) {
+  return requestClient.get<{ nodeCode: string; nodeName: string }[]>(
+    `/workflow/task/getBackTaskNode/${taskId}/${nodeCode}`,
+  );
+}
+
+/**
+ * 获取当前任务的所有办理人
+ * @param taskId 任务id
+ */
+export function currentTaskAllUser(taskId: ID) {
+  return requestClient.get<any>(`/workflow/task/currentTaskAllUser/${taskId}`);
+}
+
+/**
+ * 获取下一节点
+ * @param data data
+ * @param data.taskId taskId
+ * @returns NextNodeInfo
+ */
+export function getNextNodeList(data: { taskId: string }) {
+  return requestClient.post<NextNodeInfo[]>(
+    '/workflow/task/getNextNodeList',
+    data,
+  );
+}

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

@@ -5,6 +5,7 @@ export interface ButtonWithPermission {
 }
 
 export interface TaskInfo {
+  status: string;
   taskId: string;
   orderId: string;
   id: string;
@@ -41,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/workflow/components/actions/flow-actions.vue

@@ -1,17 +1,21 @@
 <script setup lang="ts">
 import type { ApprovalType } from '../type';
+
 import type { TaskInfo } from '#/api/workflow/task/model';
 
 import { computed, ref } from 'vue';
 
 import { cn } from '@vben/utils';
 
-import { ElSpace, ElMessageBox, ElButton, ElDrawer } from 'element-plus';
+import { ElButton, ElDrawer, ElMessageBox, ElSpace } from 'element-plus';
 
 import {
-  deleteByInstanceIds,
-} from '#/api/workflow/instance';
-import { submitOrder } from '#/api/workflow/task';
+  backProcess,
+  completeTask,
+  deleteOrder,
+  submitOrder,
+  taskOperation,
+} from '#/api/workflow/task';
 import CreatOrder from '#/views/workflow/order/creatOrder.vue';
 
 interface Props {
@@ -26,14 +30,18 @@ interface Props {
   /**
    * 为审批类型时候 显示的按钮(按钮权限)
    */
-  buttonPermissions: Record<string, boolean>;
+  buttonPermissions?: Record<string, boolean>;
 }
+
 const props = defineProps<Props>();
 
 const emit = defineEmits<{
   reload: [];
 }>();
 
+// 创建CreatOrder组件的ref
+const creatOrderRef = ref<InstanceType<typeof CreatOrder>>();
+
 /**
  * 是否可编辑/删除
  */
@@ -48,7 +56,7 @@ const editableAndRemoveable = computed(() => {
 const drawerVisible = ref(false);
 const drawerId = ref<string>('');
 
-// 重新编辑
+// 编辑
 const handleEdit = () => {
   drawerId.value = props.task!.id;
   drawerVisible.value = true;
@@ -57,6 +65,14 @@ const handleEdit = () => {
 // 关闭抽屉
 const handleCloseDrawer = () => {
   drawerVisible.value = false;
+  emit('reload');
+};
+
+// 确认编辑
+const handleConfirmEdit = async () => {
+  if (creatOrderRef.value) {
+    await creatOrderRef.value.handleSubmit();
+  }
 };
 
 // 抽屉关闭后的回调
@@ -66,18 +82,14 @@ const handleDrawerClosed = () => {
 
 // 删除
 function handleRemove() {
-  ElMessageBox.confirm(
-    '确定删除该申请吗？',
-    '提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      center: true,
-    }
-  )
+  ElMessageBox.confirm('确定删除该工单吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+    center: true,
+  })
     .then(async () => {
-      await deleteByInstanceIds([props.task!.id]);
+      await deleteOrder([props.task!.id]);
       emit('reload');
     })
     .catch(() => {
@@ -89,23 +101,123 @@ function handleRemove() {
 // 提交
 async function handleSubmit() {
   try {
-    await ElMessageBox.confirm(
-      '确定要提交该申请吗？',
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        center: true,
-      }
-    );
+    await ElMessageBox.confirm('确定要提交该工单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true,
+    });
     await submitOrder(props.task!.id);
     emit('reload');
-  } catch (error) {
+  } catch {
     // 用户取消操作，不做任何处理
     console.log('用户取消了提交操作');
   }
 }
+
+// 处理
+async function handleApprove() {
+  try {
+    await ElMessageBox.confirm('确定要处理该工单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true,
+    });
+    await completeTask({
+      taskId: props.task!.taskId,
+      taskVariables: {},
+      variables: {},
+      assigneeMap: {},
+      messageType: [],
+      flowCopyList: [],
+    });
+    emit('reload');
+  } catch {
+    // 用户取消操作，不做任何处理
+    console.log('用户取消了处理操作');
+  }
+}
+
+// 延时
+async function handleDelay() {
+  try {
+    await ElMessageBox.confirm('确定要延时处理该工单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true,
+    });
+    await taskOperation(
+      {
+        taskId: props.task!.taskId,
+      },
+      'delegateTask',
+    );
+    emit('reload');
+  } catch {
+    // 用户取消操作，不做任何处理
+    console.log('用户取消了延时操作');
+  }
+}
+
+// 抄送
+async function handleCopy() {
+  try {
+    await ElMessageBox.confirm('确定要抄送该工单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true,
+    });
+    await taskOperation(
+      {
+        taskId: props.task!.taskId,
+        userIds: [],
+      },
+      'addSignature',
+    );
+    emit('reload');
+  } catch {
+    // 用户取消操作，不做任何处理
+    console.log('用户取消了抄送操作');
+  }
+}
+
+// 退回
+async function handleBack() {
+  try {
+    await ElMessageBox.confirm('确定要退回该工单吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true,
+    });
+    await backProcess({
+      taskId: props.task!.taskId,
+    });
+    emit('reload');
+  } catch {
+    // 用户取消操作，不做任何处理
+    console.log('用户取消了退回操作');
+  }
+}
+
+// 获取可用按钮
+const availableButtons = computed(() => {
+  if (!props.task || !props.task.button) {
+    return [];
+  }
+  return props.task.button.split(',');
+});
+
+// 检查按钮是否显示
+const showButton = (buttonType: string) => {
+  // 同时检查 availableButtons 和 buttonPermissions
+  const isInButtonList = availableButtons.value.includes(buttonType);
+  const hasPermission = !props.buttonPermissions || props.buttonPermissions[buttonType] !== false;
+  return isInButtonList && hasPermission;
+};
 </script>
 
 <template>
@@ -120,15 +232,15 @@ async function handleSubmit() {
   >
     <div class="flex justify-end">
       <ElSpace v-if="type === 'myself'">
-        <el-button
+        <ElButton
           type="primary"
           text
           v-if="buttonPermissions?.edit || editableAndRemoveable"
           @click="handleEdit"
         >
-          重新编辑
-        </el-button>
-        <el-button
+          编辑
+        </ElButton>
+        <ElButton
           v-if="buttonPermissions?.delete || editableAndRemoveable"
           danger
           text
@@ -136,33 +248,59 @@ async function handleSubmit() {
           @click="handleRemove"
         >
           删除
-        </el-button>
+        </ElButton>
         <!-- 提交按钮 -->
-        <el-button
+        <ElButton
           v-if="buttonPermissions?.submit"
           type="primary"
           text
           @click="handleSubmit"
         >
           提交
-        </el-button>
+        </ElButton>
+      </ElSpace>
+
+      <!-- 审批操作按钮 -->
+      <ElSpace v-if="type === 'waiting'">
+        <ElButton
+          v-if="showButton('handle')"
+          type="primary"
+          @click="handleApprove"
+        >
+          处理
+        </ElButton>
+        <ElButton
+          v-if="showButton('delay')"
+          type="warning"
+          @click="handleDelay"
+        >
+          延时
+        </ElButton>
+        <ElButton v-if="showButton('cc')" type="info" @click="handleCopy">
+          抄送
+        </ElButton>
+        <ElButton v-if="showButton('back')" danger @click="handleBack">
+          退回
+        </ElButton>
       </ElSpace>
     </div>
   </div>
-  
+
   <!-- 普通的el-drawer组件 -->
   <ElDrawer
     v-model="drawerVisible"
     title="编辑工单"
     width="800px"
     :close-on-click-modal="false"
-    @close="handleCloseDrawer"
+    @close="handleDrawerClosed"
     @closed="handleDrawerClosed"
   >
-    <CreatOrder 
-      :id="drawerId" 
-      @reload="emit('reload')" 
-      @close="handleCloseDrawer"
-    />
+    <div class="drawer-content">
+      <CreatOrder
+        :id="drawerId"
+        ref="creatOrderRef"
+        @close="handleCloseDrawer"
+      />
+    </div>
   </ElDrawer>
 </template>

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

@@ -1,25 +1,38 @@
 <script lang="ts" setup>
-import { ref, reactive, onMounted, watch } 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 { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
-import { getSingleImageUploadConfig } from '#/components/upload/config';
+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';
-
-// 定义emit事件
-const emit = defineEmits<{
-  close: [];
-}>();
+import { getSingleImageUploadConfig } from '#/components/upload/config';
 
 // 接收props参数
 const props = defineProps<{
   id?: string;
 }>();
 
+// 定义emit事件
+const emit = defineEmits<{
+  close: [];
+}>();
+
 // 路由相关
 const route = useRoute();
 const router = useRouter();
@@ -32,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' }],
 });
 
 // 工单类型选项
@@ -86,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('文件上传失败');
@@ -102,7 +121,7 @@ const handleUploadError = (error) => {
 // 移除文件回调
 const handleRemove = (file, fileList) => {
   // 更新attachments字段（文件名）
-  const fileNames = fileList.map(f => f.response.data.fileName).join(',');
+  const fileNames = fileList.map((f) => f.response.data.fileName).join(',');
   formData.attachments = fileNames;
 };
 
@@ -110,7 +129,7 @@ const handleRemove = (file, fileList) => {
 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);
@@ -122,14 +141,18 @@ const getOrderDetail = async (orderId?: string) => {
     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(',') : [];
+      const fileNames = formData.attachments
+        ? formData.attachments.split(',')
+        : [];
       fileList.value = detail.attachmentsUrl.map((url, index) => ({
         name: fileNames[index] || `file-${index}`,
-        url: url,
-        response: { data: { url: url, fileName: fileNames[index] || `file-${index}` } }
+        url,
+        response: {
+          data: { url, fileName: fileNames[index] || `file-${index}` },
+        },
       }));
     }
   } catch (error) {
@@ -146,23 +169,23 @@ watch(
       getOrderDetail(newId);
     }
   },
-  { immediate: true }
+  { immediate: true },
 );
 
 // 表单提交
 const handleSubmit = async () => {
   if (!formRef.value) return;
-  
+
   try {
     await formRef.value.validate();
     console.log(formData);
     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关闭
@@ -172,7 +195,7 @@ const handleSubmit = async () => {
       // 创建工单
       await requestClient.post('/workOrder/order', formData);
       ElMessage.success('工单创建成功');
-      
+
       // 重置表单
       formRef.value.resetFields();
       fileList.value = [];
@@ -183,7 +206,7 @@ const handleSubmit = async () => {
       // 表单验证失败，Element Plus会自动提示错误信息
       return;
     }
-    
+
     ElMessage.error(id ? '工单更新失败' : '工单创建失败');
     console.error('工单操作失败:', error);
   }
@@ -204,6 +227,11 @@ const initData = () => {
 onMounted(() => {
   initData();
 });
+
+// 暴露方法给父组件
+defineExpose({
+  handleSubmit,
+});
 </script>
 
 <template>
@@ -226,7 +254,7 @@ onMounted(() => {
             style="width: 100%"
             :props="{ label: 'label', value: 'id', children: 'children' }"
             filterable
-          ></ElTreeSelect>
+          />
         </ElFormItem>
 
         <!-- 场站 -->
@@ -241,24 +269,18 @@ onMounted(() => {
               :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>
 
         <!-- 提报内容 -->
@@ -268,7 +290,7 @@ onMounted(() => {
             type="textarea"
             :rows="4"
             placeholder="请输入提报内容"
-          ></ElInput>
+          />
         </ElFormItem>
 
         <!-- 提报附件 -->
@@ -295,11 +317,11 @@ onMounted(() => {
 
         <!-- 是否提交 -->
         <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>
@@ -318,15 +340,3 @@ onMounted(() => {
   max-width: 600px;
 }
 </style>
-
-
-
-
-
-
-
-
-
-
-
-

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

@@ -5,19 +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 { Refresh, Search } from '@element-plus/icons-vue';
-import { ElButton, ElEmpty, ElInput, ElMessage, ElSelect, ElOption, ElTooltip } from 'element-plus';
-
+import {
+  ElButton,
+  ElEmpty,
+  ElInput,
+  ElMessage,
+  ElOption,
+  ElSelect,
+  ElTooltip,
+} from 'element-plus';
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByCurrent } from '#/api/workflow/instance';
+import { getDictOptions } from '#/utils/dict';
 
-import { bottomOffset } from './constant';
 import { ApprovalCard, ApprovalPanel } from '../components';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+import { bottomOffset } from './constant';
 
 const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;
 
@@ -66,7 +73,7 @@ async function reload(resetFields: boolean = false) {
     // 根据搜索关键词类型动态决定搜索字段
     const searchParams = { ...formData.value };
     const { searchKeyword, ...otherParams } = searchParams;
-    
+
     // 如果有搜索关键词
     if (searchKeyword) {
       // 检查是否为数字
@@ -78,13 +85,17 @@ async function reload(resetFields: boolean = false) {
         otherParams.content = searchKeyword;
       }
     }
-    
+
     const resp = await pageByCurrent({
       pageSize: 10,
       pageNum: page.value,
       ...otherParams,
     });
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false, id: String(item.id) }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
@@ -118,11 +129,11 @@ const handleScroll = debounce(async (e: Event) => {
     loading.value = true;
     try {
       page.value += 1;
-      
+
       // 根据搜索关键词类型动态决定搜索字段
       const searchParams = { ...formData.value };
       const { searchKeyword, ...otherParams } = searchParams;
-      
+
       // 如果有搜索关键词
       if (searchKeyword) {
         // 检查是否为数字
@@ -134,14 +145,18 @@ const handleScroll = debounce(async (e: Event) => {
           otherParams.content = searchKeyword;
         }
       }
-      
+
       const resp = await pageByCurrent({
         pageSize: 10,
         pageNum: page.value,
         ...otherParams,
       });
       taskList.value.push(
-        ...resp.rows.map((item) => ({ ...item, active: false, id: String(item.id) })),
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
       );
     } catch {
       ElMessage.error('加载更多任务失败');
@@ -175,28 +190,24 @@ const currentTaskButtonPermissions = computed(() => {
   if (!currentTask.value) {
     return {};
   }
-  
   // 根据任务状态判断工单类型
   const { status } = currentTask.value;
-  console.log(status);
   // 初始化权限对象
   const permissions: Record<string, boolean> = {};
-  
   // 新工单 (status: "news")
-  if (status === "new") {
+  if (status === 'new') {
     // 新工单可以进行的操作
     permissions.edit = true; // 编辑
     permissions.submit = true; // 提交
     permissions.delete = true; // 删除
   }
   // 已处理工单 (status: "processed")
-  else if (status === "processed") {
+  else if (status === 'processed') {
     // 已处理工单可以进行的操作
     permissions.edit = false; // 编辑
     permissions.submit = false; // 提交
     permissions.delete = false; // 删除
   }
-  console.log(permissions);
   return permissions;
 });
 </script>
@@ -271,13 +282,20 @@ const currentTaskButtonPermissions = computed(() => {
           ></div>
         </div>
         <!-- total显示 -->
-        <div class="bg-background sticky bottom-0 w-full rounded-b-lg border-t-[1px] py-2" >
+        <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" :button-permissions="currentTaskButtonPermissions" type="myself" @reload="refreshTab" />
+      <ApprovalPanel
+        :task="currentTask"
+        :button-permissions="currentTaskButtonPermissions"
+        type="myself"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>
@@ -293,4 +311,3 @@ const currentTaskButtonPermissions = computed(() => {
   @apply thin-scrollbar;
 }
 </style>
-

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

@@ -9,13 +9,12 @@ 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 { pageByPending, getWorkOrderDetail } from '#/api/workflow/instance';
+import { getWorkOrderDetail, pageByPending } from '#/api/workflow/instance';
 
-import { bottomOffset } from './constant';
 import { ApprovalCard, ApprovalPanel } from '../components';
+import { bottomOffset } from './constant';
 
 const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;
 
@@ -63,7 +62,7 @@ async function reload(resetFields: boolean = false) {
     // 根据搜索关键词类型动态决定搜索字段
     const searchParams = { ...formData.value };
     const { searchKeyword, ...otherParams } = searchParams;
-    
+
     // 如果有搜索关键词
     if (searchKeyword) {
       // 检查是否为数字
@@ -75,13 +74,17 @@ async function reload(resetFields: boolean = false) {
         otherParams.content = searchKeyword;
       }
     }
-    
+
     const resp = await pageByPending({
       pageSize: 10,
       pageNum: page.value,
       ...otherParams,
     });
-    taskList.value = resp.rows.map((item) => ({ ...item, active: false, id: String(item.id) }));
+    taskList.value = resp.rows.map((item) => ({
+      ...item,
+      active: false,
+      id: String(item.id),
+    }));
     taskTotal.value = resp.total;
   } catch {
     ElMessage.error('加载任务列表失败');
@@ -93,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);
   }
 }
@@ -115,11 +119,11 @@ const handleScroll = debounce(async (e: Event) => {
     loading.value = true;
     try {
       page.value += 1;
-      
+
       // 根据搜索关键词类型动态决定搜索字段
       const searchParams = { ...formData.value };
       const { searchKeyword, ...otherParams } = searchParams;
-      
+
       // 如果有搜索关键词
       if (searchKeyword) {
         // 检查是否为数字
@@ -131,14 +135,18 @@ const handleScroll = debounce(async (e: Event) => {
           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) })),
+        ...resp.rows.map((item) => ({
+          ...item,
+          active: false,
+          id: String(item.id),
+        })),
       );
     } catch {
       ElMessage.error('加载更多任务失败');
@@ -150,6 +158,7 @@ const handleScroll = debounce(async (e: Event) => {
 
 const lastSelectId = ref('');
 const currentTask = ref<TaskInfo>();
+const currentTaskButtonData = ref<any>('');
 async function handleCardClick(item: TaskInfo) {
   const { taskId, orderId } = item;
   // 点击的是同一个
@@ -157,12 +166,12 @@ async function handleCardClick(item: TaskInfo) {
     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);
@@ -175,6 +184,31 @@ async function handleCardClick(item: TaskInfo) {
 }
 
 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>
@@ -197,7 +231,7 @@ const { refreshTab } = useTabs();
                 :suffix-icon="Search"
                 @keyup.enter="reload(false)"
               />
-               <ElTooltip placement="top" content="重置">
+              <ElTooltip placement="top" content="重置">
                 <ElButton @click="reload(true)" :icon="Refresh" />
               </ElTooltip>
             </div>
@@ -231,13 +265,20 @@ const { refreshTab } = useTabs();
           ></div>
         </div>
         <!-- total显示 -->
-        <div class="bg-background sticky bottom-0 w-full rounded-b-lg border-t-[1px] py-2">
+        <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" type="myself" @reload="refreshTab" />
+      <ApprovalPanel
+        :task="currentTask"
+        :button-permissions="currentTaskButtonPermissions"
+        type="waiting"
+        @reload="refreshTab"
+      />
     </div>
   </Page>
 </template>