src/api/home/clgl/index.ts

@@ -1,54 +1,52 @@
-import request from '@/config/axios'
+import request from '@/config/axios'
-
+
-// 车辆管理 VO
+// 车辆管理 VO
-export interface ClglVO {
+export interface ClglVO {
-  id: number // id
+  id: number // id
-  carUser: number // 申请人
+  carUser: number // 申请人
-  dept: number // 部门
+  dept: number // 部门
-  carType: number // 用车类型
+  carType: number // 用车类型
-  carDriver: number // 驾驶员
+  carDriver: number // 驾驶员
-  carStart: Date // 用车开始时间
+  carStart: Date // 用车开始时间
-  carEnd: Date // 用车结束时间
+  carEnd: Date // 用车结束时间
-  carAddress: string // 目的地
+  carAddress: string // 目的地
-  carInfo: string // 车辆信息
+  carInfo: string // 车辆信息
-  processInstanceId: string
+  carStartMileage: string // 车辆开始里程
-  flowStatus: number
+  carEndMileage: string // 车辆结束里程
-  carStartMileage: string // 车辆开始里程
+  carStatus: number // 用车状态
-  carEndMileage: string // 车辆结束里程
+  carReason: string // 用车原因
-  carStatus: number // 用车状态
+  carRemark: string // 备注
-  carReason: string // 用车原因
+}
-  carRemark: string // 备注
+
-}
+// 车辆管理 API
-
+export const ClglApi = {
-// 车辆管理 API
+  // 查询车辆管理分页
-export const ClglApi = {
+  getClglPage: async (params: any) => {
-  // 查询车辆管理分页
+    return await request.get({ url: `/home/clgl/page`, params })
-  getClglPage: async (params: any) => {
+  },
-    return await request.get({ url: `/home/clgl/page`, params })
+
-  },
+  // 查询车辆管理详情
-
+  getClgl: async (id: number) => {
-  // 查询车辆管理详情
+    return await request.get({ url: `/home/clgl/get?id=` + id })
-  getClgl: async (id: number) => {
+  },
-    return await request.get({ url: `/home/clgl/get?id=` + id })
+
-  },
+  // 新增车辆管理
-
+  createClgl: async (data: ClglVO) => {
-  // 新增车辆管理
+    return await request.post({ url: `/home/clgl/create`, data })
-  createClgl: async (data: ClglVO) => {
+  },
-    return await request.post({ url: `/home/clgl/create`, data })
+
-  },
+  // 修改车辆管理
-
+  updateClgl: async (data: ClglVO) => {
-  // 修改车辆管理
+    return await request.put({ url: `/home/clgl/update`, data })
-  updateClgl: async (data: ClglVO) => {
+  },
-    return await request.put({ url: `/home/clgl/update`, data })
+
-  },
+  // 删除车辆管理
-
+  deleteClgl: async (id: number) => {
-  // 删除车辆管理
+    return await request.delete({ url: `/home/clgl/delete?id=` + id })
-  deleteClgl: async (id: number) => {
+  },
-    return await request.delete({ url: `/home/clgl/delete?id=` + id })
+
-  },
+  // 导出车辆管理 Excel
-
+  exportClgl: async (params) => {
-  // 导出车辆管理 Excel
+    return await request.download({ url: `/home/clgl/export-excel`, params })
-  exportClgl: async (params) => {
+  },
-    return await request.download({ url: `/home/clgl/export-excel`, params })
+}
-  },
-}

src/router/modules/remaining.ts

@@ -376,6 +376,40 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
+  // {
+  //   path: '/Home',
+  //   component: Layout,
+  //   name: 'car',
+  //   meta: {
+  //     hidden: true
+  //   },
+  //   children: [
+  //     {
+  //       path: 'clgl/ClglCreate',
+  //       component: () => import('@/views/Home/clgl/ClglCreate.vue'),
+  //       name: 'ClglCreate',
+  //       meta: {
+  //         noCache: true,
+  //         hidden: true,
+  //         canTo: true,
+  //         title: '发起车辆管理流程',
+  //         activeMenu: '/Home/clgl/Clglflow'
+  //       }
+  //     },
+  //     // {
+  //     //   path: 'clgl/ClglDetail',
+  //     //   component: () => import('@/views/Home/clgl/ClglDetail.vue'),
+  //     //   name: 'ClglCreate',
+  //     //   meta: {
+  //     //     noCache: true,
+  //     //     hidden: true,
+  //     //     canTo: true,
+  //     //     title: '发起车辆管理流程',
+  //     //     activeMenu: '/Home/clgl/Clglflow'
+  //     //   }
+  //     // },
+  //   ]
+  // },
   {
     path: '/mall/product', // 商品中心
     component: Layout,
@@ -651,33 +685,9 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '发起请假流程',
           activeMenu: '/qjgl/qjglflow'
         }
