王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 db81f631a4b1fca101d4e2081b6476b59940d154 1 个父辈 0110daac

舍弃同步方法，全部使用.then()的异步形式

内嵌 并排对比
正在显示 4 个修改的文件 包含 325 行增加 和 282 行删除
... ... @@ -210,7 +210,7 @@
:visible.sync="viewDialogVisible"
width="50%" @close="showDialogClosed">
<!-- 表单显示区域 :rules="dispatchFormRules" -->
<el-form :model="showForm" ref="showFormRef"
<el-form :model="showForm" ref="showFormRef"
style="margin-left:10%;margin-right:10%;background-color: #F5F7FA">
<div style="margin-left: 30px">
... ... @@ -221,10 +221,10 @@
<el-form-item label="联系方式：" prop="userMobile">
<el-input v-model="showForm.userMobile" style="width: 300px;" readonly></el-input>
</el-form-item>
<!-- <el-form-item label="车辆类型：" prop="vehicleType">-->
<!-- <el-input v-model="showForm.vehicleType" style="width: 300px;" readonly>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="车辆类型：" prop="vehicleType">-->
<!-- <el-input v-model="showForm.vehicleType" style="width: 300px;" readonly>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="车辆类型：" prop="vehicleType">
<el-select v-model="showForm.vehicleType" style="width:300px" readonly
placeholder="请选择车辆类型">
... ... @@ -567,105 +567,110 @@
/**
* 用户端，获取车辆调度记录
*/
async getDispatchNodeList() {
getDispatchNodeList() {
this.listLoading = true;
const {data: res} = await selectDispatchNoteList(this.queryInfo).catch(error => {
selectDispatchNoteList(this.queryInfo).then((response) => {
let res = response.data;
if (res.code !== '200') {
this.listLoading = false;
return this.$message.error('获取车辆调度列表失败');
}
// 获取车辆调度列表数据
this.DispatchNoteList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
this.listLoading = false;
this.$message.success('获取车辆调度列表,成功！');
}).catch(error => {
this.listLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
this.listLoading = false;
return this.$message.error('获取车辆调度列表失败');
}
// 获取车辆调度列表数据
this.DispatchNoteList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
this.listLoading = false;
this.$message.success('获取车辆调度列表,成功！');
},
/**
* 用户端，我要调度车辆，方法
*/
async dispatchVehicle() {
dispatchVehicle() {
this.dispatchLoading = true;
const {data: res} = await dispatch(this.dispatchForm).catch(error => {
dispatch(this.dispatchForm).then((response) => {
let res = response.data;
if (res.code !== '200') {
this.dispatchLoading = false;
return this.$message.error('车辆繁忙，请稍后重试');
}
//关闭加载
this.dispatchLoading = false;
this.$message.success('调度车辆成功！');
//调度成功，隐藏对话框
this.dispatchFormVisible = false;
/* 将调度车辆信息=>查询列表 */
// 用户名称
this.queryInfo.userName = this.dispatchForm.userName;
// 联系方式
this.queryInfo.userMobile = this.dispatchForm.userMobile;
// 调度业务类型
this.queryInfo.dispatchType = this.dispatchForm.dispatchType;
// 创建时间为当前时间（需留意）
this.queryInfo.gmtCreate = new Date();
//刷新车辆调度列表
this.getDispatchNodeList();
}).catch(error => {
this.dispatchLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
this.dispatchLoading = false;
return this.$message.error('车辆繁忙，请稍后重试');
}
//关闭加载
this.dispatchLoading = false;
this.$message.success('调度车辆成功！');
//调度成功，隐藏对话框
this.dispatchFormVisible = false;
/* 将调度车辆信息=>查询列表 */
// 用户名称
this.queryInfo.userName = this.dispatchForm.userName;
// 联系方式
this.queryInfo.userMobile = this.dispatchForm.userMobile;
// 调度业务类型
this.queryInfo.dispatchType = this.dispatchForm.dispatchType;
// 创建时间为当前时间（需留意）
this.queryInfo.gmtCreate = new Date();
//刷新车辆调度列表
this.getDispatchNodeList();
},
/**
* 用户端，取消调度车辆，方法
*/
async cancelDispatch(row) {
cancelDispatch(row) {
//弹框询问是否取消车辆调度
const confirmResult = await this.$confirm('此操作将取消该车辆的调度, 是否继续?', '警告', {
this.$confirm('此操作将取消该车辆的调度, 是否继续?', '警告', {
confirmButtonText: '确定取消调度',
cancelButtonText: '取消',
type: 'warning'
}
);
//如果点击确定，返回值是字符串confirm
//如果点击取消删除，返回值是字符串cancel
if (confirmResult !== 'confirm') {
return this.$message.info('已放弃,取消车辆调度');
}
//开启加载
this.cancelLoading = true;
const {data: res} = await cancel(row).catch(error => {
//关闭加载
this.cancelLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
this.cancelLoading = false;
return this.$message.error('取消车辆调度，失败！请人工介入');
}
//关闭加载
this.cancelLoading = false;
this.$message.success('取消调度车辆，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
).then(() => {
//开启加载
this.cancelLoading = true;
cancel(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
this.cancelLoading = false;
return this.$message.error('取消车辆调度，失败！请人工介入');
}
//关闭加载
this.cancelLoading = false;
this.$message.success('取消调度车辆，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
}).catch(error => {
//关闭加载
this.cancelLoading = false;
this.$message.error(error.toString());
});
}).catch();
},
/**
* 获取用户信息
*/
async getUserInfo(param) {
const {data: res} = await getUser(param).catch((error) => {
getUserInfo(param) {
getUser(param).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('请刷新一下界面！');
}
if (res.data.list.length === 0) {
return this.$message.error('请刷新一下界面！');
}
if (res.data.list[0].mobilephone === null || res.data.list[0].mobilephone === '') {
return this.$message.error('请填写您的手机号码');
}
this.queryInfo.userMobile = res.data.list[0].mobilephone;
this.dispatchForm.userMobile = res.data.list[0].mobilephone;
this.$message.success('欢迎使用，车辆调度系统！');
}).catch((error) => {
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('请刷新一下界面！');
}
if (res.data.list.length === 0) {
return this.$message.error('请刷新一下界面！');
}
if (res.data.list[0].mobilephone === null || res.data.list[0].mobilephone === '') {
return this.$message.error('请填写您的手机号码');
}
this.queryInfo.userMobile = res.data.list[0].mobilephone;
this.dispatchForm.userMobile = res.data.list[0].mobilephone;
this.$message.success('欢迎使用，车辆调度系统！');
},
},
mounted() {
... ...
... ... @@ -127,7 +127,7 @@
style="margin-left: 1px;">
<el-button type="warning" icon="el-icon-star-off" size="mini"
style="margin-top: 3px;"
:disabled="scope.row.status!=='4'"
:disabled="scope.row.status!=='4' || scope.row.beginTime !==null"
:loading="beginLoading"
@click="startDispatch(scope.$index,scope.row)">开始任务
</el-button>
... ... @@ -631,139 +631,149 @@
/**
* 管理员端，获取车辆调度记录列表
*/
async getDispatchNodeList() {
getDispatchNodeList() {
//开启加载
this.listLoading = true;
const {data: res} = await selectDispatchNoteList(this.queryInfo).catch(error => {
selectDispatchNoteList(this.queryInfo).then((response) => {
let res = response.data;
if (res.code !== '200') return this.$message.error('获取车辆调度列表失败');
// 获取车辆调度列表数据
this.DispatchNoteList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取车辆调度列表，成功');
}).catch(error => {
this.listLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') return this.$message.error('获取车辆调度列表失败');
// 获取车辆调度列表数据
this.DispatchNoteList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取车辆调度列表，成功');
},
/**
* 管理员端，添加车辆调度记录
*/
addDispatchNote() {
/*进行表单的预验证*/
this.$refs.addDispatchNodeFormRef.validate(async valid => {
this.$refs.addDispatchNodeFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预检验，发起添加车辆调度记录的网络请求
this.addLoading = true;
const {data: res} = await insertDispatchNote(this.addDispatchNodeForm).catch(error => {
insertDispatchNote(this.addDispatchNodeForm).then((response) => {
let res = response.data;
//添加调度记录信息,失败
if (res.code !== '200') return this.$message.error('添加调度记录信息，失败');
//添加调度记录信息，成功
this.$message.success('添加调度记录信息，成功');
//关闭加载
this.addLoading = false;
//隐藏对话框
this.addDispatchNodeFormVisible = false;
//刷新车辆调度记录列表
this.getDispatchNodeList();
}).catch(error => {
this.addLoading = false;
this.$message.error(error.toString());
});
//添加调度记录信息,失败
if (res.code !== '200') return this.$message.error('添加调度记录信息，失败');
//添加调度记录信息，成功
this.$message.success('添加调度记录信息，成功');
//关闭加载
this.addLoading = false;
//隐藏对话框
this.addDispatchNodeFormVisible = false;
//刷新车辆调度记录列表
this.getDispatchNodeList();
})
},
/**
* 管理员端，删除车辆调度记录
*/
async removeDispatchNode(index, row) {
removeDispatchNode(index, row) {
//弹框询问是否取消车辆调度
const confirmResult = await this.$confirm('此操作永久删除该车辆调度记录, 是否继续?', '警告', {
this.$confirm('此操作永久删除该车辆调度记录, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
);
if (confirmResult !== 'confirm') {
return this.$message.info('已取消删除');
}
//开启加载
this.delLoading = true;
const {data: res} = await deleteDispatchNote(row).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('删除车辆调度记录，失败');
}
this.$message.success('删除车辆调度记录，成功！');
this.delLoading = false;
//刷新车辆调度记录列表
this.getDispatchNodeList();
).then(() => {
//开启加载
this.delLoading = true;
deleteDispatchNote(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('删除车辆调度记录，失败');
}
this.$message.success('删除车辆调度记录，成功！');
this.delLoading = false;
//刷新车辆调度记录列表
this.getDispatchNodeList();
}).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
}).catch();
},
/**
* 管理员端，编辑车辆调度记录
*/
editDispatchNote() {
/*进行表单的预验证*/
this.$refs.editFormRef.validate(async valid => {
this.$refs.editFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预检验,开启加载
this.editLoading = true;
const {data: res} = await updateDispatchNote(this.editForm).catch(error => {
updateDispatchNote(this.editForm).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('修改车辆调度记录信息，失败');
}
this.$message.success('修改车辆调度记录信息，成功！');
//关闭加载
this.editLoading = false;
//关闭编辑车辆调度记录对话框
this.viewDialogVisible = false;
//刷新车辆调度列表
this.getDispatchNodeList();
}).catch(error => {
this.editLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('修改车辆调度记录信息，失败');
}
this.$message.success('修改车辆调度记录信息，成功！');
//关闭加载
this.editLoading = false;
//关闭编辑车辆调度记录对话框
this.viewDialogVisible = false;
//刷新车辆调度列表
this.getDispatchNodeList();
});
},
/**
* 管理员端，手动，开始调度任务
*/
async startDispatch(index, row) {
startDispatch(index, row) {
//开启加载
this.beginLoading = true;
const {data: res} = await startTask(row).catch(error => {
startTask(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('手动开始调度任务，失败');
}
//关闭加载
this.beginLoading = false;
this.$message.success('手动开始调度任务，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
}).catch(error => {
this.beginLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('手动开始调度任务，失败');
}
//关闭加载
this.beginLoading = false;
this.$message.success('手动开始调度任务，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
},
/**
* 管理员端，手动，完成调度任务
*/
async completeDispatch(index, row) {
completeDispatch(index, row) {
//开启加载
this.endLoading = true;
const {data: res} = await completeTask(row).catch(error => {
completeTask(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('手动完成调度任务，失败');
}
//关闭加载
this.endLoading = false;
this.$message.success('手动完成调度任务，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
}).catch(error => {
this.endLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('手动完成调度任务，失败');
}
//关闭加载
this.endLoading = false;
this.$message.success('手动完成调度任务，成功！');
//刷新车辆调度列表
this.getDispatchNodeList();
},
//监听，我要调度车辆，对话框的关闭事件
dispatchDialogClosed() {
... ...
... ... @@ -43,11 +43,13 @@
</div>
<!--驾驶员信息列表区域-->
<div style="margin-top: 20px;">
<el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading" element-loading-text="拼命加载中">
<el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading"
element-loading-text="拼命加载中">
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="姓名" prop="driverName" align="center" width="100"></el-table-column>
<el-table-column label="联系方式" prop="driverMobile" align="center" width="130"></el-table-column>
<el-table-column label="驾驶证" prop="driverLicenseNumber" align="center" width="150"></el-table-column>
<el-table-column label="驾驶证" prop="driverLicenseNumber" align="center"
width="150"></el-table-column>
<el-table-column label="工号" prop="jobNumber" align="center" width="120"></el-table-column>
<el-table-column label="职位" prop="driverPosition" align="center" width="100">
<template slot-scope="scope">
... ... @@ -423,99 +425,106 @@
/**
* 获取驾驶员信息列表
*/
async getDriverInfoList() {
getDriverInfoList() {
//开启加载
this.listLoading = true;
const {data: res} = await selectDriverInfoList(this.queryInfo).catch(error => {
selectDriverInfoList(this.queryInfo).then((response) => {
let res = response.data;
if (res.code !== '200') return this.$message.error('获取驾驶员信息列表，失败');
// 获取驾驶员信息列表数据
this.driverInfoList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取驾驶员信息列表，成功');
}).catch(error => {
this.listLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') return this.$message.error('获取驾驶员信息列表，失败');
// 获取驾驶员信息列表数据
this.driverInfoList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取驾驶员信息列表，成功');
},
/**
* 增加驾驶员信息
*/
addDriverInfo() {
/*进行表单的预验证*/
this.$refs.addDriverInfoFormRef.validate(async valid => {
this.$refs.addDriverInfoFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预检验,开启加载
this.addLoading = true;
const {data: res} = await insertDriverInfo(this.addDriverInfoForm).catch(error => {
insertDriverInfo(this.addDriverInfoForm).then((response) => {
let res = response.data;
if (res.code !== '200') return this.$message.error('添加驾驶员信息，失败');
//关闭加载
this.addLoading = false;
this.$message.success('添加驾驶员信息，成功');
//关闭对话框
this.addDriverInfoFormVisible = false;
//刷新驾驶员信息列表
this.getDriverInfoList();
}).catch(error => {
this.addLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') return this.$message.error('添加驾驶员信息，失败');
//关闭加载
this.addLoading = false;
this.$message.success('添加驾驶员信息，成功');
//关闭对话框
this.addDriverInfoFormVisible = false;
//刷新驾驶员信息列表
this.getDriverInfoList();
})
},
/**
* 删除驾驶员信息
*/
async removeDriverInfo(index, row) {
removeDriverInfo(index, row) {
//弹框询问是否删除驾驶员信息
const confirmResult = await this.$confirm('此操作永久删除该驾驶员信息, 是否继续?', '警告', {
this.$confirm('此操作永久删除该驾驶员信息, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
);
if (confirmResult !== 'confirm') {
return this.$message.info('已取消删除');
}
//开启加载
this.delLoading = true;
const {data: res} = await deleteDriverInfo(row).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('删除驾驶员信息，失败');
}
//关闭加载
this.delLoading = false;
this.$message.success('删除驾驶员信息，成功！');
//刷新驾驶员信息列表
this.getDriverInfoList();
).then(() => {
//开启加载
this.delLoading = true;
deleteDriverInfo(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('删除驾驶员信息，失败');
}
//关闭加载
this.delLoading = false;
this.$message.success('删除驾驶员信息，成功！');
//刷新驾驶员信息列表
this.getDriverInfoList();
}).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
}).catch();
},
/**
* 编辑驾驶员信息
*/
editDriverInfo() {
/*进行表单的预验证*/
this.$refs.editDriverInfoFormRef.validate(async valid => {
this.$refs.editDriverInfoFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预检验,开启加载
this.editLoading = true;
const {data: res} = await updateDriverInfo(this.editDriverInfoForm).catch(error => {
updateDriverInfo(this.editDriverInfoForm).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('修改驾驶员信息，失败');
}
//关闭加载
this.editLoading = false;
this.$message.success('修改驾驶员信息，成功！');
// 关闭，编辑驾驶员信息对话框
this.editDialogVisible = false;
//刷新驾驶员信息列表
this.getDriverInfoList();
}).catch(error => {
this.editLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('修改驾驶员信息，失败');
}
//关闭加载
this.editLoading = false;
this.$message.success('修改驾驶员信息，成功！');
// 关闭，编辑驾驶员信息对话框
this.editDialogVisible = false;
//刷新驾驶员信息列表
this.getDriverInfoList();
})
},
/**
... ...
... ... @@ -2,13 +2,13 @@
<el-container>
<el-main>
<!--面包屑导航区域-->
<!-- <div>-->
<!-- <el-breadcrumb separator-class="el-icon-arrow-right">-->
<!-- <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item>车辆调度</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item>车辆信息</el-breadcrumb-item>-->
<!-- </el-breadcrumb>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-breadcrumb separator-class="el-icon-arrow-right">-->
<!-- <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item>车辆调度</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item>车辆信息</el-breadcrumb-item>-->
<!-- </el-breadcrumb>-->
<!-- </div>-->
<el-card style="background-color: #F5F7FA">
<!--搜索区域-->
<div>
... ... @@ -45,11 +45,13 @@
<el-row style="margin-top: 20px;">
<el-button type="primary" @click="getVehicleInfoList">查询车辆信息</el-button>
<el-button type="success" @click="addVehicleInfoFormVisible = true">增加车辆信息</el-button>
</el-row>
</div>
<!--车辆信息列表区域-->
<div style="margin-top: 20px;">
<el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading" element-loading-text="拼命加载中">
<el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading"
element-loading-text="拼命加载中">
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
<template slot-scope="scope">
... ... @@ -61,8 +63,10 @@
<span v-if="scope.row.vehicleType ==='6'">叉车</span>
</template>
</el-table-column>
<el-table-column label="车牌号码" prop="licensePlateNumber" align="center" width="130"></el-table-column>
<el-table-column label="车辆载重/Kg" prop="vehicleLoad" align="center" width="110"></el-table-column>
<el-table-column label="车牌号码" prop="licensePlateNumber" align="center"
width="130"></el-table-column>
<el-table-column label="车辆载重/Kg" prop="vehicleLoad" align="center"
width="110"></el-table-column>
<el-table-column label="挂车与否" prop="isTrailer" align="center" width="110">
<template slot-scope="scope">
<span v-if="scope.row.isTrailer ==='1'">有挂车</span>
... ... @@ -79,8 +83,10 @@
<span v-if="scope.row.vehicleStatus ==='5'">保养状态</span>
</template>
</el-table-column>
<el-table-column label="车辆公司" prop="vehicleCompany" align="center" width="200"></el-table-column>
<el-table-column label="行驶证号" prop="drivingLicenseNumber" align="center" width="160"></el-table-column>
<el-table-column label="车辆公司" prop="vehicleCompany" align="center"
width="200"></el-table-column>
<el-table-column label="行驶证号" prop="drivingLicenseNumber" align="center"
width="160"></el-table-column>
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<!--查看按钮-->
... ... @@ -126,11 +132,13 @@
<div style="margin-left: 30px">
<br>
<el-form-item label="车牌号码：" prop="licensePlateNumber">
<el-input v-model="addVehicleInfoForm.licensePlateNumber" clearable style="width: 300px;"
<el-input v-model="addVehicleInfoForm.licensePlateNumber" clearable
style="width: 300px;"
placeholder="请输入车牌号码"></el-input>
</el-form-item>
<el-form-item label="行驶证号：" prop="drivingLicenseNumber">
<el-input v-model="addVehicleInfoForm.drivingLicenseNumber" clearable style="width: 300px;"
<el-input v-model="addVehicleInfoForm.drivingLicenseNumber" clearable
style="width: 300px;"
placeholder="请输入车辆行驶证号"></el-input>
</el-form-item>
<el-form-item label="车辆类型：" prop="vehicleType">
... ... @@ -188,11 +196,13 @@
<div style="margin-left: 30px">
<br>
<el-form-item label="车牌号码：" prop="licensePlateNumber">
<el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable style="width: 300px;"
<el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable
style="width: 300px;"
placeholder="请输入车牌号码"></el-input>
</el-form-item>
<el-form-item label="行驶证号：" prop="drivingLicenseNumber">
<el-input v-model="editVehicleInfoForm.drivingLicenseNumber" clearable style="width: 300px;"
<el-input v-model="editVehicleInfoForm.drivingLicenseNumber" clearable
style="width: 300px;"
placeholder="请输入车辆行驶证号"></el-input>
</el-form-item>
<el-form-item label="车辆类型：" prop="vehicleType">
... ... @@ -207,13 +217,15 @@
</el-select>
</el-form-item>
<el-form-item label="车辆载重：" prop="vehicleLoad">
<el-input-number style="width: 200px" v-model="editVehicleInfoForm.vehicleLoad" clearable
<el-input-number style="width: 200px" v-model="editVehicleInfoForm.vehicleLoad"
clearable
:min="10" :max="10000" controls-position="right">
</el-input-number>
<span style="margin-left:5px;font-size: 18px">Kg</span>
</el-form-item>
<el-form-item label="车辆状态：" prop="vehicleStatus">
<el-select v-model="editVehicleInfoForm.vehicleStatus" clearable style="width: 300px" clearable placeholder="请选择车辆状态">
<el-select v-model="editVehicleInfoForm.vehicleStatus" clearable style="width: 300px"
clearable placeholder="请选择车辆状态">
<el-option
v-for="item in vehicleStatusList"
:key="item.value"
... ... @@ -223,7 +235,8 @@
</el-select>
</el-form-item>
<el-form-item label="有无挂车：" prop="vehicleType">
<el-select v-model="editVehicleInfoForm.isTrailer" clearable style="width: 300px" clearable
<el-select v-model="editVehicleInfoForm.isTrailer" clearable style="width: 300px"
clearable
placeholder="请选择有无挂车">
<el-option
v-for="item in isTrailerList"
... ... @@ -237,8 +250,9 @@
<el-input v-model="editVehicleInfoForm.vehicleCompany" clearable style="width: 300px;"
placeholder="请输入车辆公司"></el-input>
</el-form-item>
<el-form-item label="空闲时间：" prop="freetime" >
<el-date-picker v-model="editVehicleInfoForm.freetime" type="datetime" style="width: 300px;"
<el-form-item label="空闲时间：" prop="freetime">
<el-date-picker v-model="editVehicleInfoForm.freetime" type="datetime"
style="width: 300px;"
placeholder="选择调度时间"></el-date-picker>
</el-form-item>
<br>
... ... @@ -452,77 +466,80 @@
/**
* 管理员端，获取车辆信息列表
*/
async getVehicleInfoList() {
getVehicleInfoList() {
//开启加载
this.listLoading = true;
const {data: res} = await selectVehicleInfoList(this.queryInfo).catch(error => {
selectVehicleInfoList(this.queryInfo).then((response) => {
let res = response.data;
if (res.code !== '200') return this.$message.error('获取车辆信息列表失败');
// 获取车辆信息列表数据
this.vehicleInfoList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取车辆信息列表，成功');
}).catch(error => {
this.listLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') return this.$message.error('获取车辆信息列表失败');
// 获取车辆信息列表数据
this.vehicleInfoList = res.data.list;
// 获取列表的总记录数
this.total = res.data.total;
//关闭加载
this.listLoading = false;
this.$message.success('获取车辆信息列表，成功');
},
/**
* 管理员端，增加车辆信息
*/
addVehicleInfo() {
/*进行表单的预验证*/
this.$refs.addVehicleInfoFormRef.validate(async valid => {
this.$refs.addVehicleInfoFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预检验，发起添加车辆信息的网络请求,开启加载
this.addLoading = true;
const {data: res} = await insertVehicleInfo(this.addVehicleInfoForm).catch(error => {
insertVehicleInfo(this.addVehicleInfoForm).then((response) => {
let res = response.data;
//添加调度记录信息,失败
if (res.code !== '200') return this.$message.error('添加车辆信息，失败');
//关闭加载
this.addLoading = false;
this.$message.success('添加调度记录信息，成功');
//隐藏对话框
this.addVehicleInfoFormVisible = false;
//刷新车辆信息列表
this.getVehicleInfoList();
}).catch(error => {
this.addLoading = false;
this.$message.error(error.toString());
});
//添加调度记录信息,失败
if (res.code !== '200') return this.$message.error('添加车辆信息，失败');
//关闭加载
this.addLoading = false;
this.$message.success('添加调度记录信息，成功');
//隐藏对话框
this.addVehicleInfoFormVisible = false;
//刷新车辆信息列表
this.getVehicleInfoList();
})
},
/**
* 管理员端，删除车辆信息
*/
async removeVehicleInfo(index,row) {
removeVehicleInfo(index, row) {
//弹框询问是否删除车辆信息
const confirmResult = await this.$confirm('此操作永久删除该车辆信息, 是否继续?', '警告', {
this.$confirm('此操作永久删除该车辆信息, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
).catch(error => {
return error;
});
if (confirmResult !== 'confirm') {
return this.$message.info('已取消删除');
}
//开启加载
this.delLoading = true;
const {data: res} = await deleteVehicleInfo(row).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('删除车辆信息，失败');
}
//关闭加载
this.delLoading = false;
this.$message.success('删除车辆信息，成功！');
//刷新车辆信息列表
this.getVehicleInfoList();
).then(() => {
//开启加载
this.delLoading = true;
deleteVehicleInfo(row).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('删除车辆信息，失败');
}
//关闭加载
this.delLoading = false;
this.$message.success('删除车辆信息，成功！');
//刷新车辆信息列表
this.getVehicleInfoList();
}).catch(error => {
this.delLoading = false;
this.$message.error(error.toString());
});
}).catch();
},
/**
... ... @@ -530,25 +547,27 @@
*/
editVehicleInfo() {
/*进行表单的预验证*/
this.$refs.editVehicleInfoFormRef.validate(async valid => {
this.$refs.editVehicleInfoFormRef.validate(valid => {
// 未通过，表单预校验
if (!valid) return;
// 通过，表单预校验,开启加载
this.editLoading = true;
const {data: res} = await updateVehicleInfo(this.editVehicleInfoForm).catch(error => {
updateVehicleInfo(this.editVehicleInfoForm).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('修改车辆信息，失败');
}
//关闭加载
this.editLoading = false;
this.$message.success('修改车辆信息，成功！');
//关闭编辑车辆信息对话框
this.editDialogVisible = false;
//刷新车辆信息列表
this.getVehicleInfoList();
}).catch(error => {
this.editLoading = false;
this.$message.error(error.toString());
});
if (res.code !== '200') {
return this.$message.error('修改车辆信息，失败');
}
//关闭加载
this.editLoading = false;
this.$message.success('修改车辆信息，成功！');
//关闭编辑车辆信息对话框
this.editDialogVisible = false;
//刷新车辆信息列表
this.getVehicleInfoList();
})
},
... ... @@ -567,7 +586,7 @@
/**
* 打开编辑车辆信息对话框
*/
showEditDialogVisible(index,row) {
showEditDialogVisible(index, row) {
this.editVehicleInfoForm = Object.assign({}, row);
this.editDialogVisible = true;
},
... ...