王勇 / dispatch_sys_vue · 提交

转到一个项目

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

修改列表框，样式

内嵌 并排对比
正在显示 4 个修改的文件 包含 26 行增加 和 26 行删除
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <!--取消调度按钮--> 114 <!--取消调度按钮-->
115 <el-tooltip effect="dark" content="取消调度" placement="top-start" :enterable="false"> 115 <el-tooltip effect="dark" content="取消调度" placement="top-start" :enterable="false">
116 <el-button type="danger" icon="el-icon-delete" size="mini" 116 <el-button type="danger" icon="el-icon-delete" size="mini"
117 - :disabled="scope.row.endTime!==''&&scope.row.endTime!==null" 117 + :disabled="scope.row.endTime!==null && scope.row.endTime!==''"
118 @click="cancelDispatch(scope.row)" :loading="cancelLoading">取消调度 118 @click="cancelDispatch(scope.row)" :loading="cancelLoading">取消调度
119 </el-button> 119 </el-button>
120 </el-tooltip> 120 </el-tooltip>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <el-tooltip effect="dark" content="结束任务" placement="top-start" :enterable="false" 136 <el-tooltip effect="dark" content="结束任务" placement="top-start" :enterable="false"
137 style="margin-left: 1px;"> 137 style="margin-left: 1px;">
138 <el-button type="info" icon="el-icon-message" size="mini" 138 <el-button type="info" icon="el-icon-message" size="mini"
139 - :disabled="scope.row.endTime!==''&&scope.row.endTime!==null" 139 + :disabled="scope.row.endTime !==null && scope.row.endTime !==''"
140 :loading="endLoading" 140 :loading="endLoading"
141 @click="completeDispatch(scope.$index,scope.row)">结束任务 141 @click="completeDispatch(scope.$index,scope.row)">结束任务
142 </el-button> 142 </el-button>
@@ -43,13 +43,13 @@ @@ -43,13 +43,13 @@
43 </div> 43 </div>
44 <!--驾驶员信息列表区域--> 44 <!--驾驶员信息列表区域-->
45 <div style="margin-top: 20px;"> 45 <div style="margin-top: 20px;">
46 - <el-table :data="driverInfoList" stripe v-loading="listLoading" element-loading-text="拼命加载中">  
47 - <el-table-column type="index"></el-table-column>  
48 - <el-table-column label="姓名" prop="driverName" width="100"></el-table-column>  
49 - <el-table-column label="联系方式" prop="driverMobile" width="130"></el-table-column>  
50 - <el-table-column label="驾驶证" prop="driverLicenseNumber" width="150"></el-table-column>  
51 - <el-table-column label="工号" prop="jobNumber" width="120"></el-table-column>  
52 - <el-table-column label="职位" prop="driverPosition" width="100"> 46 + <el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading" element-loading-text="拼命加载中">
  47 + <el-table-column type="index" align="center"></el-table-column>
  48 + <el-table-column label="姓名" prop="driverName" align="center" width="100"></el-table-column>
  49 + <el-table-column label="联系方式" prop="driverMobile" align="center" width="130"></el-table-column>
  50 + <el-table-column label="驾驶证" prop="driverLicenseNumber" align="center" width="150"></el-table-column>
  51 + <el-table-column label="工号" prop="jobNumber" align="center" width="120"></el-table-column>
  52 + <el-table-column label="职位" prop="driverPosition" align="center" width="100">
