fix

apps/web-ele/.env.development

@@ -6,8 +6,8 @@ VITE_BASE=/
 # 接口地址
 VITE_GLOB_API_URL=http://39.164.159.226:8088
 # 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
+# VITE_GLOB_FLOW_URL=http://192.168.31.160:8082
+VITE_GLOB_FLOW_URL=http://192.168.1.21:8082
 
 # 是否开启 Nitro Mock服务，true 为开启，false 为关
 VITE_NITRO_MOCK=false

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

@@ -15,6 +15,7 @@ enum Api {
   root = '/sysStation/station',
   // 查询所有片区信息
   selectAllSysStationList = '/sysStationArea/area/selectAllSysStationAreaList',
+  selectAllSysStation = '/sysStation/station/selectAllSysStationList'
 }
 
 
@@ -26,6 +27,14 @@ enum Api {
 export function selectAllSysStationAreaList() {
   return requestClient.get<BaseResult<StationInfoModel[]>>(Api.selectAllSysStationList);
 }
+
+/**
+ * 查询所有油站信息
+ * @returns 油站列表
+ */
+export function selectAllSysStation() {
+  return requestClient.get<BaseResult<StationInfoModel[]>>(Api.selectAllSysStation);
+}
 /**
  * 查询油站信息列表
  * @param params 查询参数
@@ -86,4 +95,5 @@ export function deleteStationInfo(ids: number[]) {
  */
 export function exportStationInfo(data: Partial<StationInfoModel>) {
   return commonExport(Api.export, data);
-}
+}
+

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

