王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 18c8c68b6b645bc79910603a4191c8c16c529359 1 个父辈 01a6dff7

修改列表框，样式

内嵌 并排对比
正在显示 4 个修改的文件 包含 26 行增加 和 26 行删除
... ... @@ -114,7 +114,7 @@
<!--取消调度按钮-->
<el-tooltip effect="dark" content="取消调度" placement="top-start" :enterable="false">
<el-button type="danger" icon="el-icon-delete" size="mini"
:disabled="scope.row.endTime!==''&&scope.row.endTime!==null"
:disabled="scope.row.endTime!==null && scope.row.endTime!==''"
@click="cancelDispatch(scope.row)" :loading="cancelLoading">取消调度
</el-button>
</el-tooltip>
... ...
... ... @@ -136,7 +136,7 @@
<el-tooltip effect="dark" content="结束任务" placement="top-start" :enterable="false"
style="margin-left: 1px;">
<el-button type="info" icon="el-icon-message" size="mini"
:disabled="scope.row.endTime!==''&&scope.row.endTime!==null"
:disabled="scope.row.endTime !==null && scope.row.endTime !==''"
:loading="endLoading"
@click="completeDispatch(scope.$index,scope.row)">结束任务
</el-button>
... ...
... ... @@ -43,13 +43,13 @@
</div>
<!--驾驶员信息列表区域-->
<div style="margin-top: 20px;">
<el-table :data="driverInfoList" stripe v-loading="listLoading" element-loading-text="拼命加载中">
<el-table-column type="index"></el-table-column>
<el-table-column label="姓名" prop="driverName" width="100"></el-table-column>
<el-table-column label="联系方式" prop="driverMobile" width="130"></el-table-column>
<el-table-column label="驾驶证" prop="driverLicenseNumber" width="150"></el-table-column>
<el-table-column label="工号" prop="jobNumber" width="120"></el-table-column>
<el-table-column label="职位" prop="driverPosition" width="100">
<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="jobNumber" align="center" width="120"></el-table-column>
<el-table-column label="职位" prop="driverPosition" align="center" width="100">
<template slot-scope="scope">
<span v-if="scope.row.driverPosition ==='1'">队长</span>
<span v-if="scope.row.driverPosition ==='2'">班长</span>
... ... @@ -57,8 +57,8 @@
<span v-if="scope.row.driverPosition ==='4'">员工</span>
</template>
</el-table-column>
<el-table-column label="公司" prop="driverCompany" width="160"></el-table-column>
<el-table-column label="状态" prop="driverStatus" width="120">
<el-table-column label="公司" prop="driverCompany" align="center" width="160"></el-table-column>
<el-table-column label="状态" prop="driverStatus" align="center" width="120">
<template slot-scope="scope">
<span v-if="scope.row.driverStatus ==='1'">空闲状态</span>
<span v-if="scope.row.driverStatus ==='2'">执行状态</span>
... ... @@ -66,7 +66,7 @@
<span v-if="scope.row.driverStatus ==='4'">请假状态</span>
</template>
</el-table-column>
<el-table-column label="操作" width="220px" fixed="right">
<el-table-column label="操作" width="220px" align="center" fixed="right">
<template slot-scope="scope">
<!--查看按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
... ... @@ -455,7 +455,7 @@
});
if (res.code !== '200') return this.$message.error('添加驾驶员信息，失败');
//关闭加载
this.addLoading = true;
this.addLoading = false;
this.$message.success('添加驾驶员信息，成功');
//关闭对话框
this.addDriverInfoFormVisible = false;
... ...
... ... @@ -49,9 +49,9 @@
</div>
<!--车辆信息列表区域-->
<div style="margin-top: 20px;">
<el-table :data="vehicleInfoList" stripe v-loading="listLoading" element-loading-text="拼命加载中">
<el-table-column type="index"></el-table-column>
<el-table-column label="车辆类型" prop="vehicleType" width="120">
<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">
<span v-if="scope.row.vehicleType ==='1'">重型货车</span>
<span v-if="scope.row.vehicleType ==='2'">中型货车</span>
... ... @@ -61,16 +61,16 @@
<span v-if="scope.row.vehicleType ==='6'">叉车</span>
</template>
</el-table-column>
<el-table-column label="车牌号码" prop="licensePlateNumber" width="130"></el-table-column>
<el-table-column label="车辆载重/Kg" prop="vehicleLoad" width="110"></el-table-column>
<el-table-column label="挂车与否" prop="isTrailer" width="110">
<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>
<span v-if="scope.row.isTrailer ==='2'">没有挂车</span>
</template>
</el-table-column>
<el-table-column label="开始空闲时间" prop="freetime" width="160"></el-table-column>
<el-table-column label="车辆状态" prop="vehicleStatus" width="100">
<el-table-column label="开始空闲时间" prop="freetime" align="center" width="160"></el-table-column>
<el-table-column label="车辆状态" prop="vehicleStatus" align="center" width="100">
<template slot-scope="scope">
<span v-if="scope.row.vehicleStatus ==='1'">空闲状态</span>
<span v-if="scope.row.vehicleStatus ==='2'">执行状态</span>
... ... @@ -79,9 +79,9 @@
<span v-if="scope.row.vehicleStatus ==='5'">保养状态</span>
</template>
</el-table-column>
<el-table-column label="车辆公司" prop="vehicleCompany" width="200"></el-table-column>
<el-table-column label="行驶证号" prop="drivingLicenseNumber" width="160"></el-table-column>
<el-table-column label="操作" width="220px" fixed="right">
<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">
<!--查看按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
... ... @@ -485,7 +485,7 @@
//添加调度记录信息,失败
if (res.code !== '200') return this.$message.error('添加车辆信息，失败');
//关闭加载
this.addLoading = true;
this.addLoading = false;
this.$message.success('添加调度记录信息，成功');
//隐藏对话框
this.addVehicleInfoFormVisible = false;
... ... @@ -567,7 +567,7 @@
/**
* 打开编辑车辆信息对话框
*/
showEditDialogVisible(row) {
showEditDialogVisible(index,row) {
this.editVehicleInfoForm = Object.assign({}, row);
this.editDialogVisible = true;
},
... ...