mod: 油价

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

@@ -4,9 +4,11 @@ enum Api {
   emergencyWySubmit = '/formEmergencyDrill/drill/submit',
   emergencyWySubmitReport = '/formEmergencyDrill/drill/submitReport',
   groupLogBase = '/formTeamShiftLog/log/handle',
+  marketingSurveyHandle = '/formCompetitorMarketingSurvey/survey/handle',
   meetingBase = '/formMeetingRecords/records/handle',
   salesSurveyHandle = '/formCompetitorSalesSurvey/survey/handle',
   scheduleShiftManagementList = '/scheduleShiftManagement/management/list',
+  turnInRateSurveyHandle = '/formTurnInRateSurvey/survey/handle',
   // childBase = '/taskCheckSubItem/item',
 }
 
@@ -63,3 +65,21 @@ export function submitEmergencyWyReport(params: any) {
 export function handleSalesSurvey(params: any) {
   return requestClient.put(`${Api.salesSurveyHandle}`, params);
 }
+
+/**
+ * 入场率调查处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleTurnInRateSurvey(params: any) {
+  return requestClient.put(`${Api.turnInRateSurveyHandle}`, params);
+}
+
+/**
+ * 营销调查处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleMarketingSurvey(params: any) {
+  return requestClient.put(`${Api.marketingSurveyHandle}`, params);
+}

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

@@ -1,11 +1,16 @@
 <script lang="ts" setup>
 // @ts-ignore
-import { computed, ref } from 'vue';
+import { computed, onMounted } from 'vue';
+
+import { DictEnum } from '@vben/constants';
 
 import { ElCard, ElDescriptions, ElDescriptionsItem } from 'element-plus';
+import { cloneDeep } from 'lodash-es';
 
 // @ts-ignore
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
+// @ts-ignore: 忽略
+import { dictDataInfo } from '#/api/system/dict/dict-data';
 
 // 定义组件的Props接口
 interface SalesSurveyProps {
@@ -30,116 +35,88 @@ const formatNumber = (value: number | string) => {
   return num.toFixed(2);
 };
 
-// 表格列配置
-const tableColumns: any = [
+// 第一个表格列配置（油站基本信息）
+const stationInfoColumns: any = [
   {
     field: 'competitorName',
-    title: '场站',
-    width: 100,
+    title: '油站',
+    width: 120,
     fixed: 'left',
     formatter: ({ row }) => {
       return row.competitorName || row.stationName || '-';
     },
   },
   {
-    field: 'gasolineCar',
-    title: '汽油车',
-    width: 180,
-    children: [
-      {
-        field: 'gasolineVehicleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'gasolineVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
+    field: 'stationNatureName',
+    title: '油站性质',
+    width: 100,
+    formatter: ({ row }) => {
+      return row.stationNatureName || '-';
+    },
   },
   {
-    field: 'dieselCar',
-    title: '柴油车',
-    width: 180,
-    children: [
-      {
-        field: 'dieselVehicleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'dieselVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
+    field: 'isCompetitor',
+    title: '竞争关系',
+    width: 120,
+    formatter: ({ row }) => {
+      return row.isCompetitor === 1 ? '是' : '否';
+    },
   },
   {
-    field: 'motorcycle',
-    title: '摩托车',
-    width: 180,
-    children: [
-      {
-        field: 'motorcycleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'motorcycleVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
+    field: 'distanceKm',
+    title: '距离(KM)',
+    width: 100,
   },
   {
-    field: 'gasCar',
-    title: '气车',
-    width: 180,
-    children: [
-      {
-        field: 'gasVehicleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'gasVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
+    field: 'promotionActivities',
+    title: '优惠活动',
+    width: 200,
+    editRender: { name: 'textarea' },
   },
   {
-    field: 'periodForecastDiff',
-    title: '时段预测销量差（升）',
-    width: 150,
+    field: 'valueAddedServices',
+    title: '增值服务',
+    width: 200,
+    editRender: { name: 'textarea' },
   },
   {
-    field: 'dailyForecastDiff',
-    title: '全天预测销量差（升）',
-    width: 150,
+    field: 'equipmentConfigChanges',
+    title: '油站设备配置变化',
+    width: 200,
+    editRender: { name: 'textarea' },
   },
+];
+
+// 第二个表格列配置（油品价格和销量差）
+const oilPriceColumns: any = [
   {
-    field: 'surveySales',
-    title: '调查销量（升）',
-    width: 180,
-    children: [
-      {
-        field: 'gasolineSurveyVolume',
-        title: '汽油',
-        width: 90,
-      },
-      {
-        field: 'dieselSurveyVolume',
-        title: '柴油',
-        width: 90,
-      },
-    ],
+    field: 'oilType',
+    title: '油品',
+    width: 100,
+    fixed: 'left',
+  },
+  {
+    field: 'listingPrice',
+    title: '挂牌价',
+    width: 100,
+    children: [],
+  },
+  {
+    field: 'discountPrice',
+    title: '优惠价',
+    width: 100,
+    children: [],
+  },
+  {
+    field: 'salesDifference',
+    title: '销量差',
+    width: 120,
+    children: [],
   },
 ];
 
-// 初始化表格配置
-const gridOptions: any = {
+// 初始化第一个表格配置（油站基本信息）
+const stationInfoGridOptions: any = {
   size: 'medium',
   toolbarConfig: {
     custom: false,
@@ -158,14 +135,90 @@ const gridOptions: any = {
       },
     },
   },
-  columns: tableColumns,
+  columns: stationInfoColumns,
+};
+
+// 初始化第二个表格配置（油品价格和销量差）
+const oilPriceGridOptions: any = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        const oilProducts = await dictDataInfo(DictEnum.OIL_PRODUCT);
+        const oilPriceList = oilProducts?.map((item: any) => {
+          const info: any = {
+            oilType: item.dictLabel,
+            oilTypeCode: item.dictValue,
+          };
+
+          props.taskDetail.forEach((item: any, index: number) => {
+            item.formOilPriceRecords.forEach((record: any) => {
+              if (record.oilTypeCode === item.oilTypeCode) {
+                info[`listingPrice_${item.id}_${index}`] =
+                  record.listingPrice || '-';
+                info[`discountPrice_${item.id}_${index}`] =
+                  record.discountPrice || '-';
+                info[`salesDifference_${item.id}_${index}`] =
+                  record.salesDifference || '-';
+              }
+            });
+          });
+          return info;
+        });
+        console.log(oilPriceList, 'oilPriceList');
+        return {
+          items: oilPriceList || [], // 初始数据为空
+        };
+      },
+    },
+  },
+  columns: oilPriceColumns,
 };
 
-// 表格数据
-const tableDatas = ref<any>([]);
 // 使用BasicTable组件
-const [BasicTable, basicTableApi] = useVbenVxeGrid({
-  gridOptions,
+const [StationInfoTable, stationInfoTableApi] = useVbenVxeGrid({
+  gridOptions: stationInfoGridOptions,
+});
+
+const [OilPriceTable, oilPriceTableApi] = useVbenVxeGrid({
+  gridOptions: oilPriceGridOptions,
+});
+
+const init = () => {
+  const columns: any = [...(cloneDeep(oilPriceColumns) || [])];
+  props.taskDetail.forEach((item: any, index: number) => {
+    columns[1].children.push({
+      field: `listingPrice_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+    });
+    columns[2].children.push({
+      field: `discountPrice_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+    });
+    columns[3].children.push({
+      field: `salesDifference_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+    });
+  });
+
+  oilPriceGridOptions.columns = columns;
+
+  oilPriceTableApi.setGridOptions(oilPriceGridOptions);
+};
+
+onMounted(() => {
+  init();
 });
 </script>
 
@@ -178,7 +231,7 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
           class="text-lg font-bold text-gray-800"
           style="font-size: 14px; font-weight: 600"
         >
-          销售调研详情
+          竟对销售调查详情
         </span>
       </div>
     </template>
@@ -187,24 +240,30 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
       <!-- 基本信息 -->
       <div class="section-title">
         <div class="section-bar"></div>
-        <span class="section-text">基本信息</span>
+        <span class="section-text">油站策略</span>
       </div>
       <ElDescriptions :column="4" class="mb-6">
-        <ElDescriptionsItem label="调查开始时间:">
-          {{ taskDetail[0].surveyStartTime || '-' }}
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="调查结束时间:">
-          {{ taskDetail[0].surveyEndTime || '-' }}
+        <ElDescriptionsItem label="调查时间:">
+          {{ taskDetail[0]?.surveyDate || '-' }}
         </ElDescriptionsItem>
       </ElDescriptions>
 
-      <!-- 销量调查表格 -->
+      <!-- 油站基本信息表格 -->
+      <!-- <div class="section-title">
+        <div class="section-bar"></div>
+        <span class="section-text">油站基本信息</span>
+      </div> -->
+      <div class="mb-6">
+        <StationInfoTable table-title="" class="w-full" />
+      </div>
+
+      <!-- 油品价格和销量差表格 -->
       <div class="section-title">
         <div class="section-bar"></div>
-        <span class="section-text">销量调查数据</span>
+        <span class="section-text">价格销售</span>
       </div>
       <div class="mb-6">
-        <BasicTable table-title="" class="w-full" />
+        <OilPriceTable table-title="" class="w-full" />
       </div>
     </div>
   </ElCard>

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

@@ -9,7 +9,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
 // 定义组件的Props接口
 interface SalesSurveyProps {
-  taskDetail: any;
+  taskList: any;
 }
 
 // 接收父组件传递的任务详情数据
@@ -17,7 +17,7 @@ const props = defineProps<SalesSurveyProps>();
 
 // 计算属性，获取销售调研数据
 const salesSurveyData = computed(() => {
-  return props.taskDetail || [];
+  return props.taskList || [];
 });
 
 // 格式化日期时间
@@ -34,26 +34,26 @@ const formatNumber = (value: number | string) => {
 const tableColumns: any = [
   {
     field: 'competitorName',
-    title: '场站',
-    width: 100,
+    title: '油站',
+    // width: 100,
     fixed: 'left',
     formatter: ({ row }) => {
       return row.competitorName || row.stationName || '-';
     },
   },
   {
-    field: 'gasolineCar',
+    field: 'gasCar',
     title: '汽油车',
     width: 180,
     children: [
       {
-        field: 'gasolineVehicleCount',
-        title: '进站次数',
+        field: 'gasRoadFlow',
+        title: '路面车流',
         width: 90,
       },
       {
-        field: 'gasolineVolumeDiff',
-        title: '加油升差数',
+        field: 'gasInFlow',
+        title: '进站车流',
         width: 90,
       },
     ],
@@ -64,13 +64,13 @@ const tableColumns: any = [
     width: 180,
     children: [
       {
-        field: 'dieselVehicleCount',
-        title: '进站次数',
+        field: 'dieselRoadFlow',
+        title: '路面车流',
         width: 90,
       },
       {
-        field: 'dieselVolumeDiff',
-        title: '加油升差数',
+        field: 'dieselInFlow',
+        title: '进站车流',
         width: 90,
       },
     ],
@@ -81,57 +81,13 @@ const tableColumns: any = [
     width: 180,
     children: [
       {
-        field: 'motorcycleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'motorcycleVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
-  },
-  {
-    field: 'gasCar',
-    title: '气车',
-    width: 180,
-    children: [
-      {
-        field: 'gasVehicleCount',
-        title: '进站次数',
-        width: 90,
-      },
-      {
-        field: 'gasVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-      },
-    ],
-  },
-  {
-    field: 'periodForecastDiff',
-    title: '时段预测销量差（升）',
-    width: 150,
-  },
-  {
-    field: 'dailyForecastDiff',
-    title: '全天预测销量差（升）',
-    width: 150,
-  },
-  {
-    field: 'surveySales',
-    title: '调查销量（升）',
-    width: 180,
-    children: [
-      {
-        field: 'gasolineSurveyVolume',
-        title: '汽油',
+        field: 'motorcycleRoadFlow',
+        title: '路面车流',
         width: 90,
       },
       {
-        field: 'dieselSurveyVolume',
-        title: '柴油',
+        field: 'motorcycleInFlow',
+        title: '进站车流',
         width: 90,
       },
     ],
@@ -153,7 +109,7 @@ const gridOptions: any = {
     ajax: {
       query: async () => {
         return {
-          items: props.taskDetail || [],
+          items: props.taskList || [],
         };
       },
     },
@@ -178,7 +134,7 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
           class="text-lg font-bold text-gray-800"
           style="font-size: 14px; font-weight: 600"
         >
-          销售调研详情
+          拐入率调研详情
         </span>
       </div>
     </template>
@@ -191,10 +147,10 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
       </div>
       <ElDescriptions :column="4" class="mb-6">
         <ElDescriptionsItem label="调查开始时间:">
-          {{ taskDetail[0].surveyStartTime || '-' }}
+          {{ taskList[0].surveyStartTime || '-' }}
         </ElDescriptionsItem>
         <ElDescriptionsItem label="调查结束时间:">
-          {{ taskDetail[0].surveyEndTime || '-' }}
+          {{ taskList[0].surveyEndTime || '-' }}
         </ElDescriptionsItem>
       </ElDescriptions>
 

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

@@ -8,33 +8,58 @@ export const drawerFormSchema: any | FormSchemaGetter = () => [
   {
     component: 'DatePicker',
     componentProps: {
-      placeholder: '请选择调查开始时间',
+      placeholder: '请选择调查时间',
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
       width: '100%',
     },
-    fieldName: 'surveyStartTime',
-    label: '调查开始时间',
+    fieldName: 'surveyDate',
+    label: '调查时间',
     rules: 'required',
   },
+  // {
+  //   component: 'DatePicker',
+  //   componentProps: {
+  //     placeholder: '请选择调查结束时间',
+  //     type: 'datetime',
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //     width: '100%',
+  //   },
+  //   fieldName: 'surveyEndTime',
+  //   label: '调查结束时间',
+  //   rules: 'required',
+  // },
   {
-    component: 'DatePicker',
+    component: 'SectionTitle',
+    fieldName: '_section_title',
+    hideLabel: true,
     componentProps: {
-      placeholder: '请选择调查结束时间',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      width: '100%',
+      title: '油站策略',
+    },
+  },
+  {
+    fieldName: 'stationInfoTable',
+    label: '油站基本信息',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => [],
+      };
+    },
+  },
+  {
+    component: 'SectionTitle',
+    fieldName: '_section_title',
+    hideLabel: true,
+    componentProps: {
+      title: '价格销售',
     },
-    fieldName: 'surveyEndTime',
-    label: '调查结束时间',
-    rules: 'required',
   },
   {
-    fieldName: 'salesSurveyTable',
-    label: '销量调查表格',
-    // component: 'div',
+    fieldName: 'oilPriceTable',
+    label: '油品价格和销量差',
     hideLabel: true,
     renderComponentContent: () => {
       return {
@@ -44,122 +69,85 @@ export const drawerFormSchema: any | FormSchemaGetter = () => [
   },
 ];
 
-// 默认表格列配置
-export const defautTableColumns: VxeGridProps['columns'] = [
+// 油站基本信息表格列配置
+export const stationInfoColumns: VxeGridProps['columns'] = [
   {
     field: 'competitorName',
-    title: '场站',
-    width: 100,
+    title: '油站',
+    width: 120,
     fixed: 'left',
     formatter: ({ row }) => {
       return row.competitorName || row.stationName || '-';
     },
   },
   {
-    field: 'gasolineCar',
-    title: '汽油车',
-    width: 180,
-    children: [
-      {
-        field: 'gasolineVehicleCount',
-        title: '进站次数',
-        editRender: { name: 'input' },
-        width: 90,
-      },
-      {
-        field: 'gasolineVolumeDiff',
-        title: '加油升差数',
-        editRender: { name: 'input' },
-        width: 90,
-      },
-    ],
-  },
-  {
-    field: 'dieselCar',
-    title: '柴油车',
-    width: 180,
-    children: [
-      {
-        field: 'dieselVehicleCount',
-        title: '进站次数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-      {
-        field: 'dieselVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-    ],
-  },
-  {
-    field: 'motorcycle',
-    title: '摩托车',
-    width: 180,
-    children: [
-      {
-        field: 'motorcycleCount',
-        title: '进站次数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-      {
-        field: 'motorcycleVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-    ],
-  },
-  {
-    field: 'gasCar',
-    title: '气车',
-    width: 180,
-    children: [
-      {
-        field: 'gasVehicleCount',
-        title: '进站次数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-      {
-        field: 'gasVolumeDiff',
-        title: '加油升差数',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-    ],
-  },
-  {
-    field: 'periodForecastDiff',
-    title: '时段预测销量差（升）',
-    width: 150,
-    editRender: { name: 'input' },
-  },
-  {
-    field: 'dailyForecastDiff',
-    title: '全天预测销量差（升）',
-    editRender: { name: 'input' },
-    width: 150,
-  },
-  {
-    field: 'surveySales',
-    title: '调查销量（升）',
-    width: 180,
-    children: [
-      {
-        field: 'gasolineSurveyVolume',
-        title: '汽油',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-      {
-        field: 'dieselSurveyVolume',
-        title: '柴油',
-        width: 90,
-        editRender: { name: 'input' },
-      },
-    ],
+    field: 'stationNatureName',
+    title: '油站性质',
+    width: 100,
+    formatter: ({ row }) => {
+      return row.stationNatureName || '-';
+    },
+  },
+  {
+    field: 'isCompetitor',
+    title: '竞争关系',
+    width: 120,
+    formatter: ({ row }) => {
+      return row.isCompetitor === 1 ? '是' : '否';
+    },
+  },
+  {
+    field: 'distanceKm',
+    title: '距离(KM)',
+    width: 100,
+  },
+  {
+    field: 'promotionActivities',
+    title: '优惠活动',
+    width: 200,
+    editRender: { name: 'textarea' },
+  },
+  {
+    field: 'valueAddedServices',
+    title: '增值服务',
+    width: 200,
+    editRender: { name: 'textarea' },
+  },
+  {
+    field: 'equipmentConfigChanges',
+    title: '油站设备配置变化',
+    width: 200,
+    editRender: { name: 'textarea' },
+  },
+];
+
+// 油品价格和销量差表格列配置
+export const oilPriceColumns: VxeGridProps['columns'] = [
+  {
+    field: 'oilType',
+    title: '油品',
+    width: 100,
+    fixed: 'left',
+  },
+  {
+    field: 'listingPrice',
+    title: '挂牌价',
+    width: 100,
+    children: [],
+  },
+  {
+    field: 'discountPrice',
+    title: '优惠价',
+    width: 100,
+    children: [],
+  },
+  {
+    field: 'salesDifference',
+    title: '销量差',
+    width: 120,
+    children: [],
   },
 ];
+
+// 默认表格列配置（兼容旧代码，实际使用上面两个表格）
+export const defautTableColumns: VxeGridProps['columns'] = stationInfoColumns;

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

@@ -6,14 +6,23 @@ import { ref } from 'vue';
 
 // @ts-ignore: 忽略
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
+import { DictEnum } from '@vben/constants';
+
+import { cloneDeep } from 'lodash-es';
 
 // @ts-ignore: 忽略
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 // @ts-ignore: 忽略
-import { handleSalesSurvey } from '#/api/task';
-
+import { dictDataInfo } from '#/api/system/dict/dict-data';
 // @ts-ignore: 忽略
-import { defautTableColumns, drawerFormSchema } from './config-data.tsx';
+import { handleMarketingSurvey } from '#/api/task';
+
+import {
+  drawerFormSchema,
+  oilPriceColumns,
+  stationInfoColumns,
+  // @ts-ignore: 忽略
+} from './config-data.tsx';
 
 // 定义事件
 const emit = defineEmits<{ reload: [] }>();
@@ -28,9 +37,122 @@ const [Form, formApi] = useVbenForm({
 const taskParams = ref({
   taskId: '',
   taskName: '',
-  taskList: '',
+  taskList: [] as any[],
 });
 
+// 初始化第一个表格配置（油站基本信息）
+const stationInfoGridOptions: VxeGridProps = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        // 这里可以调用API获取表格数据
+        return {
+          items: taskParams.value.taskList || [], // 初始数据为空
+        };
+      },
+    },
+  },
+  columns: stationInfoColumns,
+  editConfig: {
+    mode: 'cell',
+    trigger: 'click',
+  },
+};
+
+// 初始化第二个表格配置（油品价格和销量差）
+const oilPriceGridOptions: VxeGridProps = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        // 这里可以调用API获取表格数据
+        const oilProducts = await dictDataInfo(DictEnum.OIL_PRODUCT);
+        const oilPriceList = oilProducts?.map((item: any) => {
+          return {
+            oilType: item.dictLabel,
+            oilTypeCode: item.dictValue,
+          };
+        });
+        return {
+          items: oilPriceList || [], // 初始数据为空
+        };
+      },
+    },
+  },
+  columns: oilPriceColumns,
+  editConfig: {
+    mode: 'cell',
+    trigger: 'click',
+  },
+};
+
+// 初始化第一个表格组件
+const [StationInfoTable, stationInfoTableApi] = useVbenVxeGrid({
+  gridOptions: stationInfoGridOptions,
+});
+
+// 初始化第二个表格组件
+const [OilPriceTable, oilPriceTableApi] = useVbenVxeGrid({
+  gridOptions: oilPriceGridOptions,
+});
+
+const initPriceColumnsAndData = () => {
+  // 深拷贝oilPriceColumns这个数组，避免直接修改原数组
+  const columns: any = [...(cloneDeep(oilPriceColumns) || [])];
+  taskParams.value.taskList.forEach((item: any, index: number) => {
+    columns[1].children.push({
+      field: `listingPrice_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+      editRender: { name: 'input' },
+    });
+    columns[2].children.push({
+      field: `discountPrice_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+      editRender: { name: 'input' },
+    });
+    columns[3].children.push({
+      field: `salesDifference_${item.id}_${index}`,
+      title: `${item.competitorName || item.stationName}`,
+      width: 100,
+      editRender: { name: 'input' },
+    });
+  });
+
+  // 调用油品
+  // const oilProducts = getDictOptions(DictEnum.OIL_PRODUCT);
+  // oilPrices.value = oilProducts?.map((item: any) => {
+  //   return {
+  //     oilType: item.dictLabel,
+  //     oilTypeCode: item.dictValue,
+  //   };
+  // });
+
+  oilPriceGridOptions.columns = columns;
+
+  oilPriceTableApi.setGridOptions(oilPriceGridOptions);
+  // oilPriceTableApi.grid.set();
+  // oilPriceTableApi.query();
+};
+
 // 初始化抽屉组件
 const [Drawer, drawerApi] = useVbenDrawer({
   async onOpenChange(isOpen: boolean) {
@@ -43,6 +165,10 @@ const [Drawer, drawerApi] = useVbenDrawer({
       taskParams.value.taskId = taskId;
       taskParams.value.taskName = taskName;
       taskParams.value.taskList = taskList;
+
+      // stationInfoTableApi.reload();
+
+      initPriceColumnsAndData();
     } catch (error) {
       console.error(error);
     } finally {
@@ -61,23 +187,35 @@ const [Drawer, drawerApi] = useVbenDrawer({
       }
 
       const values = await formApi.getValues();
-      // const params = {
-      //   id: taskParams.value.taskId,
-      //   ...values,
-      // };
-
-      const list = basicTableApi.grid.getData();
-      const params: any = [];
-      list.forEach((item: any) => {
-        params.push({
-          ...item,
-          surveyStartTime: values.surveyStartTime,
-          surveyEndTime: values.surveyEndTime,
-        });
+
+      // 收集两个表格的数据
+      const stationInfoList = stationInfoTableApi.grid.getData();
+      const oilPriceList = oilPriceTableApi.grid.getData();
+
+      const params = taskParams.value.taskList;
+
+      stationInfoList.forEach((item: any, index: number) => {
+        params[index].promotionActivities = item.promotionActivities || '';
+        params[index].valueAddedServices = item.valueAddedServices || '';
+        params[index].equipmentConfigChanges =
+          item.equipmentConfigChanges || '';
+        params[index].surveyDate = values.surveyDate || '';
+
+        params[index].oilPriceRecords = oilPriceList.map(
+          (oilPriceItem: any) => {
+            return {
+              oilType: oilPriceItem.oilType,
+              listingPrice: oilPriceItem[`listingPrice_${item.id}_${index}`],
+              discountPrice: oilPriceItem[`discountPrice_${item.id}_${index}`],
+              salesDifference:
+                oilPriceItem[`salesDifference_${item.id}_${index}`],
+            };
+          },
+        );
       });
 
       // 这里可以调用API提交数据
-      await handleSalesSurvey(params);
+      await handleMarketingSurvey(params);
 
       emit('reload');
       drawerApi.close();
@@ -88,72 +226,18 @@ const [Drawer, drawerApi] = useVbenDrawer({
     }
   },
 });
-
-// 初始化表格配置
-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, // 初始数据为空
-        };
-      },
-    },
-  },
-  columns: defautTableColumns,
-  editConfig: {
-    mode: 'cell',
-    trigger: 'click',
-  },
-};
-
-// 初始化表格组件
-const [BasicTable, basicTableApi] = useVbenVxeGrid({
-  gridOptions,
-});
-
-// 确认事件
-const confirmEvent = (row: any) => {
-  // 处理确认事件
-};
 </script>
 
 <template>
   <Drawer :title="taskParams.taskName">
     <Form>
-      <!-- 销量调查表格插槽 -->
-      <template #salesSurveyTable>
-        <BasicTable table-title="" class="w-full">
-          <template #action="{ row }">
-            <ElSpace>
-              <ElPopconfirm
-                :title="$t('common.confirm-delete')"
-                @confirm="confirmEvent(row)"
-              >
-                <template #reference>
-                  <ElButton
-                    size="small"
-                    type="danger"
-                    plain
-                    v-access:code="['system:dict:remove']"
-                  >
-                    删除
-                  </ElButton>
-                </template>
-              </ElPopconfirm>
-            </ElSpace>
-          </template>
-        </BasicTable>
+      <!-- 油站基本信息表格插槽 -->
+      <template #stationInfoTable>
+        <StationInfoTable table-title="" class="w-full" />
+      </template>
+      <!-- 油品价格和销量差表格插槽 -->
+      <template #oilPriceTable>
+        <OilPriceTable table-title="" class="w-full" />
       </template>
     </Form>
   </Drawer>

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

@@ -47,7 +47,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
       taskParams.value.taskName = taskName;
       taskParams.value.taskList = taskList;
       // 填充计划表单
-      console.log(taskList, 'taskList');
       planFormApi.setValues(taskList[0]);
       // 填充报告表单
       reportFormApi.setValues(taskList[0]);

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

@@ -32,8 +32,8 @@ export const drawerFormSchema: any | FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    fieldName: 'salesSurveyTable',
-    label: '销量调查表格',
+    fieldName: 'entranceSurveyTable',
+    label: '拐入率调查表格',
     // component: 'div',
     hideLabel: true,
     renderComponentContent: () => {
@@ -48,7 +48,7 @@ export const drawerFormSchema: any | FormSchemaGetter = () => [
 export const defautTableColumns: VxeGridProps['columns'] = [
   {
     field: 'competitorName',
-    title: '场站',
+    title: '油站',
     width: 100,
     fixed: 'left',
     formatter: ({ row }) => {
@@ -56,19 +56,19 @@ export const defautTableColumns: VxeGridProps['columns'] = [
     },
   },
   {
-    field: 'gasolineCar',
+    field: 'gasCar',
     title: '汽油车',
     width: 180,
     children: [
       {
-        field: 'gasolineVehicleCount',
-        title: '进站次数',
+        field: 'gasRoadFlow',
+        title: '路面车流',
         editRender: { name: 'input' },
         width: 90,
       },
       {
-        field: 'gasolineVolumeDiff',
-        title: '加油升差数',
+        field: 'gasInFlow',
+        title: '进站车流',
         editRender: { name: 'input' },
         width: 90,
       },
@@ -80,85 +80,35 @@ export const defautTableColumns: VxeGridProps['columns'] = [
     width: 180,
     children: [
       {
-        field: 'dieselVehicleCount',
-        title: '进站次数',
-        width: 90,
+        field: 'dieselRoadFlow',
+        title: '路面车流',
         editRender: { name: 'input' },
-      },
-      {
-        field: 'dieselVolumeDiff',
-        title: '加油升差数',
         width: 90,
-        editRender: { name: 'input' },
       },
-    ],
-  },
-  {
-    field: 'motorcycle',
-    title: '摩托车',
-    width: 180,
-    children: [
       {
-        field: 'motorcycleCount',
-        title: '进站次数',
-        width: 90,
+        field: 'dieselInFlow',
+        title: '进站车流',
         editRender: { name: 'input' },
-      },
-      {
-        field: 'motorcycleVolumeDiff',
-        title: '加油升差数',
         width: 90,
-        editRender: { name: 'input' },
       },
     ],
   },
   {
-    field: 'gasCar',
-    title: '气车',
+    field: 'motorcycle',
+    title: '摩托车',
     width: 180,
     children: [
       {
-        field: 'gasVehicleCount',
-        title: '进站次数',
-        width: 90,
+        field: 'motorcycleRoadFlow',
+        title: '路面车流',
         editRender: { name: 'input' },
-      },
-      {
-        field: 'gasVolumeDiff',
-        title: '加油升差数',
         width: 90,
-        editRender: { name: 'input' },
       },
-    ],
-  },
-  {
-    field: 'periodForecastDiff',
-    title: '时段预测销量差（升）',
-    width: 150,
-    editRender: { name: 'input' },
-  },
-  {
-    field: 'dailyForecastDiff',
-    title: '全天预测销量差（升）',
-    editRender: { name: 'input' },
-    width: 150,
-  },
-  {
-    field: 'surveySales',
-    title: '调查销量（升）',
-    width: 180,
-    children: [
       {
-        field: 'gasolineSurveyVolume',
-        title: '汽油',
-        width: 90,
+        field: 'motorcycleInFlow',
+        title: '进站车流',
         editRender: { name: 'input' },
-      },
-      {
-        field: 'dieselSurveyVolume',
-        title: '柴油',
         width: 90,
-        editRender: { name: 'input' },
       },
     ],
   },

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

@@ -10,7 +10,7 @@ import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 // @ts-ignore: 忽略
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 // @ts-ignore: 忽略
-import { handleSalesSurvey } from '#/api/task';
+import { handleTurnInRateSurvey } from '#/api/task';
 
 // @ts-ignore: 忽略
 import { defautTableColumns, drawerFormSchema } from './config-data.tsx';
@@ -77,7 +77,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
       });
 
       // 这里可以调用API提交数据
-      await handleSalesSurvey(params);
+      await handleTurnInRateSurvey(params);
 
       emit('reload');
       drawerApi.close();
@@ -131,8 +131,8 @@ const confirmEvent = (row: any) => {
 <template>
   <Drawer :title="taskParams.taskName">
     <Form>
-      <!-- 销量调查表格插槽 -->
-      <template #salesSurveyTable>
+      <!-- 拐入率调查表格插槽 -->
+      <template #entranceSurveyTable>
         <BasicTable table-title="" class="w-full">
           <template #action="{ row }">
             <ElSpace>

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

@@ -687,7 +687,7 @@ onMounted(async () => {
 
         <!-- 入场率调查组件 -->
         <EntranceComponent
-          :task-detail="taskInfo.taskList[0]"
+          :task-list="taskInfo.taskList"
           v-if="
             taskInfo.formType === 'form' &&
             taskInfo.subFormType === 'entrance_rate_survey'
@@ -696,7 +696,7 @@ onMounted(async () => {
 
         <!-- 竞价结果组件 -->
         <CompetitionComponent
-          :task-detail="taskInfo.taskList[0]"
+          :task-detail="taskInfo.taskList"
           v-if="
             taskInfo.formType === 'form' &&
             taskInfo.subFormType === 'competition_price_survey'

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

@@ -8,6 +8,7 @@ export enum DictEnum {
   OIL_LOCATION_TYPE = 'oil_location_type', // 油站位置类型
   OIL_MARKET_TYPE = 'oil_market_type', // 油站市场类型
   OIL_NETWORK_TYPE = 'oil_network_type', // 油站网络类型
+  OIL_PRODUCT = 'oil_product', // 油品类型
   ROAD_DIRECTION = 'road_direction', // 车道方向
   ROAD_TYPE = 'road_type', // 道路类型
   SHIFT_SCHEDULING_TYPE = 'shift_scheduling_type', // 排班方式
@@ -26,12 +27,12 @@ export enum DictEnum {
   SYS_SHOW_HIDE = 'sys_show_hide', // 显示状态
   SYS_USER_SEX = 'sys_user_sex', // 性别
   SYS_YES_NO = 'sys_yes_no', // 是否
+  TASK_TYPE = 'task_type', // 任务类型
   TICKET_STATUS = 'ticket_status', // 工单状态
   VISIBILITY = 'visibility', // 可视度
   WEATHER_TYPE = 'weather_type', // 天气类型
   WF_BUSINESS_STATUS = 'wf_business_status', // 业务状态
   WF_FORM_TYPE = 'wf_form_type', // 表单类型
   WF_TASK_STATUS = 'wf_task_status', // 任务状态
-  TASK_TYPE = 'task_type', // 任务类型
   WORK_CONTENT = 'work_content', // 上班内容
 }