From 42cf07b10d7ed907f9625a73e6344d8dcf114593 Mon Sep 17 00:00:00 2001
From: xaol <3182401657@qq.com>
Date: Tue, 18 Feb 2025 16:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=8E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  2 ++
 src/views/Home/clnr/carinfo/SelectCarForm.vue |  6 ++--
 src/views/Home/clnr/carinfo/index.vue         |  2 +-
 src/views/Home/clnr/clgl/ClglCreate.vue       |  8 ++---
 src/views/Home/clnr/clgl/ClglDetail.vue       |  8 ++---
 src/views/Home/clnr/clgl/index.vue            |  6 ++--
 src/views/Home/clnr/driver/DriverForm.vue     | 32 +++++++++++++++----
 .../Home/clnr/driver/SelectDriverForm.vue     | 15 +++++++--
 src/views/Home/clnr/driver/index.vue          | 12 +++++--
 9 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index bd374be..ec0f8cb 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -122,6 +122,8 @@ export enum DICT_TYPE {
   HOME_CONTENT = 'home_content',
   CLGL_CAR_STATUS = 'clgl_car_status',
   CLGL_CAR_TYPE = 'clgl_car_type',
+  CLGL_LICENSE_TYPE = 'clgl_license_type',
+  CLGL_HEALTH_STATUS = 'clgl_health_status',
   BGYP_USAGE_NAME = 'bgyp_usage_name',
   BGYP_UNIT = 'bgyp_unit',
   JBGL_TYPE = 'jbgl_type',
diff --git a/src/views/Home/clnr/carinfo/SelectCarForm.vue b/src/views/Home/clnr/carinfo/SelectCarForm.vue
index e446a97..2135f25 100644
--- a/src/views/Home/clnr/carinfo/SelectCarForm.vue
+++ b/src/views/Home/clnr/carinfo/SelectCarForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog style="width: 80%" :title="dialogTitle" v-model="dialogVisible">
+  <Dialog style="width: 900px" :title="dialogTitle" v-model="dialogVisible">
     <!-- 搜索工作栏 -->
     <ContentWrap>
       <el-form
@@ -75,7 +75,7 @@
           align="center"
           prop="purchaseDate"
           :formatter="dateFormatter2"
-          width="100px"
+          width="110px"
         />
         <el-table-column label="购买金额(元)" align="center" prop="purchasePrice" />
       </el-table>
@@ -117,7 +117,7 @@ const queryParams = reactive({
   licensePlate: undefined,
   model: undefined,
   brand: undefined,
-  carStatus: undefined,
+  carStatus: 0, // 只获取可用状态
   carType: undefined,
   color: undefined,
   purchaseDate: [],
diff --git a/src/views/Home/clnr/carinfo/index.vue b/src/views/Home/clnr/carinfo/index.vue
index 162b081..81fcb1f 100644
--- a/src/views/Home/clnr/carinfo/index.vue
+++ b/src/views/Home/clnr/carinfo/index.vue
@@ -171,7 +171,7 @@
         align="center"
         prop="purchaseDate"
         :formatter="dateFormatter2"
-        width="100px"
+        width="110px"
       />
       <el-table-column label="购买金额(元)" align="center" prop="purchasePrice" />
 <!--      <el-table-column label="备注" align="center" prop="remark" />-->
diff --git a/src/views/Home/clnr/clgl/ClglCreate.vue b/src/views/Home/clnr/clgl/ClglCreate.vue
index 6d0a7f6..75efbbb 100644
--- a/src/views/Home/clnr/clgl/ClglCreate.vue
+++ b/src/views/Home/clnr/clgl/ClglCreate.vue
@@ -122,7 +122,7 @@
           <el-form-item label="开始时间" prop="carStart">
             <el-date-picker
               v-model="formData.carStart"
-              type="date"
+              type="datetime"
               value-format="x"
               placeholder="选择用车开始时间"
               @change="validateDate"
@@ -133,7 +133,7 @@
           <el-form-item label="结束时间" prop="carEnd">
             <el-date-picker
               v-model="formData.carEnd"
-              type="date"
+              type="datetime"
               value-format="x"
               placeholder="选择用车结束时间"
               @change="validateDate"
@@ -148,8 +148,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="总里程" prop="carMileage">
-            <el-input v-model="formData.carMileage" placeholder="请输入总里程" />
+          <el-form-item label="总里程（千米）" prop="carMileage">
+            <el-input v-model="formData.carMileage" placeholder="请输入总里程（千米）" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/Home/clnr/clgl/ClglDetail.vue b/src/views/Home/clnr/clgl/ClglDetail.vue
index bca4f04..237bd5f 100644
--- a/src/views/Home/clnr/clgl/ClglDetail.vue
+++ b/src/views/Home/clnr/clgl/ClglDetail.vue
@@ -104,7 +104,7 @@
           <el-form-item label="开始时间" prop="carStart">
             <el-date-picker
               v-model="formData.carStart"
-              type="date"
+              type="datetime"
               value-format="x"
               placeholder="选择用车开始时间"
               :disabled="!isEditable('carStart')"
@@ -115,7 +115,7 @@
           <el-form-item label="结束时间" prop="carEnd">
             <el-date-picker
               v-model="formData.carEnd"
-              type="date"
+              type="datetime"
               value-format="x"
               placeholder="选择用车结束时间"
               :disabled="!isEditable('carEnd')"
@@ -130,8 +130,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="总里程" prop="carMileage">
-            <el-input v-model="formData.carMileage" placeholder="请输入总里程" :disabled="!isEditable('carMileage')" />
+          <el-form-item label="总里程（千米）" prop="carMileage">
+            <el-input v-model="formData.carMileage" placeholder="请输入总里程（千米）" :disabled="!isEditable('carMileage')" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/Home/clnr/clgl/index.vue b/src/views/Home/clnr/clgl/index.vue
index b9ba439..1617624 100644
--- a/src/views/Home/clnr/clgl/index.vue
+++ b/src/views/Home/clnr/clgl/index.vue
@@ -89,14 +89,14 @@
         label="用车开始时间"
         align="center"
         prop="carStart"
-        :formatter="dateFormatter2"
+        :formatter="dateFormatter"
         width="180px"
       />
       <el-table-column
         label="用车结束时间"
         align="center"
         prop="carEnd"
-        :formatter="dateFormatter2"
+        :formatter="dateFormatter"
         width="180px"
       />
       <el-table-column label="目的地" align="center" prop="carAddress" />
@@ -162,7 +162,7 @@ import download from '@/utils/download'
 import { ClglApi, ClglVO } from '@/api/home/clgl'
 import ClglForm from './ClglForm.vue'
 import * as LeaveApi from '@/api/bpm/leave'
-import {dateFormatter2} from "@/utils/formatTime";
+import {dateFormatter} from "@/utils/formatTime";
 
 /** 车辆管理 列表 */
 defineOptions({ name: 'Clgl' })
diff --git a/src/views/Home/clnr/driver/DriverForm.vue b/src/views/Home/clnr/driver/DriverForm.vue
index 4c4b40b..fcbba34 100644
--- a/src/views/Home/clnr/driver/DriverForm.vue
+++ b/src/views/Home/clnr/driver/DriverForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="120px"
       v-loading="formLoading"
     >
       <el-form-item label="驾驶员名字" prop="name">
@@ -53,18 +53,36 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="驾驶证类型" prop="licenseType">
-            <el-input v-model="formData.licenseType" placeholder="请输入驾驶证类型" />
+            <el-select v-model="formData.licenseType" placeholder="请选择驾驶证类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_LICENSE_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="experience">
-            <el-input v-model="formData.experience" placeholder="请输入驾驶经验" />
+          <el-form-item label="驾驶经验（年）" prop="experience">
+            <el-input v-model="formData.experience" placeholder="请输入驾驶经验（年）" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="健康状态" prop="healthStatus">
+            <el-select v-model="formData.healthStatus" placeholder="请选择健康状态">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_HEALTH_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="健康状态" prop="healthStatus">
-        <el-input autosize type="textarea" v-model="formData.healthStatus" placeholder="请输入健康状态" />
-      </el-form-item>
       <el-form-item label="备注" prop="remarks">
         <el-input autosize v-model="formData.remarks" type="textarea" placeholder="请输入备注" />
       </el-form-item>
diff --git a/src/views/Home/clnr/driver/SelectDriverForm.vue b/src/views/Home/clnr/driver/SelectDriverForm.vue
index ea655e9..96d9686 100644
--- a/src/views/Home/clnr/driver/SelectDriverForm.vue
+++ b/src/views/Home/clnr/driver/SelectDriverForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 80%">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 900px">
     <!-- 搜索工作栏 -->
     <ContentWrap>
       <el-form
@@ -81,7 +81,16 @@
           </template>
         </el-table-column>
         <el-table-column label="联系方式" align="center" prop="contactInfo" />
-        <el-table-column label="驾驶证类型" align="center" prop="licenseType" />
+        <el-table-column label="驾驶证类型" align="center" prop="licenseType" >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.CLGL_LICENSE_TYPE" :value="scope.row.licenseType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="健康状态" align="center" prop="healthStatus" >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.CLGL_HEALTH_STATUS" :value="scope.row.healthStatus" />
+          </template>
+        </el-table-column>
       </el-table>
       <!-- 分页 -->
       <Pagination
@@ -120,7 +129,7 @@ const queryParams = reactive({
   id: undefined,
   name: undefined,
   gender: undefined,
-  driverStatus: undefined,
+  driverStatus: 0, // 只获取可用状态
   contactInfo: undefined,
   license: undefined,
   licenseType: undefined,
diff --git a/src/views/Home/clnr/driver/index.vue b/src/views/Home/clnr/driver/index.vue
index 32a7793..974cafe 100644
--- a/src/views/Home/clnr/driver/index.vue
+++ b/src/views/Home/clnr/driver/index.vue
@@ -106,8 +106,16 @@
       </el-table-column>
       <el-table-column label="联系方式" align="center" prop="contactInfo" />
 <!--      <el-table-column label="驾驶证号" align="center" prop="license" />-->
-      <el-table-column label="驾驶证类型" align="center" prop="licenseType" />
-<!--      <el-table-column label="健康状态" align="center" prop="healthStatus" />-->
+      <el-table-column label="驾驶证类型" align="center" prop="licenseType" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CLGL_LICENSE_TYPE" :value="scope.row.licenseType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="健康状态" align="center" prop="healthStatus" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CLGL_HEALTH_STATUS" :value="scope.row.healthStatus" />
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="驾驶经验" align="center" prop="experience" />-->
 <!--      <el-table-column label="备注" align="center" prop="remarks" />-->
 <!--      <el-table-column-->