From c68ead4a05478d47e793ff3d673b9ba6d518d778 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/clgl/ClglCreate.vue | 12 ++++++------
 src/views/Home/clgl/ClglDetail.vue |  8 ++++----
 src/views/Home/clgl/index.vue      | 22 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue
index d75f087..9ade579 100644
--- a/src/views/Home/clgl/ClglCreate.vue
+++ b/src/views/Home/clgl/ClglCreate.vue
@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="用车状态" prop="carStatus">
+      <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)"
@@ -56,7 +56,7 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用车类型" prop="carType">
+          <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)"
@@ -146,12 +146,12 @@ const formData = ref({
   carRemark: undefined,
 })
 const formRules = reactive({
-  carType: [{ required: true, message: '用车类型不能为空', trigger: 'change' }],
+  carType: [{ required: true, message: '车辆类型不能为空', trigger: 'change' }],
   carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }],
-  carStart: [{ required: true, message: '用车开始时间不能为空', trigger: 'blur' }],
-  carEnd: [{ 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' }],
+  carStatus: [{ required: true, message: '车辆状态不能为空', trigger: 'blur' }],
   carReason: [{ required: true, message: '用车原因不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
diff --git a/src/views/Home/clgl/ClglDetail.vue b/src/views/Home/clgl/ClglDetail.vue
index e95365f..0b4d389 100644
--- a/src/views/Home/clgl/ClglDetail.vue
+++ b/src/views/Home/clgl/ClglDetail.vue
@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="用车状态" prop="carStatus">
+      <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)"
@@ -35,7 +35,7 @@
       </el-form-item>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用车开始时间" prop="carStart">
+          <el-form-item label="开始时间" prop="carStart">
             <el-date-picker
               v-model="formData.carStart"
               type="date"
@@ -46,7 +46,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="用车结束时间" prop="carEnd">
+          <el-form-item label="结束时间" prop="carEnd">
             <el-date-picker
               v-model="formData.carEnd"
               type="date"
@@ -59,7 +59,7 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="用车类型" prop="carType">
+          <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)"
diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue
index aa482ab..d642b18 100644
--- a/src/views/Home/clgl/index.vue
+++ b/src/views/Home/clgl/index.vue
@@ -50,6 +50,15 @@
       <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="handleCreate()"
+          :loading="exportLoading"
+          v-hasPermi="['home:clgl:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 发起流程
+        </el-button>
         <el-button
           type="success"
           plain
@@ -59,15 +68,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>
@@ -79,7 +79,7 @@
 <!--      <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">
+      <el-table-column label="车辆类型" align="center" prop="carType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
         </template>
@@ -103,7 +103,7 @@
       <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">
+      <el-table-column label="车辆状态" align="center" prop="carStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CLGL_CAR_STATUS" :value="scope.row.carStatus" />
         </template>