-      },
+      }
-      {
-        path: 'clgl/ClglCreate',
-        component: () => import('@/views/Home/clgl/ClglCreate.vue'),
-        name: 'ClglCreate',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          title: '发起车辆管理流程',
-          activeMenu: '/Home/clgl/Clglflow'
-        }
-      },
-      {
-        path: 'clgl/ClglDetail',
-        component: () => import('@/views/Home/clgl/ClglDetail.vue'),
-        name: 'ClglDetail',
-        meta: {
-          noCache: true,
-          hidden: true,
-          canTo: true,
-          title: '发起车辆管理流程',
-          activeMenu: '/Home/clgl/Clglflow'
-        }
-      },
     ]
-  },
+  }
 ]
 
 export default remainingRouter

src/views/Home/clgl/ClglCreate.vue

@@ -1,190 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="申请人" prop="carUser">
-        <el-input v-model="formData.carUser" placeholder="请输入申请人" />
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-input v-model="formData.dept" placeholder="请输入部门" />
-      </el-form-item>
-      <el-form-item label="用车类型" prop="carType">
-        <el-select v-model="formData.carType" placeholder="请选择用车类型">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="驾驶员" prop="carDriver">
-        <el-input v-model="formData.carDriver" placeholder="请输入驾驶员" />
-      </el-form-item>
-      <el-form-item label="用车开始时间" prop="carStart">
-        <el-date-picker
-          v-model="formData.carStart"
-          type="date"
-          value-format="x"
-          placeholder="选择用车开始时间"
-        />
-      </el-form-item>
-      <el-form-item label="用车结束时间" prop="carEnd">
-        <el-date-picker
-          v-model="formData.carEnd"
-          type="date"
-          value-format="x"
-          placeholder="选择用车结束时间"
-        />
-      </el-form-item>
-      <el-form-item label="目的地" prop="carAddress">
-        <el-input v-model="formData.carAddress" placeholder="请输入目的地" />
-      </el-form-item>
-      <el-form-item label="车辆信息" prop="carInfo">
-        <el-input v-model="formData.carInfo" placeholder="请输入车辆信息" />
-      </el-form-item>
-      <el-form-item label="车辆开始里程" prop="carStartMileage">
-        <el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" />
-      </el-form-item>
-      <el-form-item label="车辆结束里程" prop="carEndMileage">
-        <el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" />
-      </el-form-item>
-      <el-form-item label="用车状态" prop="carStatus">
-        <el-radio-group v-model="formData.carStatus">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="用车原因" prop="carReason">
-        <el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" />
-      </el-form-item>
-      <el-form-item label="备注" prop="carRemark">
-        <el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" />
-      </el-form-item>
-    </el-form>
-    <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-  </ContentWrap>
-</template>
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { ClglApi, ClglVO } from '@/api/home/clgl'
-import * as DefinitionApi from '@/api/bpm/definition'
-import * as UserApi from '@/api/system/user'
-import {useTagsViewStore} from "@/store/modules/tagsView"
-
-
-/** 车辆管理 表单 */
-defineOptions({ name: 'ClglCreate' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const { delView } = useTagsViewStore()//视图操作
-const { push, currentRoute } = useRouter()
-// const dialogVisible = ref(false) // 弹窗的是否展示
-// const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-// const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  carUser: undefined,
-  dept: undefined,
-  carType: undefined,
-  carDriver: undefined,
-  carStart: undefined,
-  carEnd: undefined,
-  carAddress: undefined,
-  carInfo: undefined,
-  carStartMileage: undefined,
-  carEndMileage: undefined,
-  carStatus: undefined,
-  carReason: undefined,
-  carRemark: undefined,
-})
-const formRules = reactive({
-  carUser: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
-  carType: [{ required: true, message: '用车类型不能为空', trigger: 'change' }],
-  carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }],
-  carStart: [{ required: true, message: '用车开始时间不能为空', trigger: 'blur' }],
-  carEnd: [{ required: true, message: '用车结束时间不能为空', trigger: 'blur' }],
-  carAddress: [{ required: true, message: '目的地不能为空', trigger: 'blur' }],
-  carStatus: [{ required: true, message: '用车状态不能为空', trigger: 'blur' }],
-  carReason: [{ required: true, message: '用车原因不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-// 指定审批人
-const processDefineKey = 'test-001' // 流程定义 Key
-const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
-const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
-const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
-const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
-const userList = ref<any[]>([]) // 用户列表
-
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-
-
-  // 校验表单
-  await formRef.value.validate()
-
-  // 校验指定审批人++
-  if(startUserSelectTasks.value?.length > 0){
-    await startUserSelectAssigneesFormRef.value.validate()
-  }
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as ClglVO
-
-    if(startUserSelectTasks.value?.length > 0){
-      data.startUserSelectAssignees = startUserSelectAssignees.value
-    }
-    await ClglApi.createClgl(data)
-    message.success(t('common.createSuccess'))
-    delView(unref(currentRoute))
-    await push({name: 'ClglCreate'})
-  } finally {
-    formLoading.value = false
-  }
-}
-/** 初始化 */
-onMounted(async () => {
-  const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
-    undefined,
-    processDefineKey
-  )
-  if (!processDefinitionDetail) {
-    message.error('车辆管理流程模型未配置，请检查！')
-    return
-  }
-  startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
-  // 设置指定审批人
-  if (startUserSelectTasks.value?.length > 0) {
-    // 设置校验规则
-    for (const userTask of startUserSelectTasks.value) {
-      startUserSelectAssignees.value[userTask.id] = []
-      startUserSelectAssigneesFormRules.value[userTask.id] = [
-        { required: true, message: '请选择审批人', trigger: 'blur' }
-      ]
-    }
-
-    // 加载用户列表
-    userList.value = await UserApi.getSimpleUserList()
-  }
-})
-
-</script>

