yudao-team/oa-ui
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试后修改

Browse Source
This commit is contained in:
xaol 2025-02-18 16:12:47 +08:00
parent b6b4482323
commit 42cf07b10d
9 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/dict.ts
View File

@ -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',

6
src/views/Home/clnr/carinfo/SelectCarForm.vue
View File

@ -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: [],

2
src/views/Home/clnr/carinfo/index.vue
View File

@ -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" />-->

8
src/views/Home/clnr/clgl/ClglCreate.vue
View File

@ -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>

8
src/views/Home/clnr/clgl/ClglDetail.vue
View File

@ -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>

6
src/views/Home/clnr/clgl/index.vue
View File

@ -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' })

32
src/views/Home/clnr/driver/DriverForm.vue
View File

@ -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>

15
src/views/Home/clnr/driver/SelectDriverForm.vue
View File

@ -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,

12
src/views/Home/clnr/driver/index.vue
View File

@ -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-->