53 <template slot-scope="scope"> 53 <template slot-scope="scope">
54 <span v-if="scope.row.driverPosition ==='1'">队长</span> 54 <span v-if="scope.row.driverPosition ==='1'">队长</span>
55 <span v-if="scope.row.driverPosition ==='2'">班长</span> 55 <span v-if="scope.row.driverPosition ==='2'">班长</span>
@@ -57,8 +57,8 @@ @@ -57,8 +57,8 @@
57 <span v-if="scope.row.driverPosition ==='4'">员工</span> 57 <span v-if="scope.row.driverPosition ==='4'">员工</span>
58 </template> 58 </template>
59 </el-table-column> 59 </el-table-column>
60 - <el-table-column label="公司" prop="driverCompany" width="160"></el-table-column>  
61 - <el-table-column label="状态" prop="driverStatus" width="120"> 60 + <el-table-column label="公司" prop="driverCompany" align="center" width="160"></el-table-column>
  61 + <el-table-column label="状态" prop="driverStatus" align="center" width="120">
62 <template slot-scope="scope"> 62 <template slot-scope="scope">
63 <span v-if="scope.row.driverStatus ==='1'">空闲状态</span> 63 <span v-if="scope.row.driverStatus ==='1'">空闲状态</span>
64 <span v-if="scope.row.driverStatus ==='2'">执行状态</span> 64 <span v-if="scope.row.driverStatus ==='2'">执行状态</span>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <span v-if="scope.row.driverStatus ==='4'">请假状态</span> 66 <span v-if="scope.row.driverStatus ==='4'">请假状态</span>
67 </template> 67 </template>
68 </el-table-column> 68 </el-table-column>
69 - <el-table-column label="操作" width="220px" fixed="right"> 69 + <el-table-column label="操作" width="220px" align="center" fixed="right">
70 <template slot-scope="scope"> 70 <template slot-scope="scope">
71 <!--查看按钮--> 71 <!--查看按钮-->
72 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 72 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
@@ -455,7 +455,7 @@ @@ -455,7 +455,7 @@
455 }); 455 });
456 if (res.code !== '200') return this.$message.error('添加驾驶员信息，失败'); 456 if (res.code !== '200') return this.$message.error('添加驾驶员信息，失败');
457 //关闭加载 457 //关闭加载
458 - this.addLoading = true; 458 + this.addLoading = false;
459 this.$message.success('添加驾驶员信息，成功'); 459 this.$message.success('添加驾驶员信息，成功');
460 //关闭对话框 460 //关闭对话框
461 this.addDriverInfoFormVisible = false; 461 this.addDriverInfoFormVisible = false;
@@ -49,9 +49,9 @@ @@ -49,9 +49,9 @@
49 </div> 49 </div>
50 <!--车辆信息列表区域--> 50 <!--车辆信息列表区域-->
51 <div style="margin-top: 20px;"> 51 <div style="margin-top: 20px;">
52 - <el-table :data="vehicleInfoList" stripe v-loading="listLoading" element-loading-text="拼命加载中">  
53 - <el-table-column type="index"></el-table-column>  
54 - <el-table-column label="车辆类型" prop="vehicleType" width="120"> 52 + <el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading" element-loading-text="拼命加载中">
  53 + <el-table-column type="index" align="center"></el-table-column>
  54 + <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
55 <template slot-scope="scope"> 55 <template slot-scope="scope">
56 <span v-if="scope.row.vehicleType ==='1'">重型货车</span> 56 <span v-if="scope.row.vehicleType ==='1'">重型货车</span>
57 <span v-if="scope.row.vehicleType ==='2'">中型货车</span> 57 <span v-if="scope.row.vehicleType ==='2'">中型货车</span>
@@ -61,16 +61,16 @@ @@ -61,16 +61,16 @@
61 <span v-if="scope.row.vehicleType ==='6'">叉车</span> 61 <span v-if="scope.row.vehicleType ==='6'">叉车</span>
62 </template> 62 </template>
63 </el-table-column> 63 </el-table-column>
64 - <el-table-column label="车牌号码" prop="licensePlateNumber" width="130"></el-table-column>  
65 - <el-table-column label="车辆载重/Kg" prop="vehicleLoad" width="110"></el-table-column>  
66 - <el-table-column label="挂车与否" prop="isTrailer" width="110"> 64 + <el-table-column label="车牌号码" prop="licensePlateNumber" align="center" width="130"></el-table-column>
  65 + <el-table-column label="车辆载重/Kg" prop="vehicleLoad" align="center" width="110"></el-table-column>
  66 + <el-table-column label="挂车与否" prop="isTrailer" align="center" width="110">
