车辆管理

src/api/home/clgl/index.ts

@@ -6,7 +6,7 @@ export interface ClglVO {
   carUser: number // 申请人
   dept: number // 部门
   carType: number // 用车类型
-  carDriver: number // 驾驶员
+  carDriver: string // 驾驶员
   carStart: Date // 用车开始时间
   carEnd: Date // 用车结束时间
   carAddress: string // 目的地

src/router/modules/remaining.ts

@@ -684,7 +684,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
           noCache: true,
           hidden: true,
           canTo: true,
-          title: '发起车辆管理流程',
+          title: '查看车辆管理流程',
           activeMenu: '/Home/clgl/Clglflow'
         }
       },

src/views/Home/clgl/ClglCreate.vue

@@ -7,53 +7,20 @@
       label-width="100px"
       v-loading="formLoading"
     >
+      <el-row>
+        <el-col :span="12">
           <el-form-item label="申请人" prop="carUser">
-        <el-input v-model="formData.carUser" placeholder="请输入申请人" />
+            <div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
+            <div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
           </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="部门" prop="dept">
-        <el-input v-model="formData.dept" placeholder="请输入部门" />
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
-      </el-form-item>
+            <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
-      <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-col>
+      </el-row>
       <el-form-item label="用车状态" prop="carStatus">
         <el-radio-group v-model="formData.carStatus">
           <el-radio
@@ -65,6 +32,71 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="carStart">
+            <el-date-picker
+              v-model="formData.carStart"
+              type="date"
+              value-format="x"
+              placeholder="选择用车开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="carEnd">
+            <el-date-picker
+              v-model="formData.carEnd"
+              type="date"
+              value-format="x"
+              placeholder="选择用车结束时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <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-col>
+        <el-col :span="12">
+          <el-form-item label="驾驶员" prop="carDriver">
+            <el-input v-model="formData.carDriver" placeholder="请输入驾驶员" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="目的地" prop="carAddress">
+            <el-input v-model="formData.carAddress" placeholder="请输入目的地" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆信息" prop="carInfo">
+            <el-input v-model="formData.carInfo" placeholder="请输入车辆信息" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="车辆开始里程" prop="carStartMileage">
+            <el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆结束里程" prop="carEndMileage">
+            <el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="用车原因" prop="carReason">
         <el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" />
       </el-form-item>
@@ -81,6 +113,8 @@ 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"
+import {getUserProfile} from "@/api/system/user/profile";
+import {DeptVO, getDept} from "@/api/system/dept";
 
 
 /** 车辆管理 表单 */