src/views/Home/clgl/ClglDetail.vue

@@ -1,200 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="申请人" prop="carUser">
-        <el-input v-model="formData.carUser" placeholder="请输入申请人" disabled />
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-input v-model="formData.dept" placeholder="请输入部门" disabled/>
-      </el-form-item>
-      <el-form-item label="用车类型" prop="carType">
-        <el-select v-model="formData.carType" placeholder="请选择用车类型" disabled>
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-            disabled
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="驾驶员" prop="carDriver">
-        <el-input v-model="formData.carDriver" placeholder="请输入驾驶员" disabled />
-      </el-form-item>
-      <el-form-item label="用车开始时间" prop="carStart">
-        <el-date-picker
-          v-model="formData.carStart"
-          type="date"
-          value-format="x"
-          placeholder="选择用车开始时间"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="用车结束时间" prop="carEnd">
-        <el-date-picker
-          v-model="formData.carEnd"
-          type="date"
-          value-format="x"
-          placeholder="选择用车结束时间"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="目的地" prop="carAddress">
-        <el-input v-model="formData.carAddress" placeholder="请输入目的地"  disabled/>
-      </el-form-item>
-      <el-form-item label="车辆信息" prop="carInfo">
-        <el-input v-model="formData.carInfo" placeholder="请输入车辆信息" disabled />
-      </el-form-item>
-      <el-form-item label="车辆开始里程" prop="carStartMileage">
-        <el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" disabled />
-      </el-form-item>
-      <el-form-item label="车辆结束里程" prop="carEndMileage">
-        <el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" disabled />
-      </el-form-item>
-      <el-form-item label="用车状态" prop="carStatus">
-        <el-radio-group v-model="formData.carStatus" disabled>
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-            disabled
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="用车原因" prop="carReason">
-        <el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" disabled />
-      </el-form-item>
-      <el-form-item label="备注" prop="carRemark">
-        <el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" disabled />
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-</template>
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { ClglApi } from '@/api/home/clgl'
-import {propTypes} from "@/utils/propTypes";
-
-/** 车辆管理 表单 */
-defineOptions({ name: 'ClglDetail' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  carUser: undefined,
-  dept: undefined,
-  carType: undefined,
-  carDriver: undefined,
-  carStart: undefined,
-  carEnd: undefined,
-  carAddress: undefined,
-  carInfo: undefined,
-  carStartMileage: undefined,
-  carEndMileage: undefined,
-  carStatus: undefined,
-  carReason: undefined,
-  carRemark: undefined,
-})
-
-const { query } = useRoute() // 查询参数
-
-const props = defineProps({
-  id: propTypes.number.def(undefined)
-})
-const detailLoading = ref(false) // 表单的加载中
-const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
-/** 获得数据 */
-const getInfo = async () => {
-  detailLoading.value = true
-  try {
-    formData.value = await ClglApi.getClgl(props.id || queryId)
-  } finally {
-    detailLoading.value = false
-  }
-}
-/** 初始化 **/
-onMounted(() => {
-  getInfo()
-})
-const formRules = reactive({
-  // carUser: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-// const open = async (type: string, id?: number) => {
-//   dialogVisible.value = true
-//   dialogTitle.value = t('action.' + type)
-//   formType.value = type
-//   resetForm()
-//   // 修改时，设置数据
-//   if (id) {
-//     formLoading.value = true
-//     try {
-//       formData.value = await ClglApi.getClgl(id)
-//     } finally {
-//       formLoading.value = false
-//     }
-//   }
-// }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-// const submitForm = async () => {
-//   // 校验表单
-//   await formRef.value.validate()
-//   // 提交请求
-//   formLoading.value = true
-//   try {
-//     const data = formData.value as unknown as ClglVO
-//     if (formType.value === 'create') {
-//       await ClglApi.createClgl(data)
-//       message.success(t('common.createSuccess'))
-//     } else {
-//       await ClglApi.updateClgl(data)
-//       message.success(t('common.updateSuccess'))
-//     }
-//     dialogVisible.value = false
-//     // 发送操作成功的事件
-//     emit('success')
-//   } finally {
-//     formLoading.value = false
-//   }
-// }
-
-/** 重置表单 */
-// const resetForm = () => {
-//   formData.value = {
-//     id: undefined,
-//     carUser: undefined,
-//     dept: undefined,
-//     carType: undefined,
-//     carDriver: undefined,
-//     carStart: undefined,
-//     carEnd: undefined,
-//     carAddress: undefined,
-//     carInfo: undefined,
-//     carStartMileage: undefined,
-//     carEndMileage: undefined,
-//     carStatus: undefined,
-//     carReason: undefined,
-//     carRemark: undefined,
-//   }
-//   formRef.value?.resetFields()
-// }
-</script>

src/views/Home/clgl/index.vue

@@ -8,6 +8,24 @@
       :inline="true"
       label-width="68px"
     >
+<!--      <el-form-item label="id" prop="id">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.id"-->
+<!--          placeholder="请输入id"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="申请人" prop="carUser">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.carUser"-->
+<!--          placeholder="请输入申请人"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="部门" prop="dept">
         <el-input
           v-model="queryParams.dept"
@@ -32,6 +50,62 @@
           />
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="驾驶员" prop="carDriver">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.carDriver"-->
+<!--          placeholder="请输入驾驶员"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用车开始时间" prop="carStart">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.carStart"-->
+<!--          value-format="YYYY-MM-DD"-->
+<!--          type="date"-->
+<!--          placeholder="选择用车开始时间"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用车结束时间" prop="carEnd">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.carEnd"-->
+<!--          value-format="YYYY-MM-DD"-->
+<!--          type="date"-->
+<!--          placeholder="选择用车结束时间"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="目的地" prop="carAddress">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.carAddress"-->
+<!--          placeholder="请输入目的地"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="车辆开始里程" prop="carStartMileage">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.carStartMileage"-->
+<!--          placeholder="请输入车辆开始里程"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="车辆结束里程" prop="carEndMileage">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.carEndMileage"-->
+<!--          placeholder="请输入车辆结束里程"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="用车状态" prop="carStatus">
         <el-select
           v-model="queryParams.carStatus"
@@ -47,9 +121,28 @@
           />
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createTime"-->
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--          type="daterange"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['home:clgl:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
         <el-button
           type="success"
           plain
@@ -59,15 +152,6 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleCreate()"
-          :loading="exportLoading"
-          v-hasPermi="['home:clgl:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 发起流程
-        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -84,61 +168,40 @@
         </template>
       </el-table-column>
       <el-table-column label="驾驶员" align="center" prop="carDriver" />
-      <el-table-column align="center" label="审批状态" prop="flowStatus">
+      <el-table-column
-        <template #default="scope">
+        label="用车开始时间"
-          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.flowStatus" />
+        align="center"
-        </template>
+        prop="carStart"
-      </el-table-column>
+        :formatter="dateFormatter"
-<!--      <el-table-column-->
+        width="180px"
-<!--        label="用车开始时间"-->
+      />
-<!--        align="center"-->
+      <el-table-column
-<!--        prop="carStart"-->
+        label="用车结束时间"
-<!--        :formatter="dateFormatter"-->
+        align="center"
-<!--        width="180px"-->
+        prop="carEnd"
-<!--      />-->
+        :formatter="dateFormatter"
-<!--      <el-table-column-->
+        width="180px"
-<!--        label="用车结束时间"-->
+      />
-<!--        align="center"-->
+      <el-table-column label="目的地" align="center" prop="carAddress" />
-<!--        prop="carEnd"-->
+      <el-table-column label="车辆信息" align="center" prop="carInfo" />
-<!--        :formatter="dateFormatter"-->
+      <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />
-<!--        width="180px"-->
+      <el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />
-<!--      />-->
-<!--      <el-table-column label="目的地" align="center" prop="carAddress" />-->
-<!--      <el-table-column label="车辆信息" align="center" prop="carInfo" />-->
-<!--      <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />-->
-<!--      <el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />-->
       <el-table-column label="用车状态" align="center" prop="carStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_STATUS" :value="scope.row.carStatus" />
         </template>
       </el-table-column>
-<!--      <el-table-column label="用车原因" align="center" prop="carReason" />-->
+      <el-table-column label="用车原因" align="center" prop="carReason" />
-<!--      <el-table-column label="备注" align="center" prop="carRemark" />-->
+      <el-table-column label="备注" align="center" prop="carRemark" />
-<!--      <el-table-column-->
+      <el-table-column
-<!--        label="创建时间"-->
+        label="创建时间"
-<!--        align="center"-->
+        align="center"
-<!--        prop="createTime"-->
+        prop="createTime"
-<!--        :formatter="dateFormatter"-->
+        :formatter="dateFormatter"
-<!--        width="180px"-->
+        width="180px"
-<!--      />-->
+      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
-            link
-            type="primary"
-            @click="handleProcessDetail(scope.row)"
-          >
-            进度
-          </el-button>
-          <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
-            link
-            type="primary"
-            @click="handleDetail(scope.row)"
-          >
-            详情
-          </el-button>
           <el-button
             link
             type="primary"
@@ -173,11 +236,10 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { ClglApi, ClglVO } from '@/api/home/clgl'
 import ClglForm from './ClglForm.vue'
-import router from "@/router";
-import * as LeaveApi from '@/api/bpm/leave'
 
 /** 车辆管理 列表 */
 defineOptions({ name: 'Clgl' })
@@ -209,40 +271,6 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
-/** 添加操作 */
-const handleCreate = () => {
-  router.push({ name: 'ClglCreate' })
-}
-/** 详情操作 */
-const handleDetail = (row: LeaveApi.LeaveVO) => {
-  router.push({
-    name: 'ClglDetail',
-    query: {
-      id: row.id
-    }
-  })
-}
-
-/** 审批进度 */
-const handleProcessDetail = (row) => {
-  router.push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: row.processInstanceId
-    }
-  })
-}
-
-// fix: 列表不刷新的问题。
-watch(
-  () => router.currentRoute.value,
-  () => {
-    getList()
-  }
-)
-
-
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true