67 <template slot-scope="scope"> 67 <template slot-scope="scope">
68 <span v-if="scope.row.isTrailer ==='1'">有挂车</span> 68 <span v-if="scope.row.isTrailer ==='1'">有挂车</span>
69 <span v-if="scope.row.isTrailer ==='2'">没有挂车</span> 69 <span v-if="scope.row.isTrailer ==='2'">没有挂车</span>
70 </template> 70 </template>
71 </el-table-column> 71 </el-table-column>
72 - <el-table-column label="开始空闲时间" prop="freetime" width="160"></el-table-column>  
73 - <el-table-column label="车辆状态" prop="vehicleStatus" width="100"> 72 + <el-table-column label="开始空闲时间" prop="freetime" align="center" width="160"></el-table-column>
  73 + <el-table-column label="车辆状态" prop="vehicleStatus" align="center" width="100">
74 <template slot-scope="scope"> 74 <template slot-scope="scope">
75 <span v-if="scope.row.vehicleStatus ==='1'">空闲状态</span> 75 <span v-if="scope.row.vehicleStatus ==='1'">空闲状态</span>
76 <span v-if="scope.row.vehicleStatus ==='2'">执行状态</span> 76 <span v-if="scope.row.vehicleStatus ==='2'">执行状态</span>
@@ -79,9 +79,9 @@ @@ -79,9 +79,9 @@
79 <span v-if="scope.row.vehicleStatus ==='5'">保养状态</span> 79 <span v-if="scope.row.vehicleStatus ==='5'">保养状态</span>
80 </template> 80 </template>
81 </el-table-column> 81 </el-table-column>
82 - <el-table-column label="车辆公司" prop="vehicleCompany" width="200"></el-table-column>  
83 - <el-table-column label="行驶证号" prop="drivingLicenseNumber" width="160"></el-table-column>  
84 - <el-table-column label="操作" width="220px" fixed="right"> 82 + <el-table-column label="车辆公司" prop="vehicleCompany" align="center" width="200"></el-table-column>
  83 + <el-table-column label="行驶证号" prop="drivingLicenseNumber" align="center" width="160"></el-table-column>
  84 + <el-table-column label="操作" width="200px" align="center" fixed="right">
85 <template slot-scope="scope"> 85 <template slot-scope="scope">
86 <!--查看按钮--> 86 <!--查看按钮-->
87 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 87 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
@@ -485,7 +485,7 @@ @@ -485,7 +485,7 @@
485 //添加调度记录信息,失败 485 //添加调度记录信息,失败
486 if (res.code !== '200') return this.$message.error('添加车辆信息，失败'); 486 if (res.code !== '200') return this.$message.error('添加车辆信息，失败');
487 //关闭加载 487 //关闭加载
488 - this.addLoading = true; 488 + this.addLoading = false;
489 this.$message.success('添加调度记录信息，成功'); 489 this.$message.success('添加调度记录信息，成功');
490 //隐藏对话框 490 //隐藏对话框
491 this.addVehicleInfoFormVisible = false; 491 this.addVehicleInfoFormVisible = false;
@@ -567,7 +567,7 @@ @@ -567,7 +567,7 @@
567 /** 567 /**
568 * 打开编辑车辆信息对话框 568 * 打开编辑车辆信息对话框
569 */ 569 */
570 - showEditDialogVisible(row) { 570 + showEditDialogVisible(index,row) {
571 this.editVehicleInfoForm = Object.assign({}, row); 571 this.editVehicleInfoForm = Object.assign({}, row);
572 this.editDialogVisible = true; 572 this.editDialogVisible = true;
573 }, 573 },