@@ -111,8 +145,6 @@ const formData = ref({
   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' }],
@@ -130,6 +162,8 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
 const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
 const userList = ref<any[]>([]) // 用户列表
+const deptInfo = ref({} as DeptVO ) // 部门信息
+const userInfo = ref('') // 用户名字
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -161,8 +195,26 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
+
+//获取用户部门
+const getUserInfo = async () => {
+  const user = await getUserProfile();
+  if (formData.value.dept == ''||formData.value.dept == undefined){
+    formData.value.dept = user.dept.id
+  }
+  if (formData.value.carUser == ''||formData.value.carUser == undefined){
+    formData.value.carUser = user.id
+  }
+  if (formData.value.dept != undefined){
+    deptInfo.value = await getDept(formData.value.dept)
+  }
+  if (user != undefined){
+    userInfo.value = user.nickname
+  }
+}
 /** 初始化 */
 onMounted(async () => {
+  await getUserInfo()
   const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
     undefined,
     processDefineKey

src/views/Home/clgl/ClglDetail.vue

@@ -7,56 +7,20 @@
       label-width="100px"
       v-loading="formLoading"
     >
+      <el-row>
+        <el-col :span="12">
           <el-form-item label="申请人" prop="carUser">
-        <el-input v-model="formData.carUser" placeholder="请输入申请人" disabled />
+            <div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
+            <div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
           </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="部门" prop="dept">
-        <el-input v-model="formData.dept" placeholder="请输入部门" disabled/>
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
-      </el-form-item>
+            <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
-      <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-col>
+      </el-row>
       <el-form-item label="用车状态" prop="carStatus">
         <el-radio-group v-model="formData.carStatus" disabled>
           <el-radio
@@ -69,6 +33,74 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用车开始时间" prop="carStart">
+            <el-date-picker
+              v-model="formData.carStart"
+              type="date"
+              value-format="x"
+              placeholder="选择用车开始时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用车结束时间" prop="carEnd">
+            <el-date-picker
+              v-model="formData.carEnd"
+              type="date"
+              value-format="x"
+              placeholder="选择用车结束时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <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-col>
+        <el-col :span="12">
+          <el-form-item label="驾驶员" prop="carDriver">
+            <el-input v-model="formData.carDriver" placeholder="请输入驾驶员" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="目的地" prop="carAddress">
+            <el-input v-model="formData.carAddress" placeholder="请输入目的地"  disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆信息" prop="carInfo">
+            <el-input v-model="formData.carInfo" placeholder="请输入车辆信息" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="车辆开始里程" prop="carStartMileage">
+            <el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆结束里程" prop="carEndMileage">
+            <el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="用车原因" prop="carReason">
         <el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" disabled />
       </el-form-item>
@@ -82,6 +114,8 @@
 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' })
@@ -93,6 +127,8 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deptInfo = ref({} as DeptVO ) // 部门信息
+const userInfo = ref('') // 用户名字
 const formData = ref({
   id: undefined,
   carUser: undefined,
@@ -126,8 +162,26 @@ const getInfo = async () => {
     detailLoading.value = false
   }
 }
+
+//获取用户部门
+const getUserInfo = async () => {
+  const user = await getUserProfile();
+  if (formData.value.dept == ''||formData.value.dept == undefined){
+    formData.value.dept = user.dept.id
+  }
+  if (formData.value.carUser == ''||formData.value.carUser == undefined){
+    formData.value.carUser = user.id
+  }
+  if (formData.value.dept != undefined){
+    deptInfo.value = await getDept(formData.value.dept)
+  }
+  if (user != undefined){
+    userInfo.value = user.nickname
+  }
+}
 /** 初始化 **/
 onMounted(() => {
+  getUserInfo()
   getInfo()
 })
 const formRules = reactive({
@@ -135,66 +189,6 @@ const formRules = reactive({
 })
 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

@@ -76,8 +76,11 @@
   <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="carUser" >-->
-      <el-table-column label="部门" align="center" prop="dept" />
+<!--        <template #default="scope">-->
+<!--          {{getUserNameById(scope.row.carUser)}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="用车类型" align="center" prop="carType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
@@ -89,36 +92,36 @@
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.flowStatus" />
         </template>
       </el-table-column>
-<!--      <el-table-column-->
+      <el-table-column
-<!--        label="用车开始时间"-->
+        label="用车开始时间"
-<!--        align="center"-->
+        align="center"
-<!--        prop="carStart"-->
+        prop="carStart"
-<!--        :formatter="dateFormatter"-->
+        :formatter="dateFormatter2"
-<!--        width="180px"-->
+        width="180px"
-<!--      />-->
+      />
-<!--      <el-table-column-->
+      <el-table-column
-<!--        label="用车结束时间"-->
+        label="用车结束时间"
-<!--        align="center"-->
+        align="center"
-<!--        prop="carEnd"-->
+        prop="carEnd"
-<!--        :formatter="dateFormatter"-->
+        :formatter="dateFormatter2"
-<!--        width="180px"-->
+        width="180px"
-<!--      />-->
+      />
-<!--      <el-table-column label="目的地" align="center" prop="carAddress" />-->
+      <el-table-column label="目的地" align="center" prop="carAddress" />
-<!--      <el-table-column label="车辆信息" align="center" prop="carInfo" />-->
+      <el-table-column label="车辆信息" align="center" prop="carInfo" />
-<!--      <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />-->
+      <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />
-<!--      <el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />-->
+      <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-->
 <!--        label="创建时间"-->
 <!--        align="center"-->
 <!--        prop="createTime"-->
-<!--        :formatter="dateFormatter"-->
+<!--        :formatter="dateFormatter2"-->
 <!--        width="180px"-->
 <!--      />-->
       <el-table-column label="操作" align="center">
@@ -139,22 +142,6 @@
           >
             详情
           </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>
@@ -178,6 +165,8 @@ import { ClglApi, ClglVO } from '@/api/home/clgl'
 import ClglForm from './ClglForm.vue'
 import router from "@/router";
 import * as LeaveApi from '@/api/bpm/leave'
+import {getUser} from "@/api/system/user";
+import {dateFormatter2} from "@/utils/formatTime";
 
 /** 车辆管理 列表 */
 defineOptions({ name: 'Clgl' })
@@ -196,14 +185,14 @@ const queryParams = reactive({
   dept: undefined,
   carType: undefined,
   carDriver: undefined,
-  carStart: undefined,
+  carStart: null,
-  carStart: [],
+  // carStart: [],
   carEnd: undefined,
-  carEnd: [],
+  // carEnd: [],
   carAddress: undefined,
   carStartMileage: undefined,
   carEndMileage: undefined,
-  carStatus: undefined,
+  carStatus: null,
   createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
@@ -240,9 +229,25 @@ watch(
     getList()
   }
 )
-
+// const getUserNameById =  (id:number) => {
-
+//   if (id==undefined) return "未知用户"
-
+//   // const user =  getUser(id)
+//   // if (!user) {
+//   //   return '未知用户';
+//   // }
+//   // const name = user.nickname ? user.nickname : user.name || '未知用户';
+//   // console.log("name:  ",name)
+//   // return name
+//   return getUser(id).then(user => {
+//     if (!user) {
+//       return '未知用户';
+//     }
+//     // 选择昵称或真实姓名
+//     const name = user.nickname ? user.nickname : user.name || '未知用户';
+//     console.log("name:  ", name);
+//     return name;
+//   });
+// }
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -269,22 +274,6 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 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 () => {