apps/web-ele/.env.development

@@ -1,10 +1,10 @@
 # 端口号
-VITE_PORT=8080
+VITE_PORT=8081
 
 VITE_BASE=/
 
 # 接口地址
-VITE_GLOB_API_URL=http://39.164.159.226:8088
+# VITE_GLOB_API_URL=http://39.164.159.226:8088
 # VITE_GLOB_API_URL=http://192.168.1.170:8080
 VITE_GLOB_FLOW_URL=http://192.168.31.160:8082
 # 是否开启 Nitro Mock服务，true 为开启，false 为关闭

apps/web-ele/src/api/upload.ts

@@ -0,0 +1,25 @@
+import { requestClient } from '#/api/request';
+
+interface UploadFileParams {
+  file: File;
+  onError?: (error: Error) => void;
+  onProgress?: (progress: { percent: number }) => void;
+  onSuccess?: (data: any, file: File) => void;
+}
+export async function uploadFile({
+  file,
+  onError,
+  onProgress,
+  onSuccess,
+}: UploadFileParams) {
+  try {
+    onProgress?.({ percent: 0 });
+
+    const data = await requestClient.upload('/common/upload', { file });
+
+    onProgress?.({ percent: 100 });
+    onSuccess?.(data, file);
+  } catch (error) {
+    onError?.(error instanceof Error ? error : new Error(String(error)));
+  }
+}

apps/web-ele/src/components/upload/config.ts

@@ -0,0 +1,84 @@
+import { useAppConfig } from '@vben/hooks';
+import { useAccessStore } from '@vben/stores';
+
+const { apiURL } = useAppConfig(import.meta.env, import.meta.env.PROD);
+const accessStore = useAccessStore();
+/**
+ * 获取上传接口完整地址
+ * @param path 上传接口路径，默认为 '/api/core/upload'
+ * @returns 完整的上传接口地址
+ */
+export function getUploadAction(path = '/common/upload'): string {
+  return `${apiURL}${path}`;
+}
+
+/**
+ * 单张图片上传配置
+ * @param action 上传接口路径，默认为 '/common/upload'
+ * @returns 上传配置对象
+ */
+export function getSingleImageUploadConfig(action = '/common/upload') {
+  return {
+    accept: 'image/*',
+    name: 'file',
+    listType: 'picture-card' as const,
+    multiple: false,
+    maxCount: 1,
+    limit: 1,
+    action: getUploadAction(action),
+    headers: {
+      Authorization: `Bearer ${accessStore.accessToken}`,
+    },
+  };
+}
+
+/**
+ * 多张图片上传配置
+ * @param maxCount 最大上传数量
+ * @param action 上传接口路径，默认为 '/api/core/upload'
+ * @returns 上传配置对象
+ */
+export function getMultipleImageUploadConfig(
+  maxCount: number,
+  action = '/common/upload',
+) {
+  return {
+    accept: 'image/*',
+    listType: 'picture-card' as const,
+    maxCount,
+    name: 'file',
+    action: getUploadAction(action),
+    headers: {
+      Authorization: `Bearer ${accessStore.accessToken}`,
+    },
+  };
+}
+
+/**
+ * 文件上传配置
+ * @param accept 接受的文件类型
+ * @param listType 列表类型
+ * @param maxCount 最大上传数量
+ * @param action 上传接口路径，默认为 '/api/core/upload'
+ * @returns 上传配置对象
+ */
+export function getFileUploadConfig(
+  accept: string,
+  listType: 'picture' | 'picture-card' | 'text' = 'picture-card',
+  maxCount?: number,
+  action = '/common/upload',
+) {
+  const config: any = {
+    accept,
+    listType,
+    name: 'file',
+    action: getUploadAction(action),
+    headers: {
+      Authorization: `Bearer ${accessStore.accessToken}`,
+    },
+  };
+  if (maxCount !== undefined) {
+    config.maxCount = maxCount;
+  }
+  return config;
+}

apps/web-ele/src/components/upload/index.ts

@@ -0,0 +1 @@
+export * from './config';

apps/web-ele/src/views/oilstation/idphoto/idphoto-data.tsx

