mod: 销售详情与处理

apps/web-ele/.env.development

@@ -4,11 +4,8 @@ VITE_PORT=8081
 VITE_BASE=/
 
 # 接口地址
-<<<<<<< HEAD
-=======
 
 # VITE_GLOB_API_URL=http://localhost:8080
->>>>>>> 0e1f6ad81045fb3321fea8042547bff705cc8a75
 VITE_GLOB_API_URL=http://39.164.159.226:8088
 # VITE_GLOB_API_URL=http://localhost:8080
 # VITE_GLOB_API_URL=http://192.168.1.7:8080

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

@@ -4,6 +4,7 @@ enum Api {
   emergencyWySubmit = '/formEmergencyDrill/drill/submit',
   emergencyWySubmitReport = '/formEmergencyDrill/drill/submitReport',
   groupLogBase = '/formTeamShiftLog/log/handle',
+  salesSurveyHandle = '/formCompetitorSalesSurvey/survey/handle',
   scheduleShiftManagementList = '/scheduleShiftManagement/management/list',
   // childBase = '/taskCheckSubItem/item',
 }
@@ -43,3 +44,12 @@ export function submitEmergencyWy(params: any) {
 export function submitEmergencyWyReport(params: any) {
   return requestClient.put(`${Api.emergencyWySubmitReport}`, params);
 }
+
+/**
+ * 销量调查处理
+ * @param params 处理参数
+ * @returns
+ */
+export function handleSalesSurvey(params: any) {
+  return requestClient.put(`${Api.salesSurveyHandle}`, params);
+}

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

@@ -0,0 +1,254 @@
+<script lang="ts" setup>
+// @ts-ignore
+import { computed, ref } from 'vue';
+
+import { ElCard, ElDescriptions, ElDescriptionsItem } from 'element-plus';
+
+// @ts-ignore
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+
+// 定义组件的Props接口
+interface SalesSurveyProps {
+  taskDetail: any;
+}
+
+// 接收父组件传递的任务详情数据
+const props = defineProps<SalesSurveyProps>();
+
+// 计算属性，获取销售调研数据
+const salesSurveyData = computed(() => {
+  return props.taskDetail || [];
+});
+
+// 格式化日期时间
+
+// 格式化数值，保留两位小数
+const formatNumber = (value: number | string) => {
+  if (value === undefined || value === null || value === '') return '-';
+  const num = Number(value);
+  if (isNaN(num)) return '-';
+  return num.toFixed(2);
+};
+
+// 表格列配置
+const tableColumns: any = [
+  {
+    field: 'competitorName',
+    title: '场站',
+    width: 100,
+    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: 'dieselCar',
+    title: '柴油车',
+    width: 180,
+    children: [
+      {
+        field: 'dieselVehicleCount',
+        title: '进站次数',
+        width: 90,
+      },
+      {
+        field: 'dieselVolumeDiff',
+        title: '加油升差数',
+        width: 90,
+      },
+    ],
+  },
+  {
+    field: 'motorcycle',
+    title: '摩托车',
+    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: '汽油',
+        width: 90,
+      },
+      {
+        field: 'dieselSurveyVolume',
+        title: '柴油',
+        width: 90,
+      },
+    ],
+  },
+];
+
+// 初始化表格配置
+const gridOptions: any = {
+  size: 'medium',
+  toolbarConfig: {
+    custom: false,
+    refresh: false,
+    zoom: false,
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        return {
+          items: props.taskDetail || [],
+        };
+      },
+    },
+  },
+  columns: tableColumns,
+};
+
+// 表格数据
+const tableDatas = ref<any>([]);
+// 使用BasicTable组件
+const [BasicTable, basicTableApi] = useVbenVxeGrid({
+  gridOptions,
+});
+</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">
+      <!-- 基本信息 -->
+      <div class="section-title">
+        <div class="section-bar"></div>
+        <span class="section-text">基本信息</span>
+      </div>
+      <ElDescriptions :column="4" class="mb-6">
+        <ElDescriptionsItem label="调查开始时间:">
+          {{ taskDetail[0].surveyStartTime || '-' }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="调查结束时间:">
+          {{ taskDetail[0].surveyEndTime || '-' }}
+        </ElDescriptionsItem>
+      </ElDescriptions>
+
+      <!-- 销量调查表格 -->
+      <div class="section-title">
+        <div class="section-bar"></div>
+        <span class="section-text">销量调查数据</span>
+      </div>
+      <div class="mb-6">
+        <BasicTable table-title="" class="w-full" />
+      </div>
+    </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;
+  }
+}
+</style>

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

