车辆管理

src/api/home/clgl/index.ts

@@ -6,6 +6,7 @@ export interface ClglVO {
   carUserId: number // 申请人
   carUserName: string // 申请人
   dept: number // 部门
+  deptName: string // 部门
   carType: number // 用车类型
   carDriver: string // 驾驶员
   carStart: Date // 用车开始时间

src/views/Home/clgl/ClglCreate.vue

@@ -16,7 +16,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="部门" prop="dept">
-            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo }} </div>
             <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
           </el-form-item>
         </el-col>
@@ -114,7 +114,6 @@ import * as DefinitionApi from '@/api/bpm/definition'
 import * as UserApi from '@/api/system/user'
 import {useTagsViewStore} from "@/store/modules/tagsView"
 import {getUserProfile} from "@/api/system/user/profile";
-import {DeptVO, getDept} from "@/api/system/dept";
 
 
 /** 车辆管理 表单 */
@@ -133,6 +132,7 @@ const formData = ref({
   carUserId: undefined,
   carUserName: undefined,
   dept: undefined,
+  deptName: undefined,
   carType: undefined,
   carDriver: undefined,
   carStart: undefined,
@@ -163,7 +163,7 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
 const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
 const userList = ref<any[]>([]) // 用户列表
-const deptInfo = ref({} as DeptVO ) // 部门信息
+const deptInfo = ref('') // 部门信息
 const userInfo = ref('') // 用户名字
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -172,7 +172,6 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
 
-
   // 校验表单
   await formRef.value.validate()
 
@@ -209,8 +208,11 @@ const getUserInfo = async () => {
   if (formData.value.carUserName == ''||formData.value.carUserName == undefined){
     formData.value.carUserName = user.nickname
   }
+  if (formData.value.deptName == ''||formData.value.deptName == undefined){
+    formData.value.deptName = user.dept.name
+  }
   if (formData.value.dept != undefined){
-    deptInfo.value = await getDept(formData.value.dept)
+    deptInfo.value =  formData.value.deptName
   }
   if (formData.value.carUserName != undefined){
     userInfo.value = formData.value.carUserName

src/views/Home/clgl/ClglDetail.vue

@@ -16,7 +16,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="部门" prop="dept">
-            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo }} </div>
             <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
           </el-form-item>
         </el-col>
@@ -115,7 +115,6 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ClglApi } from '@/api/home/clgl'
 import {propTypes} from "@/utils/propTypes";
 import {getUserProfile} from "@/api/system/user/profile";
-import {DeptVO, getDept} from "@/api/system/dept";
 
 /** 车辆管理 表单 */
 defineOptions({ name: 'ClglDetail' })
@@ -127,13 +126,14 @@ defineOptions({ name: 'ClglDetail' })
 // const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 // const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const deptInfo = ref({} as DeptVO ) // 部门信息
+const deptInfo = ref('') // 部门信息
 const userInfo = ref('') // 用户名字
 const formData = ref({
   id: undefined,
   carUserId: undefined,
-  carUserName: '',
+  carUserName: undefined,
   dept: undefined,
+  deptName: undefined,
   carType: undefined,
   carDriver: undefined,
   carStart: undefined,
@@ -147,8 +147,8 @@ const formData = ref({
   carRemark: undefined,
 })
 
+//流程
 const { query } = useRoute() // 查询参数
-
 const props = defineProps({
   id: propTypes.number.def(undefined)
 })
@@ -176,8 +176,11 @@ const getUserInfo = async () => {
   if (formData.value.carUserName == ''||formData.value.carUserName == undefined){
     formData.value.carUserName = user.nickname
   }
+  if (formData.value.deptName == ''||formData.value.deptName == undefined){
+    formData.value.deptName = user.dept.name
+  }
   if (formData.value.dept != undefined){
-    deptInfo.value = await getDept(formData.value.dept)
+    deptInfo.value =  formData.value.deptName
   }
   if (formData.value.carUserName != undefined){
     userInfo.value = formData.value.carUserName

src/views/Home/clgl/index.vue

@@ -75,9 +75,10 @@
   <!-- 列表 -->
   <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="申请人id" align="center" prop="carUserId" />
+      <el-table-column width="70" label="序号" align="center" type="index" />
+<!--      <el-table-column label="申请人id" align="center" prop="carUserId" />-->
       <el-table-column label="申请人" align="center" prop="carUserName" />
+      <el-table-column label="部门" align="center" prop="deptName" />
       <el-table-column label="用车类型" align="center" prop="carType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
@@ -124,7 +125,7 @@
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
+            v-hasPermi="['home:clgl:update']"
             link
             type="primary"
             @click="handleDetail(scope.row)"
@@ -132,7 +133,7 @@
             详情
           </el-button>
           <el-button
-            v-hasPermi="['bpm:oa-leave:query']"
+            v-hasPermi="['home:clgl:update']"
             link
             type="danger"
             @click="handleProcessDetail(scope.row)"
@@ -180,6 +181,7 @@ const queryParams = reactive({
   carUserId: undefined,
   carUserName: undefined,
   dept: undefined,
+  deptName: undefined,
   carType: undefined,
   carDriver: undefined,
   carStart: null,
@@ -195,7 +197,7 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
-/** 添加操作 */
+/**发起操作 */
 const handleCreate = () => {
   router.push({ name: 'ClglCreate' })
 }
@@ -208,7 +210,6 @@ const handleDetail = (row: LeaveApi.LeaveVO) => {
     }
   })
 }
-
 /** 审批进度 */
 const handleProcessDetail = (row) => {
   router.push({