@@ -1,7 +1,13 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { DictEnum } from '@vben/constants';
+
+import { stationInfoList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { getSingleImageUploadConfig } from '#/components/upload';
+// import { uploadFile } from '#/api/upload';
 import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
 
 // 字典标识常量
 const DICT_KEYS = {
@@ -128,16 +134,16 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '有效日期',
     minWidth: 120,
   },
-  {
-    field: 'storageLocationCode',
-    title: '存放处',
-    minWidth: 100,
-    formatter: (params: { cellValue: string; column: any; row: any }) => {
-      const options = getStorageLocations();
-      const option = options.find((item) => item.value === params.cellValue);
-      return option ? option.label : params.cellValue;
-    },
-  },
+  // {
+  //   field: 'storageLocationCode',
+  //   title: '存放处',
+  //   minWidth: 100,
+  //   formatter: (params: { cellValue: string; column: any; row: any }) => {
+  //     const options = getStorageLocations();
+  //     const option = options.find((item) => item.value === params.cellValue);
+  //     return option ? option.label : params.cellValue;
+  //   },
+  // },
   {
     field: 'renewalRequirements',
     title: '更换要求',
@@ -163,12 +169,17 @@ export const tableColumns: VxeGridProps['columns'] = [
     field: 'statusCode',
     title: '状态',
     minWidth: 100,
-    formatter: (params: { cellValue: string; column: any; row: any }) => {
-      const options = getStatusOptions();
-      const option = options.find((item) => item.value === params.cellValue);
-      const color = params.cellValue === '1' ? 'success' : 'danger';
-      return `<el-tag type="${color}">${option ? option.label : params.cellValue}</el-tag>`;
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.statusCode, DictEnum.SYS_DISABLED_STATUS);
+      },
     },
+    // formatter: (params: { cellValue: string; column: any; row: any }) => {
+    //   const options = getStatusOptions();
+    //   const option = options.find((item) => item.value === params.cellValue);
+    //   const color = params.cellValue === '1' ? 'success' : 'danger';
+    //   return `<el-tag type="${color}">${option ? option.label : params.cellValue}</el-tag>`;
+    // },
   },
   {
     field: 'action',
@@ -189,12 +200,22 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     fieldName: 'id',
   },
   {
-    component: 'Input',
+    component: 'ApiSelect',
     fieldName: 'stationName',
     label: '油站',
     componentProps: {
       placeholder: '请输入油站名称',
       maxlength: 100,
+      api: async () => {
+        const resp = await stationInfoList({});
+        const data = resp.rows || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id,
+            }))
+          : [];
+      },
     },
     rules: 'required',
   },