@@ -4,4 +4,6 @@ export { default as MeetingDrawer } from './meeting/index.vue';
 
 export { default as ManagementPlanDrawer } from './plan/index.vue';
 
+export { default as SalesSurveyDrawer } from './salesSurvey/index.vue';
+
 export { default as UploadDrawer } from './upload/index.vue';

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

@@ -0,0 +1,165 @@
+// @ts-ignore: 忽略
+import type { FormSchemaGetter } from '#/adapter/form';
+// @ts-ignore: 忽略
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+// 抽屉表单配置
+export const drawerFormSchema: any | FormSchemaGetter = () => [
+  {
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '请选择调查开始时间',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: '100%',
+    },
+    fieldName: 'surveyStartTime',
+    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',
+  },
+  {
+    fieldName: 'salesSurveyTable',
+    label: '销量调查表格',
+    // component: 'div',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => [],
+      };
+    },
+  },
+];
+
+// 默认表格列配置
+export const defautTableColumns: VxeGridProps['columns'] = [
+  {
+    field: 'competitorName',
+    title: '场站',
+    width: 100,
+    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' },
+      },
+    ],
+  },
+];

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

@@ -0,0 +1,166 @@
+<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: 忽略
+import { handleSalesSurvey } from '#/api/task';
+
+// @ts-ignore: 忽略
+import { defautTableColumns, drawerFormSchema } from './config-data.tsx';
+
+// 定义事件
+const emit = defineEmits<{ reload: [] }>();
+
+// 初始化表单配置
+const [Form, formApi] = useVbenForm({
+  showDefaultActions: false,
+  schema: drawerFormSchema(),
+});
+
+// 初始化任务参数
+const taskParams = ref({
+  taskId: '',
+  taskName: '',
+  taskList: '',
+});
+
+// 初始化抽屉组件
+const [Drawer, drawerApi] = useVbenDrawer({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    try {
+      drawerApi.drawerLoading(true);
+      const { taskId, taskName, taskList } = drawerApi.getData();
+      taskParams.value.taskId = taskId;
+      taskParams.value.taskName = taskName;
+      taskParams.value.taskList = taskList;
+    } 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: 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,
+        });
+      });
+
+      // 这里可以调用API提交数据
+      await handleSalesSurvey(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, // 初始数据为空
+        };
+      },
+    },
+  },
+  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>
+    </Form>
+  </Drawer>
+</template>
+
+<style scoped lang="scss">
+:deep(.el-input-number) {
+  width: 100%;
+}
+</style>

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

