mod:

.trae/rules/project_rules.md

@@ -274,3 +274,4 @@
     },
   ]
 ```
+- 生成过程中不可以执行任何命令，如果需要执行请列出来，由我手动执行或跳过

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

@@ -1,13 +1,16 @@
 import { requestClient } from '#/api/request';
 
 enum Api {
+  attendanceMeetingHandle = '/formAttendanceMeetings/meetings/handle',
   emergencyWySubmit = '/formEmergencyDrill/drill/submit',
   emergencyWySubmitReport = '/formEmergencyDrill/drill/submitReport',
   groupLogBase = '/formTeamShiftLog/log/handle',
+  joinEmergencyHandle = '/formEmergencyDrillParticipation/participation/handle',
   marketingSurveyHandle = '/formCompetitorMarketingSurvey/survey/handle',
   meetingBase = '/formMeetingRecords/records/handle',
   salesSurveyHandle = '/formCompetitorSalesSurvey/survey/handle',
   scheduleShiftManagementList = '/scheduleShiftManagement/management/list',
+  tankWaterHandle = '/formTankWater/water/handle',
   turnInRateSurveyHandle = '/formTurnInRateSurvey/survey/handle',
   weeklyEvaluationHandle = '/formEmployeeWeeklyEvaluation/evaluation/handle',
   // childBase = '/taskCheckSubItem/item',
@@ -92,3 +95,30 @@ export function handleTurnInRateSurvey(params: any) {
 export function handleMarketingSurvey(params: any) {
   return requestClient.put(`${Api.marketingSurveyHandle}`, params);
 }
+
+/**
+ * 参与紧急情况处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleJoinEmergency(params: any) {
+  return requestClient.put(`${Api.joinEmergencyHandle}`, params);
+}
+
+/**
+ * 参与出勤会议处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleAttendanceMeeting(params: any) {
+  return requestClient.put(`${Api.attendanceMeetingHandle}`, params);
+}
+
+/**
+ * 量缸试水处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleTankWater(params: any) {
+  return requestClient.put(`${Api.tankWaterHandle}`, params);
+}

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

@@ -0,0 +1,139 @@
+<script lang="ts" setup>
+// @ts-ignore
+
+import {
+  ElCard,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElImage,
+} from 'element-plus';
+
+// 定义组件的Props接口
+interface JoinEmergencyProps {
+  taskDetail: any;
+}
+
+// 接收父组件传递的任务详情数据
+defineProps<JoinEmergencyProps>();
+</script>
+
+<template>
+  <ElCard>
+    <template #header>
+      <div class="flex items-center gap-4">
+        <div style="width: 4px; height: 12px; background-color: #215acd"></div>
+        <span
+          class="text-lg font-bold text-gray-800"
+          style="font-size: 14px; font-weight: 600"
+        >
+          {{
+            taskDetail?.subFormType === 'participate_emergency_wy'
+              ? '参与应急演练详情'
+              : '参与油站会议详情'
+          }}
+        </span>
+      </div>
+    </template>
+
+    <div class="task-info">
+      <ElDescriptions :column="4" class="mb-6">
+        <ElDescriptionsItem label="参与时间:">
+          {{ taskDetail?.participationTime || '-' }}
+        </ElDescriptionsItem>
+      </ElDescriptions>
+
+      <ElDescriptions :column="4" class="mb-6">
+        <ElDescriptionsItem label="参与详情:" :span="4">
+          {{ taskDetail?.participationRecord || '-' }}
+        </ElDescriptionsItem>
+      </ElDescriptions>
+
+      <ElDescriptions :column="4" class="mb-6">
+        <ElDescriptionsItem
+          v-if="taskDetail?.imagesUrl?.length > 0"
+          label="参与现场图片:"
+          :span="4"
+        >
+          <div class="task-images">
+            <ElImage
+              v-for="(image, index) in taskDetail?.imagesUrl"
+              :key="index"
+              :src="image"
+              :preview-src-list="taskDetail?.imagesUrl"
+              :initial-index="+index"
+              fit="cover"
+              alt="参与照片"
+              class="task-image"
+            />
+          </div>
+        </ElDescriptionsItem>
+        <ElDescriptionsItem v-else label="参与现场图片:" :span="4">
+          -
+        </ElDescriptionsItem>
+      </ElDescriptions>
+    </div>
+  </ElCard>
+</template>
+
+<style scoped lang="scss">
+.task-info {
+  .section-title {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin: 20px 0 12px 0;
+
+    .section-bar {
+      width: 4px;
+      height: 12px;
+      background-color: #215acd;
+    }
+
+    .section-text {
+      font-size: 14px;
+      font-weight: 600;
+      color: var(--text-color-primary);
+    }
+  }
+
+  :deep(.el-descriptions) {
+    margin-bottom: 0 !important;
+  }
+
+  :deep(.el-descriptions__label) {
+    font-size: 14px;
+    font-weight: 400;
+    color: var(--text-color-secondary);
+  }
+
+  :deep(.el-descriptions__content) {
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text-color-primary);
+  }
+
+  :deep(.el-descriptions__table) {
+    background: transparent !important;
+  }
+}
+
+.task-images {
+  display: flex;
+  gap: 12px;
+  margin-top: 4px;
+  flex-wrap: wrap;
+
+  .task-image {
+    width: 80px;
+    height: 80px;
+    cursor: pointer;
+    object-fit: cover;
+    border-radius: 4px;
+    transition: transform 0.2s;
+
+    &:hover {
+      transform: scale(1.05);
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+// @ts-ignore
+
+import {
+  ElCard,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElTable,
+  ElTableColumn,
+} from 'element-plus';
+
+// 定义组件的Props接口
+interface TankWaterProps {
+  taskDetail: any;
+}
+
+// 接收父组件传递的任务详情数据
+defineProps<TankWaterProps>();
+</script>
+
+<template>
+  <ElCard>
+    <template #header>
+      <div class="flex items-center gap-4">
+        <div style="width: 4px; height: 12px; background-color: #215acd"></div>
+        <span
+          class="text-lg font-bold text-gray-800"
+          style="font-size: 14px; font-weight: 600"
+        >
+          量缸试水详情
+        </span>
+      </div>
+    </template>
+
+    <div class="task-info">
+      <ElDescriptions :column="4" class="mb-6">
+        <ElDescriptionsItem label="开始测量时间:">
+          {{ taskDetail?.measurementStartTime || '-' }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="异常记录:">
+          {{ taskDetail?.abnormalDescription || '-' }}
+        </ElDescriptionsItem>
+      </ElDescriptions>
+
+      <div class="section-title">
+        <div class="section-bar"></div>
+        <div class="section-text">测量信息</div>
+      </div>
+
+      <ElTable
+        :data="taskDetail?.tankWaterDetailList || []"
+        border
+        style="width: 100%"
+        class="mt-4"
+      >
+        <ElTableColumn prop="tankNumber" label="罐号" align="center" />
+        <ElTableColumn prop="oilProduct" label="油品名称" align="center" />
+        <ElTableColumn label="液位仪数据" align="center">
+          <ElTableColumn
+            prop="levelGaugeOilHeightH1"
+            label="油高h1(mm)"
+            align="center"
+          />
+          <ElTableColumn
+            prop="levelGaugeWaterHeight"
+            label="水高(mm)"
+            align="center"
+          />
+        </ElTableColumn>
+        <ElTableColumn label="手工量缸数据" align="center">
+          <ElTableColumn
+            prop="manualTankOilHeightH2"
+            label="油高h2(mm)"
+            align="center"
+          />
+          <ElTableColumn
+            prop="manualTankWaterHeight"
+            label="水高(mm)"
+            align="center"
+          />
+        </ElTableColumn>
+        <ElTableColumn
+          prop="heightDifference"
+          label="高度差(mm)(h2-h1)"
+          align="center"
+        />
+        <ElTableColumn prop="tankTemperature" label="油罐温度" align="center" />
+      </ElTable>
+    </div>
+  </ElCard>
+</template>
+
+<style scoped lang="scss">
+.task-info {
+  .section-title {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin: 20px 0 12px 0;
+
+    .section-bar {
+      width: 4px;
+      height: 12px;
+      background-color: #215acd;
+    }
+
+    .section-text {
+      font-size: 14px;
+      font-weight: 600;
+      color: var(--text-color-primary);
+    }
+  }
+
+  :deep(.el-descriptions) {
+    margin-bottom: 0 !important;
+  }
+
+  :deep(.el-descriptions__label) {
+    font-size: 14px;
+    font-weight: 400;
+    color: var(--text-color-secondary);
+  }
+
+  :deep(.el-descriptions__content) {
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text-color-primary);
+  }
+
+  :deep(.el-descriptions__table) {
+    background: transparent !important;
+  }
+
+  :deep(.el-table) {
+    margin-top: 12px;
+  }
+
+  :deep(.el-table__header-wrapper) {
+    background-color: #f5f7fa;
+  }
+
+  :deep(.el-table th) {
+    font-weight: 600;
+    color: var(--text-color-primary);
+  }
+}
+</style>

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

@@ -4,6 +4,8 @@ export { default as EntranceDrawer } from './entrance/index.vue';
 
 export { default as GroupLogDrawer } from './groupLog/index.vue';
 
+export { default as JoinEmergencyDrawer } from './joinEmergency/index.vue';
+
 export { default as MeetingDrawer } from './meeting/index.vue';
 
 export { default as OperatingPlanDrawer } from './operatingPlan/index.vue';
@@ -12,6 +14,10 @@ export { default as ManagementPlanDrawer } from './plan/index.vue';
 
 export { default as SalesSurveyDrawer } from './salesSurvey/index.vue';
 
+export { default as TankWaterDrawer } from './tankWater/index.vue';
+
 export { default as UploadDrawer } from './upload/index.vue';
 
+// export { default as WeeklyDrawer } from './weekly/index.vue';
+
 export { default as WeeklyEvaluationDrawer } from './weeklyEvaluation/index.vue';

apps/web-ele/src/views/schedule/detail/drawer/joinEmergency/config-data.tsx

@@ -0,0 +1,72 @@
+// @ts-ignore: 忽略
+import type { FormSchemaGetter } from '#/adapter/form';
+
+// @ts-ignore: 忽略
+import { getMultipleImageUploadConfig } from '#/components/upload';
+
+// 抽屉表单配置
+export const drawerFormSchema: any | FormSchemaGetter = () => [
+  {
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '请选择参与时间',
+      type: 'datetime',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    fieldName: 'participationTime',
+    label: '参与时间',
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入参与记录',
+      type: 'textarea',
+      rows: 4,
+    },
+    fieldName: 'participationRecord',
+    label: '参与记录',
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    fieldName: 'images',
+    label: '图片',
+    componentProps: {
+      maxlength: 30,
+    },
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    component: 'Upload',
+    fieldName: 'imagesPaths',
+    label: '图片',
+    componentProps: (row: any) => {
+      return {
+        ...getMultipleImageUploadConfig(5),
+        multiple: true,
+        onSuccess: (res: any, uploadFile: any, uploadFiles: any) => {
+          if (res.code === 200) {
+            const paths: string[] = [];
+            uploadFiles.forEach((item: any) => {
+              if (item.response?.code === 200) {
+                paths.push(item.response.data.fileName);
+              }
+            });
+            row.images = paths.join(',');
+
+            return res.data;
+          }
+        },
+      };
+    },
+    renderComponentContent: () => {
+      return {
+        default: () => '点击上传',
+      };
+    },
+  },
+];

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

@@ -0,0 +1,112 @@
+<script setup lang="ts">
+// @ts-ignore
+
+import { ref } from 'vue';
+
+// @ts-ignore
+import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
+
+// @ts-ignore
+// 这里需要替换为实际的API，如果没有可以先注释
+import { handleAttendanceMeeting, handleJoinEmergency } from '#/api/task';
+
+// @ts-ignore
+import { drawerFormSchema } from './config-data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+// 初始化表单配置
+const [Form, formApi] = useVbenForm({
+  showDefaultActions: false,
+  schema: drawerFormSchema(),
+});
+
+// 初始化任务参数
+const taskParams = ref({
+  taskId: '',
+  taskName: '',
+  taskList: '',
+  subFormType: '',
+});
+
+// 初始化抽屉组件
+const [Drawer, drawerApi] = useVbenDrawer({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    try {
+      drawerApi.drawerLoading(true);
+      const { taskId, taskName, taskList, subFormType } = drawerApi.getData();
+      taskParams.value.taskId = taskId;
+      taskParams.value.taskName = taskName;
+      taskParams.value.taskList = taskList;
+      taskParams.value.subFormType = subFormType;
+
+      // 如果有任务数据，填充表单
+      if (taskList && taskList.length > 0) {
+        formApi.setValues(taskList[0]);
+      } else {
+        formApi.resetForm();
+      }
+    } catch (error) {
+      console.error(error);
+    } finally {
+      drawerApi.drawerLoading(false);
+    }
+  },
+  onClosed() {
+    formApi.resetForm();
+  },
+  async onConfirm() {
+    try {
+      this.confirmLoading = true;
+
+      // 验证表单
+      const { valid } = await formApi.validate();
+      if (!valid) {
+        return;
+      }
+
+      // 获取表单数据
+      const values = await formApi.getValues();
+
+      // 构建提交数据
+      const params = {
+        id: drawerApi.getData().taskId,
+        ...values,
+      };
+
+      // 调用API提交数据
+      if (taskParams.value.subFormType === 'participate_emergency_wy') {
+        await handleJoinEmergency(params);
+      } else if (
+        taskParams.value.subFormType === 'participate_oil_station_meeting'
+      ) {
+        await handleAttendanceMeeting(params);
+      }
+
+      // 触发刷新事件
+      emit('reload');
+      // 关闭抽屉
+      drawerApi.close();
+    } catch (error) {
+      console.error(error);
+    } finally {
+      this.confirmLoading = false;
+    }
+  },
+});
+</script>
+
+<template>
+  <Drawer :title="taskParams.taskName">
+    <Form />
+  </Drawer>
+</template>
+
+<style scoped lang="scss">
+:deep(.el-input-number) {
+  width: 100%;
+}
+</style>

apps/web-ele/src/views/schedule/detail/drawer/operatingPlan/config-data.tsx

@@ -198,5 +198,205 @@ export const defaultExternalFactors = [
   { item: '其它', example: '', threat: '', opportunity: '' },
 ];
 
+// 业绩提升计划表格列配置
+export const performancePlanColumns: VxeGridProps['columns'] = [
+  {
+    field: 'actionPlan',
+    title: '行动计划',
+    width: 200,
+    editRender: { name: 'textarea' },
+  },
+  {
+    field: 'executor',
+    title: '执行人',
+    width: 100,
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'measurementStandard',
+    title: '衡量标准',
+    width: 200,
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'requiredResources',
+    title: '需要的资源',
+    width: 200,
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'startDate',
+    title: '开始时间',
+    width: 150,
+    editRender: { name: 'inpt', props: { type: 'date' } },
+  },
+  {
+    field: 'endDate',
+    title: '结束时间',
+    width: 150,
+    editRender: { name: 'inpt', props: { type: 'date' } },
+    slots: {
+      // default: ,
+    },
+  },
+];
+
+// 业绩提升计划默认数据
+export const defaultPerformancePlanData = [
+  {
+    actionPlan: '',
+    executor: '',
+    measurementStandard: '',
+    requiredResources: '',
+    startDate: '',
+    endDate: '',
+  },
+];
+
+// 油品销量提升表单配置
+export const oilSalesPlanSchema = () => [
+  {
+    component: 'SectionTitle',
+    fieldName: '_section_title',
+    hideLabel: true,
+    componentProps: {
+      title: '油品销量提升',
+    },
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入可能的障碍',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'oilPossibleObstacle',
+    label: '可能的障碍',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入何时或如何',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'oilActionPlan',
+    label: '何时或如何',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入应变计划',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'oilContingencyPlan',
+    label: '应变计划',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入执行人',
+    },
+    fieldName: 'oilExecutor',
+    label: '执行人',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入衡量的标准',
+      type: 'textarea',
+      rows: 2,
+    },
+    fieldName: 'oilMeasurementStandard',
+    label: '衡量的标准',
+  },
+  {
+    fieldName: 'oilPerformancePlanTable',
+    label: '油品销量提升何时或如何表',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => [],
+      };
+    },
+  },
+];
+
+// 非油品销量提升表单配置
+export const nonOilSalesPlanSchema = () => [
+  {
+    component: 'SectionTitle',
+    fieldName: '_section_title',
+    hideLabel: true,
+    componentProps: {
+      title: '非油品销量提升',
+    },
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入可能的障碍',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'nonOilPossibleObstacle',
+    label: '可能的障碍',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入何时或如何',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'nonOilActionPlan',
+    label: '何时或如何',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入应变计划',
+      type: 'textarea',
+      rows: 3,
+    },
+    fieldName: 'nonOilContingencyPlan',
+    label: '应变计划',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入执行人',
+    },
+    fieldName: 'nonOilExecutor',
+    label: '执行人',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入衡量的标准',
+      type: 'textarea',
+      rows: 2,
+    },
+    fieldName: 'nonOilMeasurementStandard',
+    label: '衡量的标准',
+  },
+  {
+    fieldName: 'nonOilPerformancePlanTable',
+    label: '非油品销量提升何时或如何表',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => [],
+      };
+    },
+  },
+];
+
+// 业绩提升计划表单配置
+export const performancePlanSchema = () => {
+  return [...oilSalesPlanSchema(), ...nonOilSalesPlanSchema()];
+};
+
 // 默认表格列配置（保留兼容）
 export const defautTableColumns: VxeGridProps['columns'] = [];

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

@@ -15,9 +15,13 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   defaultExternalFactors,
   defaultInternalFactors,
+  defaultPerformancePlanData,
   drawerFormSchema,
   externalFactorsColumns,
   internalFactorsColumns,
+  nonOilSalesPlanSchema,
+  oilSalesPlanSchema,
+  performancePlanColumns,
   // @ts-ignore: 忽略
 } from './config-data';
 
@@ -66,9 +70,13 @@ const [Drawer, drawerApi] = useVbenDrawer({
   },
   onClosed() {
     formApi.resetForm();
+    oilSalesPlanFormApi.resetForm();
+    nonOilSalesPlanFormApi.resetForm();
     // 重置表格数据
     internalFactorsData.value = [...defaultInternalFactors];
     externalFactorsData.value = [...defaultExternalFactors];
+    oilPerformancePlanData.value = [...defaultPerformancePlanData];
+    nonOilPerformancePlanData.value = [...defaultPerformancePlanData];
   },
   async onConfirm() {
     try {
@@ -167,6 +175,90 @@ const [ExternalFactorsTable, externalFactorsApi] = useVbenVxeGrid({
   gridOptions: externalFactorsGridOptions,
 });
 
+// 初始化油品销量提升计划表单
+const [OilSalesPlanForm, oilSalesPlanFormApi] = useVbenForm({
+  showDefaultActions: false,
+  schema: oilSalesPlanSchema(),
+});
+
+// 初始化非油品销量提升计划表单
+const [NonOilSalesPlanForm, nonOilSalesPlanFormApi] = useVbenForm({
+  showDefaultActions: false,
+  schema: nonOilSalesPlanSchema(),
+});
+
+// 初始化油品销量提升表格数据
+const oilPerformancePlanData = ref(defaultPerformancePlanData);
+// 初始化非油品销量提升表格数据
+const nonOilPerformancePlanData = ref(defaultPerformancePlanData);
+
+// 初始化油品销量提升表格配置
+const oilPerformancePlanGridOptions: VxeGridProps = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        return {
+          items: oilPerformancePlanData.value,
+        };
+      },
+    },
+  },
+  columns: performancePlanColumns,
+  editConfig: {
+    mode: 'cell',
+    trigger: 'click',
+  },
+};
+
+// 初始化非油品销量提升表格配置
+const nonOilPerformancePlanGridOptions: VxeGridProps = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        return {
+          items: nonOilPerformancePlanData.value,
+        };
+      },
+    },
+  },
+  columns: performancePlanColumns,
+  editConfig: {
+    mode: 'cell',
+    trigger: 'click',
+  },
+};
+
+// 初始化油品销量提升表格组件
+const [OilPerformancePlanTable, oilPerformancePlanApi] = useVbenVxeGrid({
+  gridOptions: oilPerformancePlanGridOptions,
+});
+
+// 初始化非油品销量提升表格组件
+const [NonOilPerformancePlanTable, nonOilPerformancePlanApi] = useVbenVxeGrid({
+  gridOptions: nonOilPerformancePlanGridOptions,
+});
+
+// 初始化激活标签页
+const activeTab = ref('swot');
+
 // 确认事件
 const confirmEvent = (row: any) => {
   // 处理确认事件
@@ -175,17 +267,51 @@ const confirmEvent = (row: any) => {
 
 <template>
   <Drawer :title="taskParams.taskName">
-    <Form>
-      <!-- 内在因素评估表格插槽 -->
-      <template #internalFactorsTable>
-        <InternalFactorsTable table-title="" class="w-full" />
-      </template>
-
-      <!-- 外在因素评估表格插槽 -->
-      <template #externalFactorsTable>
-        <ExternalFactorsTable table-title="" class="w-full" />
-      </template>
-    </Form>
+    <el-tabs v-model="activeTab" class="w-full">
+      <!-- SWOT分析标签页 -->
+      <el-tab-pane label="SWOT分析" name="swot">
+        <Form>
+          <!-- 内在因素评估表格插槽 -->
+          <template #internalFactorsTable>
+            <InternalFactorsTable table-title="" class="w-full" />
+          </template>
+
+          <!-- 外在因素评估表格插槽 -->
+          <template #externalFactorsTable>
+            <ExternalFactorsTable table-title="" class="w-full" />
+          </template>
+        </Form>
+      </el-tab-pane>
+
+      <!-- 业绩提升计划标签页 -->
+      <el-tab-pane label="业绩提升计划" name="performancePlan">
+        <!-- 油品销量提升计划 -->
+        <OilSalesPlanForm>
+          <!-- 油品销量提升行动计划表插槽 -->
+          <template #oilPerformancePlanTable>
+            <OilPerformancePlanTable table-title="" class="w-full" />
+          </template>
+        </OilSalesPlanForm>
+
+        <!-- 非油品销量提升计划 -->
+        <NonOilSalesPlanForm>
+          <!-- 非油品销量提升行动计划表插槽 -->
+          <template #nonOilPerformancePlanTable>
+            <NonOilPerformancePlanTable table-title="" class="w-full" />
+          </template>
+        </NonOilSalesPlanForm>
+      </el-tab-pane>
+
+      <!-- 上次SWOT分析标签页 -->
+      <el-tab-pane label="上次SWOT分析" name="lastSwot">
+        <!-- 上次SWOT分析内容 -->
+      </el-tab-pane>
+
+      <!-- 上次业绩提升计划标签页 -->
+      <el-tab-pane label="上次业绩提升计划" name="lastPerformancePlan">
+        <!-- 上次业绩提升计划内容 -->
+      </el-tab-pane>
+    </el-tabs>
   </Drawer>
 </template>
 

apps/web-ele/src/views/schedule/detail/drawer/tankWater/config-data.ts

@@ -0,0 +1,119 @@
+// @ts-ignore: 忽略
+import type { FormSchemaGetter } from '#/adapter/form';
+// @ts-ignore: 忽略
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+/**
+ * 量缸试水抽屉表单配置
+ */
+export const drawerFormSchema: any | FormSchemaGetter = () => [
+  {
+    component: 'DatePicker',
+    fieldName: 'measurementStartTime',
+    label: '开始测量时间',
+    componentProps: {
+      placeholder: '请选择开始测量时间',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    fieldName: 'abnormalDescription',
+    label: '异常记录',
+    componentProps: {
+      placeholder: '请输入异常记录',
+      type: 'textarea',
+      rows: 4,
+    },
+  },
+  {
+    fieldName: 'tankWaterDetailList',
+    label: '测量信息',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => [],
+      };
+    },
+  },
+];
+
+/**
+ * 默认表格列配置
+ */
+export const defautTableColumns: VxeGridProps['columns'] = [
+  {
+    field: 'tankNumber',
+    title: '罐号',
+    width: 100,
+    fixed: 'left',
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'oilProduct',
+    title: '油品名称',
+    width: 120,
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'levelGauge',
+    title: '液位仪',
+    width: 200,
+    children: [
+      {
+        field: 'levelGaugeOilHeightH1',
+        title: '油高h1(mm)',
+        width: 150,
+        editRender: {
+          name: 'input',
+        },
+        // slots: { default: 'levelGaugeOilHeightH1' },
+      },
+      {
+        field: 'levelGaugeWaterHeight',
+        title: '水高(mm)',
+        width: 150,
+        editRender: { name: 'input' },
+      },
+    ],
+  },
+  {
+    field: 'manualTank',
+    title: '手工量缸',
+    width: 250,
+    children: [
+      {
+        field: 'manualTankOilHeightH2',
+        title: '油高h2(mm)',
+        width: 150,
+        editRender: { name: 'input' },
+      },
+      {
+        field: 'manualTankWaterHeight',
+        title: '水高(mm)',
+        width: 150,
+        editRender: { name: 'input' },
+      },
+    ],
+  },
+  {
+    field: 'heightDifference',
+    title: '高度差(mm)(h2-h1)',
+    width: 250,
+  },
+  {
+    field: 'tankTemperature',
+    title: '油罐温度',
+    width: 100,
+    editRender: { name: 'input' },
+  },
+  {
+    field: 'action',
+    title: '操作',
+    width: 100,
+    fixed: 'right',
+    slots: { default: 'action' },
+  },
+];

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

@@ -0,0 +1,172 @@
+<script setup lang="ts">
+// @ts-ignore: 忽略
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+import { ref } from 'vue';
+
+// @ts-ignore: 忽略
+import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
+
+// @ts-ignore: 忽略
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+// @ts-ignore: 忽略
+// 这里需要替换为实际的API，如果没有可以先注释
+import { handleTankWater } from '#/api/task';
+
+// @ts-ignore: 忽略
+import { defautTableColumns, drawerFormSchema } from './config-data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+// 初始化表单配置
+const [Form, formApi] = useVbenForm({
+  showDefaultActions: false,
+  schema: drawerFormSchema(),
+});
+
+// 初始化任务参数
+const taskParams: any = ref({
+  taskId: '',
+  taskName: '',
+  taskList: null,
+  subFormType: '',
+});
+
+// 初始化抽屉组件
+const [Drawer, drawerApi] = useVbenDrawer({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    try {
+      drawerApi.drawerLoading(true);
+      const { taskId, taskName, taskList, subFormType } = drawerApi.getData();
+      taskParams.value.taskId = taskId;
+      taskParams.value.taskName = taskName;
+      taskParams.value.taskList = taskList;
+      taskParams.value.subFormType = subFormType;
+
+      // 如果有任务数据，填充表单
+      if (taskList && taskList.length > 0) {
+        formApi.setValues(taskList[0]);
+      } else {
+        formApi.resetForm();
+      }
+    } catch (error) {
+      console.error(error);
+    } finally {
+      drawerApi.drawerLoading(false);
+    }
+  },
+  onClosed() {
+    formApi.resetForm();
+  },
+  async onConfirm() {
+    try {
+      this.confirmLoading = true;
+
+      // 验证表单
+      const { valid } = await formApi.validate();
+      if (!valid) {
+        return;
+      }
+
+      // 获取表单数据
+      const values = await formApi.getValues();
+
+      // 获取表格数据
+      const list = basicTableApi.grid.getData();
+
+      // 计算高度差
+      if (list && list.length > 0) {
+        list.forEach((item: any) => {
+          item.heightDifference =
+            item.manualTankOilHeightH2 - item.levelGaugeOilHeightH1;
+        });
+      }
+
+      // 构建提交数据
+      const params = {
+        id: drawerApi.getData().taskId,
+        ...values,
+        tankWaterDetailList: list,
+      };
+
+      // 调用API提交数据
+      await handleTankWater(params);
+
+      // 触发刷新事件
+      emit('reload');
+      // 关闭抽屉
+      drawerApi.close();
+    } catch (error) {
+      console.error(error);
+    } finally {
+      this.confirmLoading = false;
+    }
+  },
+});
+
+// 初始化表格配置
+const gridOptions: VxeGridProps = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        // 这里可以调用API获取表格数据
+        return {
+          items: taskParams.value.taskList?.[0]?.formTankWaterRecords || [], // 初始数据
+        };
+      },
+    },
+  },
+  columns: defautTableColumns,
+  editConfig: {
+    mode: 'cell',
+    trigger: 'click',
+  },
+};
+
+// 初始化表格组件
+const [BasicTable, basicTableApi] = useVbenVxeGrid({
+  gridOptions,
+});
+</script>
+
+<template>
+  <Drawer :title="taskParams.taskName">
+    <Form>
+      <!-- 测量信息表格插槽 -->
+      <template #tankWaterDetailList>
+        <BasicTable table-title="" class="w-full">
+          <template #bottom>
+            <ElButton class="mt-2 w-full">
+              + 新增行（无法读取到油站管号和油品时使用）
+            </ElButton>
+          </template>
+        </BasicTable>
+      </template>
+      <template #action="scope">
+        <ElButton type="primary"> 删除 </ElButton>
+      </template>
+    </Form>
+  </Drawer>
+</template>
+
+<style scoped lang="scss">
+:deep(.el-input-number) {
+  width: 100%;
+}
+
+:deep(.el-form-item__label) {
+  font-weight: 500;
+}
+</style>

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

@@ -53,12 +53,16 @@ import EntranceComponent from './components/entrance.vue';
 // @ts-ignore
 import GroupLogComponent from './components/group-log.vue';
 // @ts-ignore
+import JoinEmergencyComponent from './components/join-emergency.vue';
+// @ts-ignore
 import MeetingComponent from './components/meeting.vue';
 // @ts-ignore
 import ManagementPlanComponent from './components/plan.vue';
 // @ts-ignore
 import SalesSurveyComponent from './components/sales-survey.vue';
 // @ts-ignore
+import TankWaterComponent from './components/tank-water.vue';
+// @ts-ignore
 import WeeklyEvaluationComponent from './components/weekly-evaluation.vue';
 // @ts-ignore
 import WeeklyComponent from './components/weekly.vue';
@@ -68,10 +72,12 @@ import {
   EmergencyWyDrawer,
   EntranceDrawer,
   GroupLogDrawer,
+  JoinEmergencyDrawer,
   ManagementPlanDrawer,
   MeetingDrawer,
   OperatingPlanDrawer,
   SalesSurveyDrawer,
+  TankWaterDrawer,
   UploadDrawer,
   WeeklyEvaluationDrawer,
 } from './drawer';
@@ -315,6 +321,15 @@ const DynamicDrawerComponent = defineComponent({
             Component = OperatingPlanDrawer;
             break;
           }
+          case 'participate_emergency_wy':
+          case 'participate_oil_station_meeting': {
+            Component = JoinEmergencyDrawer;
+            break;
+          }
+          case 'tank_water': {
+            Component = TankWaterDrawer;
+            break;
+          }
           default: {
             // ElMessage.error('当前任务无法处理');
             Component = null;
@@ -373,6 +388,7 @@ const dealEvent = async () => {
         taskName: taskInfo.value.taskName,
         taskList: taskInfo.value.taskList || [],
         remark: taskResult.value.content,
+        subFormType: taskInfo.value.subFormType,
         attachmentUrl: taskResult.value.images,
       };
 
@@ -759,58 +775,29 @@ onMounted(async () => {
           "
         />
 
-        <!-- 处理信息组件 -->
-        <!-- <ElCard v-if="taskInfo.status === 3">
-          <template #header>
-            <div class="flex items-center gap-4">
-              <div
-                style="width: 4px; height: 12px; background-color: #215acd"
-              ></div>
-              <span
-                class="text-lg font-bold text-gray-800"
-                style="font-size: 14px; font-weight: 600"
-              >
-                处理信息
-              </span>
-            </div>
-          </template>
-          <ElDescriptions class="task-info" :column="4">
-            <ElDescriptionsItem
-              v-if="taskResult.handleContent || taskInfo.cancelReason"
-              label="处理情况:"
-              :span="4"
-            >
-              {{ taskResult.handleContent || taskInfo.cancelReason || '' }}
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="处理时间:" :span="4">
-              {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
-            </ElDescriptionsItem>
-            <ElDescriptionsItem
-              v-if="taskResult.files && taskResult.files.length > 0"
-              label="处理附件:"
-              :span="4"
-            >
-              <div class="attachment-list">
-                <div
-                  v-for="(file, index) in taskResult.files"
-                  :key="index"
-                  class="attachment-item"
-                  @click="
-                    () =>
-                      downloadFile(
-                        file,
-                        taskResult.fileNames[index] || `附件${+index + 1}`,
-                      )
-                  "
-                >
-                  <span class="attachment-name">{{
-                    taskResult.fileNames[index] || `附件${+index + 1}`
-                  }}</span>
-                </div>
-              </div>
-            </ElDescriptionsItem>
-          </ElDescriptions>
-        </ElCard> -->
+        <!-- 参与紧急情况组件 -->
+        <JoinEmergencyComponent
+          :task-detail="{
+            ...taskInfo.taskList[0],
+            subFormType: taskInfo.subFormType,
+          }"
+          v-if="
+            taskInfo.formType === 'form' &&
+            [
+              'participate_oil_station_meeting',
+              'participate_emergency_wy',
+            ].includes(taskInfo.subFormType)
+          "
+        />
+
+        <!-- 量缸试水组件 -->
+        <TankWaterComponent
+          :task-detail="taskInfo.taskList[0]"
+          v-if="
+            taskInfo.formType === 'form' &&
+            taskInfo.subFormType === 'tank_water'
+          "
+        />
       </div>
 
       <div style="width: 412px">