@@ -317,15 +338,50 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     label: '下次换证日期',
   },
   {
-    component: 'Upload',
+    component: 'Input',
     fieldName: 'certificateScanPath',
     label: '证件扫描件',
-    // 注意：该组件的详细实现已在idphoto-drawer.vue中通过插槽自定义
-    // 这里仅保留基本配置，实际渲染由插槽控制
-    componentProps: {
-      // 基础配置
-      action: '#',
-      multiple: true,
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    component: 'Upload',
+    fieldName: 'certificateScanPathUrl',
+    label: '证件扫描件',
+    componentProps: (row: any) => {
+      return {
+        ...getSingleImageUploadConfig(),
+        onSuccess: (res: any) => {
+          if (res.code === 200) {
+            row.certificateScanPath = res.data.fileName;
+            // form.setFieldValue('certificateScanPath', res.data.fileName);
+            row.certificateScanPathUrl = [res.data.url].map((url) => ({ url }));
+            return res.data;
+          }
+          // return Promise.reject(res);
+        },
+      };
+    },
+
+    // 更多属性见：https://ant.design/components/upload-cn
+    // accept: '.png,.jpg,.jpeg',
+    // // 自动携带认证信息
+    // customRequest: uploadFile,
+    // disabled: false,
+    // maxCount: 1,
+    // // 单位：MB
+    // maxSize: 2,
+    // multiple: false,
+    // showUploadList: true,
+    // // 上传列表的内建样式，支持四种基本样式 text, picture, picture-card 和 picture-circle
+    // listType: 'picture-card',
+
+    renderComponentContent: () => {
+      return {
+        default: () => '点击上传',
+      };
     },
   },
   {

apps/web-ele/src/views/oilstation/idphoto/idphoto-drawer.vue

@@ -1,14 +1,8 @@
 <script setup lang="ts">
-import type { UploadUserFile } from 'element-plus';
-
 import { onMounted, ref } from 'vue';
 
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
-import { Plus } from '@element-plus/icons-vue';
-import { ElIcon, ElUpload } from 'element-plus';
-
-import { uploadApi } from '#/api/core/upload';
 import {
   addIdPhoto,
   getIdPhotoDetail,
@@ -35,40 +29,6 @@ const DICT_KEYS = {
 };
 
 const uploadUrlRef = ref<string>('');
-// 自定义上传方法
-const handleUpload = async (options: any) => {
-  try {
-    // 使用uploadApi进行文件上传
-    const res = await uploadApi(options.file);
-    // 上传成功后调用onSuccess回调
-    const responseData = { url: res.url };
-    // 多个文件上传时，url以逗号隔开
-    uploadUrlRef.value = uploadUrlRef.value
-      ? `${uploadUrlRef.value},${res.url}`
-      : res.url;
-    console.log('上传成功:', uploadUrlRef.value);
-    options.onSuccess(responseData);
-  } catch (error) {
-    console.error('上传失败:', error);
-    options.onError(error);
-  }
-};
-
-// 删除文件处理
-const handleRemove = (
-  uploadFile: UploadUserFile,
-  uploadFiles: UploadUserFile[],
-) => {
-  console.log('删除文件:', uploadFile);
-  return true; // 返回true允许删除
-};
-
-// 预览文件处理
-const handlePreview = (uploadFile: UploadUserFile) => {
-  console.log('预览文件:', uploadFile);
-  // 可以实现自定义的预览逻辑
-};
-
 // 获取字典选项函数
 const getDictOptionsByKey = (key: string) => getDictOptions(key);
 
@@ -186,7 +146,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
         renewalRequirements:
           data.renewalRequirements || data.replacementRequirements,
         // url 数组转换为逗号分隔的字符串
-        certificateScanPath: uploadUrlRef.value || '',
         statusCode: data.statusCode || data.status,
       };
 
@@ -213,7 +172,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
   <Drawer :title="isUpdateRef ? '编辑证照' : '新增证照'">
     <Form>
       <!-- 自定义Upload组件插槽 -->
-      <template #certificateScanPath="scope">
+      <!-- <template #certificateScanPath="scope">
         <ElUpload
           v-model:file-list="scope.modelValue"
           action="#"
@@ -233,7 +192,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
             </ElIcon>
           </div>
         </ElUpload>
-      </template>
+      </template> -->
     </Form>
   </Drawer>
 </template>

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

@@ -164,12 +164,6 @@ async function exportHandle() {
       <template #toolbar-tools>
         <ElSpace>
           <ElButton
-            @click="exportHandle"
-            v-access:code="['oilstation:idphoto:export']"
-          >
-            导出
-          </ElButton>
-          <ElButton
             type="danger"
             :disabled="
               !(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)

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

@@ -10,8 +10,10 @@ export enum DictEnum {
   ROAD_DIRECTION = 'road_direction', // 车道方向
   ROAD_TYPE = 'road_type', // 道路类型
   SHIFT_SCHEDULING_TYPE = 'shift_scheduling_type', // 排班方式
+  STATION_TYPE = 'station_type', // 场站类型
   SYS_COMMON_STATUS = 'sys_common_status',
   SYS_DEVICE_TYPE = 'sys_device_type', // 设备类型
+  SYS_DISABLED_STATUS = 'sys_disabled_status', // 禁用状态
   SYS_GRANT_TYPE = 'sys_grant_type', // 授权类型
   SYS_JOB_GROUP = 'sys_job_group',
   SYS_JOB_STATUS = 'sys_job_status',
@@ -27,5 +29,4 @@ export enum DictEnum {
   WF_BUSINESS_STATUS = 'wf_business_status', // 业务状态
   WF_FORM_TYPE = 'wf_form_type', // 表单类型
   WF_TASK_STATUS = 'wf_task_status', // 任务状态
-  STATION_TYPE = 'station_type', // 场站类型
 }