src/views/Home/clgl/index22-bk.vue

@@ -1,397 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-<!--      <el-form-item label="id" prop="id">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.id"-->
-<!--          placeholder="请输入id"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="申请人" prop="carUser">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carUser"-->
-<!--          placeholder="请输入申请人"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="部门" prop="dept">
-        <el-input
-          v-model="queryParams.dept"
-          placeholder="请输入部门"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="用车类型" prop="carType">
-        <el-select
-          v-model="queryParams.carType"
-          placeholder="请选择用车类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="驾驶员" prop="carDriver">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carDriver"-->
-<!--          placeholder="请输入驾驶员"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="用车开始时间" prop="carStart">-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.carStart"-->
-<!--          value-format="YYYY-MM-DD"-->
-<!--          type="date"-->
-<!--          placeholder="选择用车开始时间"-->
-<!--          clearable-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="用车结束时间" prop="carEnd">-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.carEnd"-->
-<!--          value-format="YYYY-MM-DD"-->
-<!--          type="date"-->
-<!--          placeholder="选择用车结束时间"-->
-<!--          clearable-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="目的地" prop="carAddress">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carAddress"-->
-<!--          placeholder="请输入目的地"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="车辆开始里程" prop="carStartMileage">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carStartMileage"-->
-<!--          placeholder="请输入车辆开始里程"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="车辆结束里程" prop="carEndMileage">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carEndMileage"-->
-<!--          placeholder="请输入车辆结束里程"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="用车状态" prop="carStatus">
-        <el-select
-          v-model="queryParams.carStatus"
-          placeholder="请选择用车状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="创建时间" prop="createTime">-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.createTime"-->
-<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
-<!--          type="daterange"-->
-<!--          start-placeholder="开始日期"-->
-<!--          end-placeholder="结束日期"-->
-<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          @click="openForm('create')"-->
-<!--          v-hasPermi="['home:clgl:create']"-->
-<!--        >-->
-<!--          <Icon icon="ep:plus" class="mr-5px" /> 新增-->
-<!--        </el-button>-->
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['home:clgl:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleCreate()"
-          :loading="exportLoading"
-          v-hasPermi="['home:clgl:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 发起流程
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column width="70" label="序号" align="center" type="index" />
-      <el-table-column label="申请人" align="center" prop="carUser" />
-      <el-table-column label="部门" align="center" prop="dept" />
-      <el-table-column label="用车类型" align="center" prop="carType">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="驾驶员" align="center" prop="carDriver" />
-<!--      <el-table-column-->
-<!--        label="用车开始时间"-->
-<!--        align="center"-->
-<!--        prop="carStart"-->
-<!--        :formatter="dateFormatter"-->
-<!--        width="180px"-->
-<!--      />-->
-<!--      <el-table-column-->
-<!--        label="用车结束时间"-->
-<!--        align="center"-->
-<!--        prop="carEnd"-->
-<!--        :formatter="dateFormatter"-->
-<!--        width="180px"-->
-<!--      />-->
-<!--      <el-table-column label="目的地" align="center" prop="carAddress" />-->
-<!--      <el-table-column label="车辆信息" align="center" prop="carInfo" />-->
-<!--      <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />-->
-<!--      <el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />-->
-      <el-table-column label="用车状态" align="center" prop="carStatus">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CLGL_CAR_STATUS" :value="scope.row.carStatus" />
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="用车原因" align="center" prop="carReason" />-->
-<!--      <el-table-column label="备注" align="center" prop="carRemark" />-->
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
-            link
-            type="primary"
-            @click="handleProcessDetail(scope.row)"
-          >
-            进度
-          </el-button>
-          <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
-            link
-            type="primary"
-            @click="handleDetail(scope.row)"
-          >
-            详情
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['home:clgl:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['home:clgl:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <ClglForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { ClglApi, ClglVO } from '@/api/home/clgl'
-import ClglForm from './ClglForm.vue'
-import router from "@/router";
-import * as LeaveApi from '@/api/bpm/leave'
-
-/** 车辆管理 列表 */
-defineOptions({ name: 'Clgl' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<ClglVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  id: undefined,
-  carUser: undefined,
-  dept: undefined,
-  carType: undefined,
-  carDriver: undefined,
-  carStart: undefined,
-  carStart: [],
-  carEnd: undefined,
-  carEnd: [],
-  carAddress: undefined,
-  carStartMileage: undefined,
-  carEndMileage: undefined,
-  carStatus: undefined,
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 添加操作 */
-const handleCreate = () => {
-  router.push({ name: 'ClglCreate' })
-}
-/** 详情操作 */
-const handleDetail = (row: LeaveApi.LeaveVO) => {
-  router.push({
-    name: 'ClglDetail',
-    query: {
-      id: row.id
-    }
-  })
-}
-
-/** 审批进度 */
-const handleProcessDetail = (row) => {
-  router.push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: row.processInstanceId
-    }
-  })
-}
-
-// fix: 列表不刷新的问题。
-watch(
-  () => router.currentRoute.value,
-  () => {
-    getList()
-  }
-)
-
-
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await ClglApi.getClglPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ClglApi.deleteClgl(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ClglApi.exportClgl(queryParams)
-    download.excel(data, '车辆管理.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>