b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-07-27 17:19:36 +08:00
parent e50d1b8fda
commit 1c7532e0de
132 changed files with 7066 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/views/transportCapacity/driver.vue
View File

@@ -114,7 +114,7 @@
ref="driverForm"
:model="driverForm"
:rules="formRules"
label-position="top"
label-position="right"
:disabled="readonly"
class="driver-form"
>
@@ -156,13 +156,22 @@
<el-col :span="4">
<el-form-item label="学历" prop="education">
<el-select v-model="driverForm.education" clearable filterable>
<el-option v-for="item in educationOptions" :key="item" :label="item" :value="item" />
<el-option
v-for="item in educationOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="住址" prop="addressRegion">
<el-input v-model="driverForm.addressRegion" maxlength="100" placeholder="省 / 市 / 区" />
<el-input
v-model="driverForm.addressRegion"
maxlength="100"
placeholder="省 / 市 / 区"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -223,8 +232,19 @@
<el-row :gutter="18">
<el-col :span="6">
<el-form-item label="准驾车型" prop="drivingType">
<el-select v-model="driverForm.drivingType" clearable filterable allow-create default-first-option>
<el-option v-for="item in drivingTypeOptions" :key="item" :label="item" :value="item" />
<el-select
v-model="driverForm.drivingType"
clearable
filterable
allow-create
default-first-option
>
<el-option
v-for="item in drivingTypeOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
</el-col>
@@ -254,7 +274,11 @@
</el-col>
<el-col :span="4">
<el-form-item label="长期有效" prop="drivingLicenseLongTerm">
<el-checkbox v-model="driverForm.drivingLicenseLongTerm" :true-label="1" :false-label="0">
<el-checkbox
v-model="driverForm.drivingLicenseLongTerm"
:true-label="1"
:false-label="0"
>
是
</el-checkbox>
</el-form-item>
@@ -287,7 +311,13 @@
<el-row :gutter="18">
<el-col :span="6">
<el-form-item label="从业资格证类型" prop="qualificationType">
<el-select v-model="driverForm.qualificationType" clearable filterable allow-create default-first-option>
<el-select
v-model="driverForm.qualificationType"
clearable
filterable
allow-create
default-first-option
>
<el-option label="道路运输从业资格证" value="道路运输从业资格证" />
<el-option label="危险货物运输从业资格证" value="危险货物运输从业资格证" />
</el-select>
@@ -295,7 +325,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="资格证号" prop="qualificationNo">
<el-input v-model="driverForm.qualificationNo" maxlength="50" placeholder="默认身份证号" />
<el-input
v-model="driverForm.qualificationNo"
maxlength="50"
placeholder="默认身份证号"
/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -310,7 +344,11 @@
</el-col>
<el-col :span="4">
<el-form-item label="长期有效" prop="qualificationLongTerm">
<el-checkbox v-model="driverForm.qualificationLongTerm" :true-label="1" :false-label="0">
<el-checkbox
v-model="driverForm.qualificationLongTerm"
:true-label="1"
:false-label="0"
>
是
</el-checkbox>
</el-form-item>
@@ -366,19 +404,42 @@
</el-col>
<el-col :span="6">
<el-form-item label="与联系人关系" prop="contactRelation">
<el-select v-model="driverForm.contactRelation" clearable filterable allow-create default-first-option>
<el-option v-for="item in relationOptions" :key="item" :label="item" :value="item" />
<el-select
v-model="driverForm.contactRelation"
clearable
filterable
allow-create
default-first-option
>
<el-option
v-for="item in relationOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属组织" prop="organizationName">
<el-input v-model="driverForm.organizationName" maxlength="50" />
<el-cascader
v-model="driverForm.organizationName"
:options="deptCascaderOptions"
:props="deptCascaderProps"
clearable
filterable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="driverForm.remark" type="textarea" maxlength="200" show-word-limit />
<el-input
v-model="driverForm.remark"
type="textarea"
maxlength="200"
show-word-limit
/>
</el-form-item>
</el-col>
</el-row>
@@ -397,7 +458,15 @@
import { mapGetters } from 'vuex';
import NProgress from 'nprogress';
import { option } from '@/option/transportCapacity/driver';
import { getList, getDetail, submit, remove, changeStatus, getExpiryStat } from '@/api/transportCapacity/driver';
import {
getList,
getDetail,
submit,
remove,
changeStatus,
getExpiryStat,
} from '@/api/transportCapacity/driver';
import { getDeptTree } from '@/api/system/dept';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
@@ -528,16 +597,30 @@ export default {
educationOptions: ['初中', '高中', '中专', '大专', '本科', '硕士及以上'],
drivingTypeOptions: ['A1', 'A2', 'A3', 'B1', 'B2', 'C1', 'C2'],
relationOptions: ['父母', '配偶', '子女', '兄弟姐妹', '朋友', '同事'],
deptCascaderOptions: [],
deptCascaderProps: {
label: 'label',
value: 'value',
children: 'children',
checkStrictly: true,
emitPath: false,
},
formRules: {
driverName: [{ required: true, message: '请输入司机姓名', trigger: 'blur' }],
idCardNo: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
drivingType: [{ required: true, message: '请选择准驾车型', trigger: 'change' }],
drivingLicenseEndDate: [{ validator: this.validateDrivingLicenseEndDate, trigger: 'change' }],
drivingLicenseEndDate: [
{ validator: this.validateDrivingLicenseEndDate, trigger: 'change' },
],
driverType: [{ required: true, message: '请选择司机类型', trigger: 'change' }],
mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
emergencyContactName: [{ required: true, message: '请输入紧急联系人姓名', trigger: 'blur' }],
emergencyContactMobile: [{ required: true, message: '请输入紧急联系人手机号', trigger: 'blur' }],
organizationName: [{ required: true, message: '请输入所属组织', trigger: 'blur' }],
emergencyContactName: [
{ required: true, message: '请输入紧急联系人姓名', trigger: 'blur' },
],
emergencyContactMobile: [
{ required: true, message: '请输入紧急联系人手机号', trigger: 'blur' },
],
organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
idCardFront: [{ required: true, message: '请上传身份证正面照', trigger: 'change' }],
idCardBack: [{ required: true, message: '请上传身份证反面照', trigger: 'change' }],
drivingLicenseFront: [{ required: true, message: '请上传驾驶证主页', trigger: 'change' }],
@@ -567,10 +650,33 @@ export default {
return this.driverForm.id ? '修改司机' : '新增司机';
},
},
created() {
this.initDeptTree();
},
methods: {
hasPermission(code) {
return this.isAdmin || this.permission?.[code] === true;
},
initDeptTree() {
getDeptTree(this.userInfo.tenantId).then(res => {
this.deptCascaderOptions = this.formatDeptCascaderOptions(res.data.data || []);
const column = this.findColumn(this.option.column, 'organizationName');
column.dicData = this.deptCascaderOptions;
});
},
formatDeptCascaderOptions(tree = []) {
return tree.map(item => {
const label = item.title || item.deptName || item.name;
const option = {
label,
value: label,
};
if (item.children && item.children.length) {
option.children = this.formatDeptCascaderOptions(item.children);
}
return option;
});
},
validateDrivingLicenseEndDate(rule, value, callback) {
if (this.driverForm.drivingLicenseLongTerm !== 1 && !value) {
callback(new Error('请选择驾驶证有效期止'));
@@ -720,6 +826,9 @@ export default {
...params,
...this.searchForm,
};
if (Array.isArray(query.organizationName)) {
query.organizationName = query.organizationName[query.organizationName.length - 1] || '';
}
if (includeExpire && this.query.expireStatus) {
query.expireStatus = this.query.expireStatus;
}