@@ -43,6 +43,8 @@ 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 WeeklyComponent from './components/weekly.vue';
 import { mobileTaskTypes } from './config-data';
 import {
@@ -50,6 +52,7 @@ import {
   GroupLogDrawer,
   ManagementPlanDrawer,
   MeetingDrawer,
+  SalesSurveyDrawer,
   UploadDrawer,
 } from './drawer';
 
@@ -253,6 +256,10 @@ const DynamicDrawerComponent = defineComponent({
         Component = UploadDrawer;
       } else if (taskInfo.value.formType === 'form') {
         switch (taskInfo.value.subFormType) {
+          case 'competition_sales_survey': {
+            Component = SalesSurveyDrawer;
+            break;
+          }
           case 'emergency_wy': {
             Component = EmergencyWyDrawer;
             break;
@@ -509,7 +516,7 @@ onMounted(async () => {
               "
             >
               <div style="padding-left: 24px; margin-top: 10px">
-                <!-- <div>处理建议: {{ taskData.frequency }}</div> -->
+                <!-- <div>处理时间: {{ taskData.frequency }}</div> -->
                 <div>描述图片:</div>
                 <div class="task-images">
                   <img
@@ -523,6 +530,41 @@ onMounted(async () => {
                 </div>
               </div>
             </ElDescriptionsItem>
+
+            <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>
 
@@ -596,6 +638,15 @@ onMounted(async () => {
           "
         />
 
+        <!-- 销售调查组件 -->
+        <SalesSurveyComponent
+          :task-detail="taskInfo.taskList"
+          v-if="
+            taskInfo.formType === 'form' &&
+            taskInfo.subFormType === 'competition_sales_survey'
+          "
+        />
+
         <!-- 紧急情况组件 -->
         <EmergencyComponent
           :task-detail="taskInfo.taskList[0]"
@@ -614,7 +665,7 @@ onMounted(async () => {
         />
 
         <!-- 处理信息组件 -->
-        <ElCard v-if="taskInfo.status === 3">
+        <!-- <ElCard v-if="taskInfo.status === 3">
           <template #header>
             <div class="flex items-center gap-4">
               <div
@@ -639,11 +690,6 @@ onMounted(async () => {
             <ElDescriptionsItem label="处理时间:" :span="4">
               {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
             </ElDescriptionsItem>
-            <!-- <ElDescriptionsItem label="处理状态:">
-              <ElTag :type="statusConfig[taskInfo.status]?.type || 'info'">
-                {{ statusConfig[taskInfo.status]?.text || taskInfo.status }}
-              </ElTag>
-            </ElDescriptionsItem> -->
             <ElDescriptionsItem
               v-if="taskResult.files && taskResult.files.length > 0"
               label="处理附件:"
@@ -668,32 +714,8 @@ onMounted(async () => {
                 </div>
               </div>
             </ElDescriptionsItem>
-            <!-- <ElDescriptionsItem :span="4">
-              <div style="padding-left: 24px; margin-top: 10px">
-                <div v-if="taskResult.content">
-                  处理建议: {{ taskResult.content }}
-                </div>
-                <div v-if="taskResult.images && taskResult.images.length > 0">
-                  任务图片:
-                </div>
-                <div
-                  v-if="taskResult.images && taskResult.images.length > 0"
-                  class="task-images"
-                >
-                  <img
-                    v-for="(image, index) in taskResult.images"
-                    :key="index"
-                    :src="image"
-                    alt="处理图片"
-                    class="task-image"
-                    @click="previewImage(image)"
-                  />
-                </div>
-                <span v-else>-</span>
-              </div>
-            </ElDescriptionsItem> -->
           </ElDescriptions>
-        </ElCard>
+        </ElCard> -->
       </div>
 
       <div style="width: 412px">

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

@@ -39,15 +39,27 @@ export const tableColumns: VxeGridProps['columns'] = [
   {
     field: 'taskType',
     title: '任务类型',
-    formatter: (params: { cellValue: string | string[]; column: any; row: any }) => {
+    formatter: (params: {
+      cellValue: string | string[];
+      column: any;
+      row: any;
+    }) => {
       const options = getTaskTypeOptions();
       // 处理接口返回的逗号分隔字符串和前端多选的数组
       const cellValue = params.cellValue;
-      const values = typeof cellValue === 'string' ? cellValue.split(',') : Array.isArray(cellValue) ? cellValue : [cellValue];
-      return values.map(value => {
-        const option = options.find((item) => item.value === value);
-        return option ? option.label : value;
-      }).filter(label => label).join(', ');
+      const values =
+        typeof cellValue === 'string'
+          ? cellValue.split(',')
+          : (Array.isArray(cellValue)
+            ? cellValue
+            : [cellValue]);
+      return values
+        .map((value) => {
+          const option = options.find((item) => item.value === value);
+          return option ? option.label : value;
+        })
+        .filter(Boolean)
+        .join(', ');
     },
   },
   {