From 6be4bf67393d186c15789945168daf68d26cd3a2 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Tue, 29 Oct 2024 19:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/clgl/index.ts         |  3 ++-
 src/views/Home/clgl/ClglCreate.vue | 14 +++++++++-----
 src/views/Home/clgl/ClglDetail.vue | 26 +++++++++++++++-----------
 src/views/Home/clgl/index.vue      | 30 ++++--------------------------
 4 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/src/api/home/clgl/index.ts b/src/api/home/clgl/index.ts
index e1ef0de..b9fe9d5 100644
--- a/src/api/home/clgl/index.ts
+++ b/src/api/home/clgl/index.ts
@@ -3,7 +3,8 @@ import request from '@/config/axios'
 // 车辆管理 VO
 export interface ClglVO {
   id: number // id
-  carUser: number // 申请人
+  carUserId: number // 申请人
+  carUserName: string // 申请人
   dept: number // 部门
   carType: number // 用车类型
   carDriver: string // 驾驶员
diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue
index c43f864..e31cea0 100644
--- a/src/views/Home/clgl/ClglCreate.vue
+++ b/src/views/Home/clgl/ClglCreate.vue
@@ -130,7 +130,8 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 // const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  carUser: undefined,
+  carUserId: undefined,
+  carUserName: undefined,
   dept: undefined,
   carType: undefined,
   carDriver: undefined,
@@ -202,14 +203,17 @@ const getUserInfo = async () => {
   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.carUserId == ''||formData.value.carUserId == undefined){
+    formData.value.carUserId = user.id
+  }
+  if (formData.value.carUserName == ''||formData.value.carUserName == undefined){
+    formData.value.carUserName = user.nickname
   }
   if (formData.value.dept != undefined){
     deptInfo.value = await getDept(formData.value.dept)
   }
-  if (user != undefined){
-    userInfo.value = user.nickname
+  if (formData.value.carUserName != undefined){
+    userInfo.value = formData.value.carUserName
   }
 }
 /** 初始化 */
diff --git a/src/views/Home/clgl/ClglDetail.vue b/src/views/Home/clgl/ClglDetail.vue
index f6e47f9..b125151 100644
--- a/src/views/Home/clgl/ClglDetail.vue
+++ b/src/views/Home/clgl/ClglDetail.vue
@@ -120,18 +120,19 @@ import {DeptVO, getDept} from "@/api/system/dept";
 /** 车辆管理 表单 */
 defineOptions({ name: 'ClglDetail' })
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
+// 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 formType = ref('') // 表单的类型：create - 新增；update - 修改
 const deptInfo = ref({} as DeptVO ) // 部门信息
 const userInfo = ref('') // 用户名字
 const formData = ref({
   id: undefined,
-  carUser: undefined,
+  carUserId: undefined,
+  carUserName: '',
   dept: undefined,
   carType: undefined,
   carDriver: undefined,
@@ -169,14 +170,17 @@ const getUserInfo = async () => {
   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.carUserId == ''||formData.value.carUserId == undefined){
+    formData.value.carUserId = user.id
+  }
+  if (formData.value.carUserName == ''||formData.value.carUserName == undefined){
+    formData.value.carUserName = user.nickname
   }
   if (formData.value.dept != undefined){
     deptInfo.value = await getDept(formData.value.dept)
   }
-  if (user != undefined){
-    userInfo.value = user.nickname
+  if (formData.value.carUserName != undefined){
+    userInfo.value = formData.value.carUserName
   }
 }
 /** 初始化 **/
diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue
index a55c867..d582e9b 100644
--- a/src/views/Home/clgl/index.vue
+++ b/src/views/Home/clgl/index.vue
@@ -76,11 +76,8 @@
   <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" >-->
-<!--        <template #default="scope">-->
-<!--          {{getUserNameById(scope.row.carUser)}}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="申请人id" align="center" prop="carUserId" />
+      <el-table-column label="申请人" align="center" prop="carUserName" />
       <el-table-column label="用车类型" align="center" prop="carType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
@@ -165,7 +162,6 @@ 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";
 
 /** 车辆管理 列表 */
@@ -181,7 +177,8 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   id: undefined,
-  carUser: undefined,
+  carUserId: undefined,
+  carUserName: undefined,
   dept: undefined,
   carType: undefined,
   carDriver: undefined,
@@ -229,25 +226,6 @@ 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