apps/web-ele/src/views/Archive/HSSEManage/emergencyDrill/config-data.tsx

@@ -59,7 +59,7 @@ export const querySchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -199,8 +199,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '任务状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/figuresManage/addInventory/addInventory-data.tsx

@@ -67,7 +67,7 @@ export const tableColumns: VxeGridProps['columns'] = [
     align: 'center',
     formatter: (cellValue: any) => {
       // if (cellValue.status ===)
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+      return cellValue === 2 ? '按时完成' : '逾期完成';
     },
   },
   {
@@ -107,7 +107,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/figuresManage/oilGunTement/oilGunTement-data.tsx

@@ -66,8 +66,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {
@@ -131,7 +131,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/figuresManage/waterTestRecord/waterTestRecord-data.tsx

@@ -110,7 +110,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/headquartersDistrict/districtMeeting/districtMeeting-data.tsx

@@ -56,7 +56,7 @@ export const querySchema: FormSchemaGetter = () => [
      component: 'Select',
      componentProps: {
        options: [
-         { label: '按时完成', value: 0 },
+         { label: '按时完成', value: 2 },
          { label: '逾期完成', value: 1 },
        ],
      },
@@ -175,8 +175,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/businessPlan/tabsView/detailedRecord/config-data.tsx

@@ -32,7 +32,7 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -206,8 +206,8 @@ export const columns: VxeGridProps['columns'] = [
     field: 'completionStatus',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/competitiveSalesSurvey/config-data.tsx

@@ -53,7 +53,7 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/operationsManagement/gasStationRegularMeeting/config-data.tsx

@@ -58,7 +58,7 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -185,8 +185,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/licenseTaskManagement/config-data.tsx

@@ -101,7 +101,7 @@ export const querySchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -185,8 +185,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/managementPlan/config-data.tsx

@@ -42,7 +42,7 @@ export const querySchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -178,8 +178,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/operationsWeeklyReport/config-data.tsx

@@ -32,7 +32,7 @@ export const querySchema: FormSchemaGetter = () => [
      component: 'Select',
      componentProps: {
        options: [
-         { label: '按时完成', value: 0 },
+         { label: '按时完成', value: 2 },
          { label: '逾期完成', value: 1 },
        ],
      },
@@ -151,8 +151,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/operationsManagement/teamLog/config-data.tsx

@@ -179,7 +179,6 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 120,
     align: 'center',
     formatter: ({ row }) => {
-      // console.log(cellValue, cellValue);
       return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },

apps/web-ele/src/views/Archive/operationsManagement/turningRateSurvey/config-data.tsx

@@ -49,7 +49,7 @@ export const querySchema: FormSchemaGetter = () => [
      component: 'Select',
      componentProps: {
        options: [
-         { label: '按时完成', value: 0 },
+         { label: '按时完成', value: 2 },
          { label: '逾期完成', value: 1 },
        ],
      },
@@ -169,8 +169,8 @@ export const columns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/personnelTraining/employeePerfor/employeePerfor-data.tsx

@@ -70,7 +70,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -226,8 +226,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/personnelTraining/valuationRecord/valuationRecord-data.tsx

@@ -83,8 +83,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     field: 'completionStatus',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
 ];
@@ -151,7 +151,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/utils/positionFilter.ts

@@ -1,5 +1,6 @@
 import { useRoute } from 'vue-router';
-import { getPostList } from '@/api';
+
+import { getPostList } from '#/api/system/post/post';
 
 /**
  * 过滤岗位数据
@@ -8,51 +9,57 @@ import { getPostList } from '@/api';
  * @param allPositions 所有岗位数据
  * @returns 过滤后的岗位数据
  */
-export const filterPositions = (directoryType: string, type: string, allPositions: any[]) => {
+export const filterPositions = (
+  directoryType: string,
+  type: string,
+  allPositions: any[],
+) => {
   if (!Array.isArray(allPositions)) {
     return [];
   }
 
   // 规则1: directoryType 等于 operational, hsse_management, data_quality, financial 或 human_resources
-  if (['operational', 'hsse_management', 'data_quality', 'financial', 'human_resources'].includes(directoryType)) {
-    return allPositions.filter((item: any) => 
-      ['region', 'management', 'employee'].includes(item.type)
+  if (
+    [
+      'data_quality',
+      'financial',
+      'hsse_management',
+      'human_resources',
+      'operational',
+    ].includes(directoryType)
+  ) {
+    return allPositions.filter((item: any) =>
+      ['employee', 'management', 'region'].includes(item.type),
     );
   }
 
   // 规则2: directoryType 等于 visitor_feedback
   if (directoryType === 'visitor_feedback') {
-    return allPositions.filter((item: any) => 
-      ['region', 'headquarters'].includes(item.type)
+    return allPositions.filter((item: any) =>
+      ['headquarters', 'region'].includes(item.type),
     );
   }
 
   // 规则3: directoryType 等于 temporary_task, type 等于 station
   if (directoryType === 'temporary_task' && type === 'station') {
-    return allPositions.filter((item: any) => 
-      ['management', 'employee'].includes(item.type)
+    return allPositions.filter((item: any) =>
+      ['employee', 'management'].includes(item.type),
     );
   }
 
   // 规则4: directoryType 等于 temporary_task, type 等于 visitor
   if (directoryType === 'temporary_task' && type === 'visitor') {
-    return allPositions.filter((item: any) => 
-      item.type === 'headquarters'
-    );
+    return allPositions.filter((item: any) => item.type === 'headquarters');
   }
 
   // 规则5: directoryType 等于 headquarters_area, type 等于 check
   if (directoryType === 'headquarters_area' && type === 'check') {
-    return allPositions.filter((item: any) => 
-      item.type === 'headquarters'
-    );
+    return allPositions.filter((item: any) => item.type === 'headquarters');
   }
 
   // 规则6: directoryType 等于 headquarters_area, type 等于 attach
   if (directoryType === 'headquarters_area' && type === 'attach') {
-    return allPositions.filter((item: any) => 
-      item.type === 'headquarters'
-    );
+    return allPositions.filter((item: any) => item.type === 'headquarters');
   }
 
   // 默认返回所有岗位
@@ -66,13 +73,13 @@ export const filterPositions = (directoryType: string, type: string, allPosition
 export const getFilteredPositions = async () => {
   // 在运行时获取路由参数
   const route = useRoute();
-  const directoryType = route.query.directoryType as string || '';
-  const type = route.query.type as string || '';
-  
+  const directoryType = (route.query.directoryType as string) || '';
+  const type = (route.query.type as string) || '';
+
   const data = await getPostList();
   const allPositions = Array.isArray(data.rows) ? data.rows : [];
   const filteredPositions = filterPositions(directoryType, type, allPositions);
-  
+
   return filteredPositions.map((item: any) => ({
     label: item.postName || item.name,
     value: item.postId,

apps/web-ele/src/views/Archive/visitorFeedback/collectAttach/collectAttach-data.tsx

@@ -76,7 +76,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },
@@ -218,8 +218,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+    formatter: ({ row }) => {
+      return row.completionStatus === 2 ? '按时完成' : '逾期完成';
     },
   },
   {

apps/web-ele/src/views/Archive/visitorFeedback/photoTask/photoTask-data.tsx

@@ -56,7 +56,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/Archive/visitorFeedback/visitorCheckTask/visitorCheckTask-data.tsx

@@ -59,7 +59,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 0 },
+        { label: '按时完成', value: 2 },
         { label: '逾期完成', value: 1 },
       ],
     },

apps/web-ele/src/views/oilstation/emergency/index.vue

@@ -3,17 +3,18 @@ import type { VbenFormProps } from '@vben/common-ui';
 
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { ref } from 'vue';
-
 import { Page, useVbenDrawer } from '@vben/common-ui';
 
-import { ElMessageBox, ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteEmergencyMaterial,
+  emergencyMaterialList,
+} from '#/api/oilstation/emergency/emergency';
 
 import { queryFormSchema, tableColumns } from './emergency-data';
 import EmergencyDrawerComp from './emergency-drawer.vue';
-import { emergencyMaterialList, deleteEmergencyMaterial } from '#/api/oilstation/emergency/emergency';
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -45,14 +46,14 @@ const gridOptions: VxeGridProps = {
             pageNum: page.currentPage,
             pageSize: page.pageSize,
           };
-          
+
           // 调用API获取数据
           const response = await emergencyMaterialList(params);
-          console.log('查询应急防护列表响应:', response)
+          console.log('查询应急防护列表响应:', response);
           const data = response || {};
-          return { 
-            items: data.rows|| [], 
-            total: data.total || 0 
+          return {
+            items: data.rows || [],
+            total: data.total || 0,
           };
         } catch (error) {
           console.error('查询应急防护列表失败:', error);
@@ -139,6 +140,7 @@ function deleteHandle() {
             :disabled="
               !(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)
             "
+            v-access:code="['oilstation:emergency:remove']"
             @click="deleteHandle"
           >
             批量删除
@@ -146,6 +148,7 @@ function deleteHandle() {
           <ElButton
             type="primary"
             @click="openDrawer"
+            v-access:code="['oilstation:emergency:add']"
           >
             新增应急防护
           </ElButton>
@@ -157,19 +160,14 @@ function deleteHandle() {
             size="small"
             type="primary"
             plain
+            v-access:code="['oilstation:emergency:edit']"
             @click="handleEdit(row)"
           >
             编辑
           </ElButton>
           <ElPopconfirm title="确认删除" @confirm="confirmEvent(row)">
             <template #reference>
-              <ElButton
-                size="small"
-                type="danger"
-                plain
-              >
-                删除
-              </ElButton>
+              <ElButton size="small" type="danger" plain> 删除 </ElButton>
             </template>
           </ElPopconfirm>
         </ElSpace>

apps/web-ele/src/views/oilstation/filter/index.vue

@@ -161,12 +161,30 @@ async function exportHandle() {
     <BasicTable table-title="过滤器档案列表">
       <template #toolbar-tools>
         <ElSpace>
-          <ElButton type="primary" @click="handleAdd"> 新增过滤器
-</ElButton>
-          <ElButton type="primary" @click="exportHandle"> 导出 </ElButton>
-          <ElButton type="primary" @click="handleImport"> 导入 </ElButton>
+          <ElButton
+            type="primary"
+            v-access:code="['oilstation:filter:add']"
+            @click="handleAdd"
+          >
+            新增过滤器
+          </ElButton>
+          <ElButton
+            type="primary"
+            v-access:code="['oilstation:filter:export']"
+            @click="exportHandle"
+          >
+            导出
+          </ElButton>
+          <ElButton
+            type="primary"
+            v-access:code="['oilstation:filter:import']"
+            @click="handleImport"
+          >
+            导入
+          </ElButton>
           <ElButton
             type="danger"
+            v-access:code="['oilstation:filter:remove']"
             :disabled="
               !(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)
             "
@@ -178,12 +196,25 @@ async function exportHandle() {
       </template>
       <template #action="{ row }">
         <ElSpace>
-          <ElButton size="small" type="primary" plain @click="handleEdit(row)">
+          <ElButton
+            size="small"
+            type="primary"
+            plain
+            @click="handleEdit(row)"
+            v-access:code="['oilstation:filter:edit']"
+          >
             查看
           </ElButton>
           <ElPopconfirm title="确认删除" @confirm="handleDelete(row)">
             <template #reference>
-              <ElButton size="small" type="danger" plain> 删除 </ElButton>
+              <ElButton
+                size="small"
+                type="danger"
+                v-access:code="['oilstation:filter:remove']"
+                plain
+              >
+                删除
+              </ElButton>
             </template>
           </ElPopconfirm>
         </ElSpace>

apps/web-ele/src/views/schedule/detail/components/comment.vue

@@ -59,10 +59,10 @@ const handleUploadSuccess = (file: any) => {
 
 // 提交评论
 const submitComment = async () => {
-  if (commentContent.value.trim() === '' || commentImages.value.length === 0) {
-    ElMessage.warning('请输入评论内容或上传图片');
-    return;
-  }
+  // if (commentContent.value.trim() === '' || commentImages.value.length === 0) {
+  //   ElMessage.warning('请输入评论内容或上传图片');
+  //   return;
+  // }
   try {
     await addComment({
       targetId: Number(props.taskId),
@@ -73,6 +73,7 @@ const submitComment = async () => {
     });
     commentContent.value = '';
     commentImages.value = [];
+    uploadRef.value.clearFiles();
     querycommentfn();
   } catch {
     ElMessage.error('评论提交失败');

apps/web-ele/src/views/schedule/detail/drawer/groupLog/index.vue

@@ -289,7 +289,6 @@ const init = async () => {
 };
 
 onMounted(async () => {
-  console.log('gridOptions', gridOptions);
   await init();
   // gridOptions.columns = await tableColumns();
 });

apps/web-ele/src/views/schedule/detail/index.vue

@@ -1,11 +1,12 @@
 <script lang="ts" setup>
-import { defineComponent, h, onMounted, ref } from 'vue';
+import { computed, defineComponent, h, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 // @ts-ignore
 import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
 // @ts-ignore
 import { useTabs } from '@vben/hooks';
+import { useUserStore } from '@vben/stores';
 
 import dayjs from 'dayjs';
 import {
@@ -96,6 +97,8 @@ import {
   WeeklyReportDrawer,
 } from './drawer';
 
+const userStore = useUserStore();
+
 const { refreshTab } = useTabs();
 
 const route = useRoute();
@@ -242,6 +245,10 @@ const taskResult: any = ref({
   fileNames: [],
 });
 
+const oneSelf = computed(() => {
+  return taskInfo.value.executorId === Number(userStore.userInfo?.userId);
+});
+
 const init = async () => {
   const res = await getTaskDetail(taskId.value);
   taskInfo.value = res;
@@ -582,6 +589,7 @@ onMounted(async () => {
         <div class="flex items-center space-x-4">
           <ElButton
             v-if="
+              oneSelf &&
               [1].includes(taskInfo.status) &&
               !mobileTaskTypes.includes(taskInfo.formType)
             "
@@ -592,13 +600,16 @@ onMounted(async () => {
           </ElButton>
           <ElButton
             type="primary"
-            v-if="[1].includes(taskInfo.status) && taskInfo.isLicensable"
+            v-if="
+              oneSelf && [1].includes(taskInfo.status) && taskInfo.isLicensable
+            "
             @click="handleTransferTask"
           >
             转交任务
           </ElButton>
           <ElButton
             v-if="
+              oneSelf &&
               [1].includes(taskInfo.status) &&
               (taskInfo.level < 2 || !taskInfo.taskTemplate?.isMust)
             "

apps/web-ele/src/views/system/post/config-data.ts

@@ -63,13 +63,13 @@ export const tableColumns: VxeGridProps['columns'] = [
     },
   },
   {
-    field: 'type',
+    field: 'typeName',
     title: '岗位类型',
-    formatter: (params: { cellValue: string; column: any; row: any }) => {
-      const options = getPostTypeOptions();
-      const option = options.find((item) => item.value === params.cellValue);
-      return option ? option.label : params.cellValue;
-    },
+    // formatter: (params: { cellValue: string; column: any; row: any }) => {
+    //   const options = getPostTypeOptions();
+    //   const option = options.find((item) => item.value === params.cellValue);
+    //   return option ? option.label : params.cellValue;
+    // },
   },
   {
     field: 'status',