@@ -21,7 +21,7 @@ export function getTaskByBusinessId(businessId: string) {
  * @returns
  */
 export function pageByRunning(params?: PageQuery) {
-  return requestClient.get('/workflow/instance/pageByRunning', { params });
+  return requestClient.get('/workOrder/order/myList', { params });
 }
 
 /**
@@ -70,7 +70,7 @@ export function cancelProcessApply(data: { businessId: ID; message?: string }) {
  * @param active
  */
 export function workflowInstanceActive(instanceId: ID, active: boolean) {
-  return requestClient.putWithMsg<void>(
+  return requestClient.put<void>(
     `/workflow/instance/active/${instanceId}?active=${active}`,
   );
 }
@@ -81,13 +81,21 @@ export function workflowInstanceActive(instanceId: ID, active: boolean) {
  * @returns PageResult<Flow>
  */
 export function pageByCurrent(params?: PageQuery) {
-  return requestClient.get<PageResult<TaskInfo>>(
-    '/workflow/instance/pageByCurrent',
+  return requestClient.get<PageResult<TaskInfo>>('/workOrder/order/list',
     { params },
   );
 }
 
 /**
+ * 获取工单详情
+ * @param id 工单id
+ * @returns TaskInfo
+ */
+export function getWorkOrderDetail(id: string) {
+  return requestClient.get<TaskInfo>(`/workOrder/order/${id}`);
+}
+
+/**
  * 获取流程图，流程记录
  * @param businessId 业务标识
  * @returns 流程图，流程记录
@@ -136,4 +144,4 @@ export function updateFlowVariable(data: {
     '/workflow/instance/updateVariable',
     data,
   );
-}
+}

apps/web-ele/src/components/dict/src/index.vue

@@ -15,16 +15,9 @@ const props = withDefaults(defineProps<Props>(), {
   dicts: undefined,
 });
 
-const color = computed<string>(() => {
+const tagType = computed<string>(() => {
   const current = props.dicts.find((item) => item.dictValue == props.value);
-  // // 是否为默认的颜色
-  // const isDefault = Reflect.has(tagTypes, listClass);
-  // // 判断是默认还是自定义颜色
-  // if (isDefault) {
-  //   // 这里做了antd - element-plus的兼容
-  //   return tagTypes[listClass]!.color;
-  // }
-  return current?.listClass ?? 'primary';
+  return current?.listClass ?? 'default';
 });
 
 const cssClass = computed<string>(() => {
@@ -37,16 +30,21 @@ const label = computed<number | string>(() => {
   return current?.dictLabel ?? 'unknown';
 });
 
-const tagComponent = computed(() => (color.value ? ElTag : 'div'));
+// 只有当type是Element Plus支持的类型时才传递type属性
+const elTagType = computed<string | undefined>(() => {
+  const supportedTypes = ['primary', 'success', 'info', 'warning', 'danger'];
+  return supportedTypes.includes(tagType.value) ? tagType.value : undefined;
+});
+
+const tagComponent = computed(() => ElTag);
 </script>
 
 <template>
   <div>
     <component
       :is="tagComponent"
-      :type="color"
+      :type="elTagType"
       :class="cssClass"
-      :color="color"
     >
       {{ label }}
     </component>

apps/web-ele/src/router/routes/local.ts

@@ -144,7 +144,28 @@ const localRoutes: RouteRecordStringComponent[] = [
     name: 'ScheduleDetail',
     path: '/schedule/detail/:taskId',
   },
-  {    component: 'workflow/processDefinition/design',    meta: {      activePath: '/workflow/processDefinition',      icon: 'carbon:data-base',      title: '流程设计',      hideInMenu: true,    },    name: 'WorkflowDesign',    path: '/workflow/design/index',  },
+  {    
+    component: 'workflow/processDefinition/design',    
+    meta: {      
+      activePath: '/workflow/processDefinition',      
+      icon: 'carbon:data-base',      
+      title: '流程设计',      
+      hideInMenu: true,    
+    },    
+    name: 'WorkflowDesign',    
+    path: '/workflow/design/index',  
+  },
+  {    
+    component: '/workflow/order/creatOrder',    
+    meta: {      
+      activePath: '/workflow/order',      
+      icon: 'carbon:add',      
+      title: '创建工单',      
+      hideInMenu: false,    
+    },    
+    name: 'WorkflowCreatOrder',    
+    path: '/workflow/order/create',  
+  },
   // 新增路由开始
   {
     component: '/examManage/questScoring/cpn/examScoring/index',
@@ -298,3 +319,4 @@ export const localMenuList: RouteRecordStringComponent[] = [
 
 
 
+

apps/web-ele/src/utils/render.tsx

@@ -110,13 +110,16 @@ export function renderHttpMethodTag(type: string) {
     PUT: 'orange',
   };
 
-  const color = colors[method] ?? 'default';
+  const color = colors[method] ?? 'primary'; // 将default改为primary
   const title = `${method}请求`;
 
   return <ElTag color={color}>{title}</ElTag>;
 }
 
-export function renderDictTag(value: string, dicts: DictData[]) {
+export function renderDictTag(value: string | undefined, dicts: DictData[]) {
+  if (!value) {
+    return <div></div>;
+  }
   return <DictTag dicts={dicts} value={value}></DictTag>;
 }
 
@@ -155,7 +158,10 @@ export function renderDictTags(
  * @param dictName dictName
  * @returns tag
  */
-export function renderDict(value: string, dictName: string) {
+export function renderDict(value: string | undefined, dictName: string) {
+  if (!value) {
+    return <div></div>;
+  }
   const dictInfo = getDictOptions(dictName);
   return renderDictTag(value, dictInfo);
 }
@@ -228,3 +234,5 @@ export function renderBrowserIcon(browser: string, center = false) {
   const icon = current ? current.icon : DefaultBrowserIcon;
   return renderIconSpan(icon, browser, center, '5px');
 }
+
+

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

@@ -384,21 +384,21 @@ const showMultiActions = computed(() => {
                 key="2"
                 @click="() => transferDrawerApi.open()"
               >
-                <ElRollback class="mr-2" /> 转办
+               转办
               </ElMenuItem>
               <ElMenuItem
                 v-if="showMultiActions && buttonPermissions?.addSign"
                 key="3"
                 @click="() => addSignatureDrawerApi.open()"
               >
-                <ElUserPlus class="mr-2" /> 加签
+               加签
               </ElMenuItem>
               <ElMenuItem
                 v-if="showMultiActions && buttonPermissions?.subSign"
                 key="4"
                 @click="() => reductionSignatureDrawerApi.open()"
               >
-                <ElUserMinus class="mr-2" /> 减签
+                减签
               </ElMenuItem>
             </ElMenu>
           </template>

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

@@ -45,16 +45,14 @@ const diffUpdateTimeString = computed(() => {
   >
     <ElDescriptions
       :column="1"
-      :title="info.businessTitle ?? info.flowName"
+      :title="info.orderNo"
       size="large"
     >
       <template #extra>
-        <component
-          :is="renderDict(info.flowStatus, DictEnum.WF_BUSINESS_STATUS)"
-        />
+        <component :is="renderDict(info.status, DictEnum.TICKET_STATUS)" />
       </template>
-      <ElDescriptionsItem label="当前任务">
-        <div class="font-bold">{{ info.nodeName }}</div>
+      <ElDescriptionsItem>
+        <div class="font-bold">{{ info.content }}</div>
       </ElDescriptionsItem>
       <ElDescriptionsItem label="提交时间">
         {{ info.createTime }}
@@ -66,12 +64,12 @@ const diffUpdateTimeString = computed(() => {
     <div class="flex w-full items-center justify-between text-[14px]">
       <div class="flex items-center gap-1 overflow-hidden whitespace-nowrap">
         <VbenAvatar
-          :alt="info?.createByName"
+          :alt="info?.currentHandler"
           class="bg-primary size-[24px] rounded-full text-[10px] text-white"
           src=""
         />
         <span class="overflow-hidden text-ellipsis opacity-50">
-          {{ info.createByName }}
+          {{ info.currentHandler }}
         </span>
       </div>
       <div class="text-nowrap opacity-50">

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

@@ -15,6 +15,7 @@ import { DictEnum } from '@vben/constants';
 import { cn } from '@vben/utils';
 
 // import { Copy } from '@element-plus/icons-vue';
+import { CopyDocument } from '@element-plus/icons-vue';
 import { useClipboard } from '@vueuse/core';
 import { ElCard, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
@@ -97,23 +98,23 @@ async function handleLoadInfo(task: TaskInfo | undefined) {
     /**
      * 不为审批不需要调用`getTaskByTaskId`接口
      */
-    if (props.type !== 'approve') {
-      const flowResp = await flowInfo(task.businessId);
-      currentFlowInfo.value = flowResp;
-      return;
-    }
+    // if (props.type !== 'approve') {
+    //   const flowResp = await flowInfo(task.businessId);
+    //   currentFlowInfo.value = flowResp;
+    //   return;
+    // }
 
     /**
      * getTaskByTaskId主要为了获取按钮权限 目前没有其他功能
      * 行数据(即props.task)获取的是没有按钮权限的
      */
-    const [flowResp, taskResp] = await Promise.all([
-      flowInfo(task.businessId),
-      getTaskByTaskId(task.id),
-    ]);
+    // const [flowResp, taskResp] = await Promise.all([
+    //   flowInfo(task.businessId),
+    //   getTaskByTaskId(task.id),
+    // ]);
 
-    currentFlowInfo.value = flowResp;
-    onlyForBtnPermissionTask.value = taskResp;
+    // currentFlowInfo.value = flowResp;
+    // onlyForBtnPermissionTask.value = taskResp;
   } catch (error) {
     console.error(error);
   } finally {
@@ -143,13 +144,6 @@ async function handleCopy(text: string) {
       class="thin-scrollbar flex-1 overflow-y-hidden"
       size="small"
     >
-      <template #title>
-        <div class="flex items-center gap-2">
-          <div>编号: {{ task.id }}</div>
-          <!-- <Copy class="cursor-pointer" @click="handleCopy(task.id)" /> -->
-        </div>
-      </template>
-
       <template #extra>
         <el-button size="small" @click="() => handleLoadInfo(task)">
           <div class="flex items-center justify-center">
@@ -162,28 +156,29 @@ 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.businessTitle ?? task.flowName }}
+              {{ task.orderNo }}
             </div>
+            <el-icon @click="() => handleCopy(task.orderNo)"><CopyDocument /></el-icon>
             <div>
               <component
-                :is="renderDict(task.flowStatus, DictEnum.WF_BUSINESS_STATUS)"
+                :is="renderDict(task.status, DictEnum.TICKET_STATUS)"
               />
             </div>
           </div>
 
           <div class="flex items-center gap-2">
             <VbenAvatar
-              :alt="task?.createByName ?? ''"
+              :alt="task?.createBy ?? ''"
               class="bg-primary size-[28px] rounded-full text-white"
               src=""
             />
 
-            <span>{{ task.createByName }}</span>
+            <span>{{ task.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.categoryName }}
+                流程分类: {{ task.ticketTypeName }}
               </div>
 
               <div class="flex items-center gap-1">
@@ -194,8 +189,8 @@ async function handleCopy(text: string) {
           </div>
         </div>
 
-        <ElTabs v-if="currentFlowInfo" class="flex-1">
-          <ElTabPane key="1" label="审批详情">
+        <ElTabs class="flex-1">
+          <ElTabPane key="1" label="工单详情">
             <ApprovalDetails
               :current-flow-info="currentFlowInfo"
               :task="task"
@@ -224,3 +219,4 @@ async function handleCopy(text: string) {
     </slot>
   </div>
 </template>
+

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

@@ -0,0 +1,246 @@
+<script lang="ts" setup>
+import { ref, reactive } from 'vue';
+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 { requestClient } from '#/api/request';
+
+// 表单数据
+const formData = reactive({
+  ticketType: '',
+  stationId: '',
+  contact: '',
+  phone: '',
+  content: '',
+  attachments: '',
+  isSubmit: false
+});
+
+// 表单规则
+const formRules = reactive({
+  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' }
+  ],
+  content: [{ required: true, message: '请输入提报内容', trigger: 'blur' }]
+});
+
+// 工单类型选项
+const ticketTypeOptions = ref<any[]>([]);
+// 场站选项
+const stationOptions = ref<any[]>([]);
+// 上传文件列表
+const fileList = ref([]);
+
+// 表单引用
+const formRef = ref();
+
+// 获取工单类型
+const getTicketTypes = async () => {
+  try {
+    const res = await categoryTree();
+    console.log(res);
+    ticketTypeOptions.value = res || [];
+  } catch (error) {
+    ElMessage.error('获取工单类型失败');
+    console.error('获取工单类型失败:', error);
+  }
+};
+
+// 获取场站列表
+const getStations = async () => {
+  try {
+    const res = await selectAllSysStation();
+    console.log(res);
+    stationOptions.value = res || [];
+  } catch (error) {
+    ElMessage.error('获取场站列表失败');
+    console.error('获取场站列表失败:', error);
+  }
+};
+
+// 上传成功回调
+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(',');
+    formData.attachments = paths;
+  } else {
+    ElMessage.error('文件上传失败');
+  }
+};
+
+// 上传失败回调
+const handleUploadError = (error) => {
+  ElMessage.error('文件上传失败');
+  console.error('文件上传失败:', error);
+};
+
+// 移除文件回调
+const handleRemove = (file, fileList) => {
+  // 更新attachments字段
+  const paths = fileList.map(f => f.response.data.url).join(',');
+  formData.attachments = paths;
+};
+
+// 表单提交
+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 = '';
+  } catch (error) {
+    if (error.name === 'ValidationError') {
+      // 表单验证失败，Element Plus会自动提示错误信息
+      return;
+    }
+    
+    ElMessage.error('工单创建失败');
+    console.error('工单创建失败:', error);
+  }
+};
+
+// 初始化数据
+const initData = () => {
+  getTicketTypes();
+  getStations();
+};
+
+// 页面加载时初始化数据
+initData();
+</script>
+
+<template>
+  <Page>
+    <div class="wrap">
+      <ElForm
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        class="create-order-form"
+      >
+        <!-- 工单类型 -->
+        <ElFormItem label="工单类型" prop="ticketType">
+          <ElTreeSelect
+            v-model="formData.ticketType"
+            :data="ticketTypeOptions"
+            check-strictly
+            placeholder="请选择工单类型"
+            style="width: 100%"
+            :props="{ label: 'label', value: 'id', children: 'children' }"
+            filterable
+          ></ElTreeSelect>
+        </ElFormItem>
+
+        <!-- 场站 -->
+        <ElFormItem label="场站" prop="stationId">
+          <ElSelect
+            v-model="formData.stationId"
+            placeholder="请选择场站"
+            style="width: 100%"
+          >
+            <ElOption
+              v-for="option in stationOptions"
+              :key="option.id"
+              :label="option.stationName"
+              :value="option.id"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
+
+        <!-- 联系人 -->
+        <ElFormItem label="联系人" prop="contact">
+          <ElInput
+            v-model="formData.contact"
+            placeholder="请输入联系人"
+          ></ElInput>
+        </ElFormItem>
+
+        <!-- 联系电话 -->
+        <ElFormItem label="联系电话" prop="phone">
+          <ElInput
+            v-model="formData.phone"
+            placeholder="请输入联系电话"
+          ></ElInput>
+        </ElFormItem>
+
+        <!-- 提报内容 -->
+        <ElFormItem label="提报内容" prop="content">
+          <ElInput
+            v-model="formData.content"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入提报内容"
+          ></ElInput>
+        </ElFormItem>
+
+        <!-- 提报附件 -->
+        <ElFormItem label="提报附件">
+          <ElUpload
+            :file-list="fileList"
+            :action="getSingleImageUploadConfig().action"
+            :headers="getSingleImageUploadConfig().headers"
+            :on-success="handleUploadSuccess"
+            :on-error="handleUploadError"
+            :on-remove="handleRemove"
+            list-type="picture-card"
+            multiple
+            :limit="5"
+          >
+            <UploadFilled />
+            <template #tip>
+              <div class="el-upload__tip">
+                支持上传图片格式文件，最多5个，多个文件用逗号分隔
+              </div>
+            </template>
+          </ElUpload>
+        </ElFormItem>
+
+        <!-- 是否提交 -->
+        <ElFormItem label="是否提交">
+          <ElSwitch v-model="formData.isSubmit"></ElSwitch>
+        </ElFormItem>
+
+        <!-- 提交按钮 -->
+        <ElFormItem>
+          <ElButton type="primary" @click="handleSubmit">创建工单</ElButton>
+        </ElFormItem>
+      </ElForm>
+    </div>
+  </Page>
+</template>
+
+<style lang="scss" scoped>
+.wrap {
+  padding: 16px;
+  background-color: #fff;
+  border-radius: 6px;
+}
+
+.create-order-form {
+  max-width: 600px;
+}
+</style>
+
+
+
+
+

apps/web-ele/src/views/workflow/register.ts

@@ -2,9 +2,9 @@
  * 这里定义流程描述组件
  */
 
-// const LeaveDescription = defineAsyncComponent(
-//   () => import('#/views/workflow/leave/leave-description.vue'),
-// );
+const LeaveDescription = defineAsyncComponent(
+  () => import('#/views/workflow/leave/leave-description.vue'),
+);
 
 /**
  * key为流程的路径(task.formPath) value为要显示的组件

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

@@ -260,7 +260,7 @@ onMounted(async () => {
                 <Refresh />
               </ElButton>
             </ElTooltip>
-            <ElPopover placement="right-top" trigger="click">
+            <ElPopover placement="top-end" trigger="click">
               <template #reference>
                 <ElButton circle>
                   <Filter />

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

@@ -7,36 +7,15 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-<<<<<<< HEAD
-import { Filter, Refresh } from '@element-plus/icons-vue';
-import {
-  ElButton,
-  ElEmpty,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElPopover,
-  ElTooltip,
-} from 'element-plus';
-=======
-// import {
-//   ElButton,
-//   ElEmpty,
-//   ElForm,
-//   ElFormItem,
-//   ElInput,
-//   ElMessage,
-//   ElPopover,
-//   ElSpin,
-//   ElTooltip,
-// } from 'element-plus';
->>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
+import { Filter, Refresh, Search } from '@element-plus/icons-vue';
+import { ElButton, ElEmpty, ElForm, ElFormItem, ElInput, ElMessage, ElPopover, ElTooltip } from 'element-plus';
+
 import { cloneDeep, debounce } from 'lodash-es';
 
-import { pageByCurrent } from '#/api/workflow/instance';
+import { pageByCurrent, getWorkOrderDetail } from '#/api/workflow/instance';
 
 import { bottomOffset } from './constant';
+import { ApprovalCard, ApprovalPanel } from '../components';
 
 const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;
 
@@ -86,6 +65,7 @@ async function reload(resetFields: boolean = false) {
       pageNum: page.value,
       ...formData.value,
     });
+    console.log(resp);
     taskList.value = resp.rows.map((item) => ({ ...item, active: false }));
     taskTotal.value = resp.total;
   } catch {
@@ -125,6 +105,7 @@ const handleScroll = debounce(async (e: Event) => {
         pageNum: page.value,
         ...formData.value,
       });
+      console.log(resp);
       taskList.value.push(
         ...resp.rows.map((item) => ({ ...item, active: false })),
       );
@@ -150,6 +131,17 @@ async function handleCardClick(item: TaskInfo) {
     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();
@@ -171,18 +163,15 @@ const { refreshTab } = useTabs();
               placeholder="流程名称搜索"
               clearable
               class="w-full"
+              :suffix-icon="Search"
               @keyup.enter="reload(false)"
             />
             <ElTooltip placement="top" content="重置">
-              <ElButton @click="reload(true)" circle>
-                <Refresh />
-              </ElButton>
+              <ElButton @click="reload(true)" :icon="Refresh" />
             </ElTooltip>
-            <ElPopover placement="right-top" trigger="click">
+            <ElPopover placement="top-end" trigger="click">
               <template #reference>
-                <ElButton circle>
-                  <Filter />
-                </ElButton>
+                <ElButton :icon="Filter"  style="margin-left: 0;" />
               </template>
               <template #default>
                 <ElForm
@@ -262,3 +251,4 @@ const { refreshTab } = useTabs();
   @apply thin-scrollbar;
 }
 </style>
+

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

@@ -6,21 +6,8 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
 
-<<<<<<< HEAD
 import { ElEmpty, ElMessage } from 'element-plus';
-=======
-// import {
-//   Empty,
-//   Form,
-//   FormItem,
-//   Input,
-//   InputSearch,
-//   Popover,
-//   Spin,
-//   Tooltip,
-//   TreeSelect,
-// } from 'ant-design-vue';
->>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
+
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskCopy } from '#/api/workflow/task';
@@ -166,7 +153,7 @@ async function handleCardClick(item: TaskInfo) {
                 <Refresh />
               </ElButton>
             </ElTooltip>
-            <ElPopover placement="right-top" trigger="click">
+            <ElPopover placement="top-end" trigger="click">
               <template #reference>
                 <ElButton circle>
                   <Filter />

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

@@ -6,7 +6,6 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
 
-<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -18,19 +17,7 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
-=======
-// import {
-//   Empty,
-//   Form,
-//   FormItem,
-//   Input,
-//   InputSearch,
-//   Popover,
-//   Spin,
-//   Tooltip,
-//   TreeSelect,
-// } from 'ant-design-vue';
->>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
+
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskFinish } from '#/api/workflow/task';
@@ -174,7 +161,7 @@ async function handleCardClick(item: TaskInfo) {
                 <Refresh />
               </ElButton>
             </ElTooltip>
-            <ElPopover placement="right-top" trigger="click">
+            <ElPopover placement="top-end" trigger="click">
               <template #reference>
                 <ElButton circle>
                   <Filter />

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

@@ -7,7 +7,6 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -19,19 +18,7 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
-=======
-// import {
-//   Empty,
-//   Form,
-//   FormItem,
-//   Input,
-//   InputSearch,
-//   Popover,
-//   Spin,
-//   Tooltip,
-//   TreeSelect,
-// } from 'ant-design-vue';
->>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
+
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskWait } from '#/api/workflow/task';
@@ -172,7 +159,7 @@ const { refreshTab } = useTabs();
                 <Refresh />
               </ElButton>
             </ElTooltip>
-            <ElPopover placement="right-top" trigger="click">
+            <ElPopover placement="top-end" trigger="click">
               <template #reference>
                 <ElButton circle>
                   <Filter />

packages/@core/base/shared/src/constants/dict-enum.ts

@@ -29,4 +29,5 @@ export enum DictEnum {
   WF_BUSINESS_STATUS = 'wf_business_status', // 业务状态
   WF_FORM_TYPE = 'wf_form_type', // 表单类型
   WF_TASK_STATUS = 'wf_task_status', // 任务状态
+  TICKET_STATUS = 'ticket_status', // 工单状态
 }