王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 6451082530a1dc55fc5985b5f0daa57d30ff97c1 1 个父辈 73e1961d

添加批量删除功能

内嵌 并排对比
正在显示 5 个修改的文件 包含 182 行增加 和 8 行删除
@@ -22,7 +22,8 @@ export const insertDispatchNote = params =>{return http.post(`${baseUrl}/dispatc @@ -22,7 +22,8 @@ export const insertDispatchNote = params =>{return http.post(`${baseUrl}/dispatc
22 export const updateDispatchNote = params =>{return http.put(`${baseUrl}/dispatchNote/updateDispatchNote`, params);}; 22 export const updateDispatchNote = params =>{return http.put(`${baseUrl}/dispatchNote/updateDispatchNote`, params);};
23 /*管理员端,调度记录，删除车辆调度记录*/ 23 /*管理员端,调度记录，删除车辆调度记录*/
24 export const deleteDispatchNote = params =>{return http.del(`${baseUrl}/dispatchNote/deleteDispatchNote`, params);}; 24 export const deleteDispatchNote = params =>{return http.del(`${baseUrl}/dispatchNote/deleteDispatchNote`, params);};
25 - 25 +/*管理员端,调度记录，批量删除车辆调度记录*/
  26 +export const batchRemoveDispatchNode = params =>{return http.get(`${baseUrl}/dispatchNote/batchRemove`, params);};
26 27
27 /*管理员端,车辆信息，查询车辆信息*/ 28 /*管理员端,车辆信息，查询车辆信息*/
28 export const selectVehicleInfoList = params =>{return http.get(`${baseUrl}/vehicleInfo/selectVehicleInfoList`, params);}; 29 export const selectVehicleInfoList = params =>{return http.get(`${baseUrl}/vehicleInfo/selectVehicleInfoList`, params);};
@@ -32,6 +33,8 @@ export const insertVehicleInfo = params =>{return http.post(`${baseUrl}/vehicleI @@ -32,6 +33,8 @@ export const insertVehicleInfo = params =>{return http.post(`${baseUrl}/vehicleI
32 export const updateVehicleInfo = params =>{return http.put(`${baseUrl}/vehicleInfo/updateVehicleInfo`, params);}; 33 export const updateVehicleInfo = params =>{return http.put(`${baseUrl}/vehicleInfo/updateVehicleInfo`, params);};
33 /*管理员端,车辆信息，删除车辆信息*/ 34 /*管理员端,车辆信息，删除车辆信息*/
34 export const deleteVehicleInfo = params =>{return http.del(`${baseUrl}/vehicleInfo/deleteVehicleInfo`, params);}; 35 export const deleteVehicleInfo = params =>{return http.del(`${baseUrl}/vehicleInfo/deleteVehicleInfo`, params);};
  36 +/*管理员端,车辆信息，批量删除车辆信息*/
  37 +export const batchRemoveVehicleInfo= params =>{return http.get(`${baseUrl}/vehicleInfo/batchRemove`, params);};
35 38
36 /*管理员端,驾驶员信息，查询驾驶员信息*/ 39 /*管理员端,驾驶员信息，查询驾驶员信息*/
37 export const selectDriverInfoList = params =>{return http.get(`${baseUrl}/driverInfo/selectDriverInfoList`, params);}; 40 export const selectDriverInfoList = params =>{return http.get(`${baseUrl}/driverInfo/selectDriverInfoList`, params);};
@@ -41,3 +44,5 @@ export const insertDriverInfo = params =>{return http.post(`${baseUrl}/driverInf @@ -41,3 +44,5 @@ export const insertDriverInfo = params =>{return http.post(`${baseUrl}/driverInf
41 export const updateDriverInfo = params =>{return http.put(`${baseUrl}/driverInfo/updateDriverInfo`, params);}; 44 export const updateDriverInfo = params =>{return http.put(`${baseUrl}/driverInfo/updateDriverInfo`, params);};
42 /*管理员端,驾驶员信息，删除驾驶员信息*/ 45 /*管理员端,驾驶员信息，删除驾驶员信息*/
43 export const deleteDriverInfo = params =>{return http.del(`${baseUrl}/driverInfo/deleteDriverInfo`, params);}; 46 export const deleteDriverInfo = params =>{return http.del(`${baseUrl}/driverInfo/deleteDriverInfo`, params);};
  47 +/*管理员端,驾驶员信息，批量删除驾驶员信息*/
  48 +export const batchRemoveDriverInfo= params =>{return http.get(`${baseUrl}/driverInfo/batchRemove`, params);};
@@ -636,7 +636,8 @@ @@ -636,7 +636,8 @@
636 this.cancelLoading = false; 636 this.cancelLoading = false;
637 this.$message.error(error.toString()); 637 this.$message.error(error.toString());
638 }); 638 });
639 - }).catch(); 639 + }).catch(() => {
  640 + });
640 }, 641 },
641 /** 642 /**
642 * 获取用户信息 643 * 获取用户信息
@@ -63,7 +63,9 @@ @@ -63,7 +63,9 @@
63 <div style="margin-top: 20px;"> 63 <div style="margin-top: 20px;">
64 <el-table :data="DispatchNoteList" border v-loading="listLoading" 64 <el-table :data="DispatchNoteList" border v-loading="listLoading"
65 :row-class-name="rowStatus" 65 :row-class-name="rowStatus"
  66 + @selection-change="selsChange"
66 element-loading-text="拼命加载中"> 67 element-loading-text="拼命加载中">
  68 + <el-table-column type="selection" width="55" align="center"></el-table-column>
67 <el-table-column type="index" align="center"></el-table-column> 69 <el-table-column type="index" align="center"></el-table-column>
68 <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column> 70 <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column>
69 <el-table-column label="联系方式" prop="userMobile" align="center" width="120"></el-table-column> 71 <el-table-column label="联系方式" prop="userMobile" align="center" width="120"></el-table-column>
@@ -148,6 +150,13 @@ @@ -148,6 +150,13 @@
148 </el-table> 150 </el-table>
149 <!-- 分页区域 --> 151 <!-- 分页区域 -->
150 <div style="margin-top: 10px"> 152 <div style="margin-top: 10px">
  153 + <el-row :gutter="24">
  154 + <el-col :span="5">
  155 + <el-button type="danger" icon="el-icon-delete" @click="batchRemove"
  156 + :disabled="this.sels.length===0">批量删除
  157 + </el-button>
  158 + </el-col>
  159 + <el-col :span="10" style="margin-top: 5px">
151 <el-pagination 160 <el-pagination
152 @size-change="handleSizeChange" 161 @size-change="handleSizeChange"
153 @current-change="handleCurrentChange" 162 @current-change="handleCurrentChange"
@@ -157,6 +166,8 @@ @@ -157,6 +166,8 @@
157 layout="total, sizes, prev, pager, next, jumper" 166 layout="total, sizes, prev, pager, next, jumper"
158 :total="total"> 167 :total="total">
159 </el-pagination> 168 </el-pagination>
  169 + </el-col>
  170 + </el-row>
160 </div> 171 </div>
161 </div> 172 </div>
162 </el-card> 173 </el-card>
@@ -387,9 +398,11 @@ @@ -387,9 +398,11 @@
387 insertDispatchNote, 398 insertDispatchNote,
388 updateDispatchNote, 399 updateDispatchNote,
389 deleteDispatchNote, 400 deleteDispatchNote,
  401 + batchRemoveDispatchNode,
390 startTask, 402 startTask,
391 completeTask 403 completeTask
392 } from "../../api/dispatch_api"; 404 } from "../../api/dispatch_api";
  405 + import {batchRemoveUser} from "../../api/user";
393 406
394 export default { 407 export default {
395 name: "dispatch_api", 408 name: "dispatch_api",
@@ -527,7 +540,10 @@ @@ -527,7 +540,10 @@
527 addDispatchNodeFormVisible: false, 540 addDispatchNodeFormVisible: false,
528 //控制编辑调度记录明细，对话框的显示与隐藏 541 //控制编辑调度记录明细，对话框的显示与隐藏
529 viewDialogVisible: false, 542 viewDialogVisible: false,
  543 + //记录的总条数
530 total: 0, 544 total: 0,
  545 + /* 批量删除的选中列表 */
  546 + sels: [],
531 /* 列表加载 */ 547 /* 列表加载 */
532 listLoading: false, 548 listLoading: false,
533 /* 添加加载 */ 549 /* 添加加载 */
@@ -683,7 +699,7 @@ @@ -683,7 +699,7 @@
683 * 管理员端，删除车辆调度记录 699 * 管理员端，删除车辆调度记录
684 */ 700 */
685 removeDispatchNode(index, row) { 701 removeDispatchNode(index, row) {
686 - //弹框询问是否取消车辆调度 702 + //弹框询问是否删除车辆调度记录
687 this.$confirm('此操作永久删除该车辆调度记录, 是否继续?', '警告', { 703 this.$confirm('此操作永久删除该车辆调度记录, 是否继续?', '警告', {
688 confirmButtonText: '确定删除', 704 confirmButtonText: '确定删除',
689 cancelButtonText: '取消', 705 cancelButtonText: '取消',
@@ -705,7 +721,8 @@ @@ -705,7 +721,8 @@
705 this.delLoading = false; 721 this.delLoading = false;
706 this.$message.error(error.toString()); 722 this.$message.error(error.toString());
707 }); 723 });
708 - }).catch(); 724 + }).catch(() => {
  725 + });
709 }, 726 },
710 /** 727 /**
711 * 管理员端，编辑车辆调度记录 728 * 管理员端，编辑车辆调度记录
@@ -777,6 +794,45 @@ @@ -777,6 +794,45 @@
777 this.$message.error(error.toString()); 794 this.$message.error(error.toString());
778 }); 795 });
779 }, 796 },
  797 + /**
  798 + * 批量删除，之前的选中
  799 + */
  800 + selsChange: function (sels) {
  801 + this.sels = sels;
  802 + },
  803 + /**
  804 + * 批量删除功能
  805 + */
  806 + batchRemove() {
  807 + var ids = this.sels.map(item => item.id).toString();
  808 + console.log(ids);
  809 + //弹框询问是否批量删除选中的车辆调度记录
  810 + this.$confirm('此操作永久删除选中的车辆调度记录, 是否继续?', '警告', {
  811 + confirmButtonText: '确定删除',
  812 + cancelButtonText: '取消',
  813 + type: 'warning'
  814 + }
  815 + ).then(() => {
  816 + //开启加载
  817 + this.listLoading = true;
  818 + let params = {ids: ids};
  819 + batchRemoveDispatchNode(params).then(response => {
  820 + let res = response.data;
  821 + if (res.code !== '200') {
  822 + this.listLoading = false;
  823 + return this.$message.error('删除车辆调度记录，失败');
  824 + }
  825 + this.$message.success('删除车辆调度记录，成功！');
  826 + this.listLoading = false;
  827 + //刷新车辆调度记录列表
  828 + this.getDispatchNodeList();
  829 + }).catch(error => {
  830 + this.delLoading = false;
  831 + this.$message.error(error.toString());
  832 + });
  833 + }).catch(() => {
  834 + });
  835 + },
780 //监听，我要调度车辆，对话框的关闭事件 836 //监听，我要调度车辆，对话框的关闭事件
781 dispatchDialogClosed() { 837 dispatchDialogClosed() {
782 //重置对话框 838 //重置对话框
@@ -44,7 +44,9 @@ @@ -44,7 +44,9 @@
44 <!--驾驶员信息列表区域--> 44 <!--驾驶员信息列表区域-->
45 <div style="margin-top: 20px;"> 45 <div style="margin-top: 20px;">
46 <el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading" 46 <el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading"
  47 + @selection-change="selsChange"
47 element-loading-text="拼命加载中"> 48 element-loading-text="拼命加载中">
  49 + <el-table-column type="selection" width="55" align="center"></el-table-column>
48 <el-table-column type="index" align="center"></el-table-column> 50 <el-table-column type="index" align="center"></el-table-column>
49 <el-table-column label="姓名" prop="driverName" align="center" width="100"></el-table-column> 51 <el-table-column label="姓名" prop="driverName" align="center" width="100"></el-table-column>
50 <el-table-column label="联系方式" prop="driverMobile" align="center" width="130"></el-table-column> 52 <el-table-column label="联系方式" prop="driverMobile" align="center" width="130"></el-table-column>
@@ -88,6 +90,13 @@ @@ -88,6 +90,13 @@
88 </el-table> 90 </el-table>
89 <!--分页区域--> 91 <!--分页区域-->
90 <div style="margin-top: 10px"> 92 <div style="margin-top: 10px">
  93 + <el-row :gutter="24">
  94 + <el-col :span="5">
  95 + <el-button type="danger" icon="el-icon-delete" @click="batchRemove"
  96 + :disabled="this.sels.length===0">批量删除
  97 + </el-button>
  98 + </el-col>
  99 + <el-col :span="10" style="margin-top: 5px">
91 <el-pagination 100 <el-pagination
92 @size-change="handleSizeChange" 101 @size-change="handleSizeChange"
93 @current-change="handleCurrentChange" 102 @current-change="handleCurrentChange"
@@ -97,6 +106,8 @@ @@ -97,6 +106,8 @@
97 layout="total, sizes, prev, pager, next, jumper" 106 layout="total, sizes, prev, pager, next, jumper"
98 :total="total"> 107 :total="total">
99 </el-pagination> 108 </el-pagination>
  109 + </el-col>
  110 + </el-row>
100 </div> 111 </div>
101 </div> 112 </div>
102 </el-card> 113 </el-card>
@@ -249,7 +260,8 @@ @@ -249,7 +260,8 @@
249 selectDriverInfoList, 260 selectDriverInfoList,
250 insertDriverInfo, 261 insertDriverInfo,
251 updateDriverInfo, 262 updateDriverInfo,
252 - deleteDriverInfo, insertVehicleInfo, deleteVehicleInfo, updateVehicleInfo 263 + batchRemoveDriverInfo,
  264 + deleteDriverInfo,
253 } from "../../api/dispatch_api"; 265 } from "../../api/dispatch_api";
254 266
255 export default { 267 export default {
@@ -292,6 +304,10 @@ @@ -292,6 +304,10 @@
292 */ 304 */
293 total: 0, 305 total: 0,
294 /** 306 /**
  307 + * 批量删除的选中列表
  308 + */
  309 + sels: [],
  310 + /**
295 * 驾驶员信息列表 311 * 驾驶员信息列表
296 */ 312 */
297 driverInfoList: [], 313 driverInfoList: [],
@@ -501,7 +517,47 @@ @@ -501,7 +517,47 @@
501 this.delLoading = false; 517 this.delLoading = false;
502 this.$message.error(error.toString()); 518 this.$message.error(error.toString());
503 }); 519 });
504 - }).catch(); 520 + }).catch(() => {
  521 + });
  522 + },
  523 + /**
  524 + * 批量删除，之前的选中
  525 + */
  526 + selsChange: function (sels) {
  527 + this.sels = sels;
  528 + },
  529 + /**
  530 + * 批量删除功能
  531 + */
  532 + batchRemove() {
  533 + var ids = this.sels.map(item => item.id).toString();
  534 + console.log(ids);
  535 + //弹框询问是否批量删除选中的车辆调度记录
  536 + this.$confirm('此操作将永久删除，选中的驾驶员信息, 是否继续?', '警告', {
  537 + confirmButtonText: '确定删除',
  538 + cancelButtonText: '取消',
  539 + type: 'warning'
  540 + }
  541 + ).then(() => {
  542 + //开启加载
  543 + this.listLoading = true;
  544 + let params = {ids: ids};
  545 + batchRemoveDriverInfo(params).then(response => {
  546 + let res = response.data;
  547 + if (res.code !== '200') {
  548 + this.listLoading = false;
  549 + return this.$message.error('批量删除驾驶员信息，失败');
  550 + }
  551 + this.$message.success('批量删除驶员信息，成功！');
  552 + this.listLoading = false;
  553 + //刷新驾驶员信息列表
  554 + this.getDriverInfoList();
  555 + }).catch(error => {
  556 + this.delLoading = false;
  557 + this.$message.error(error.toString());
  558 + });
  559 + }).catch(() => {
  560 + });
505 }, 561 },
506 /** 562 /**
507 * 编辑驾驶员信息 563 * 编辑驾驶员信息
@@ -51,7 +51,9 @@ @@ -51,7 +51,9 @@
51 <!--车辆信息列表区域--> 51 <!--车辆信息列表区域-->
52 <div style="margin-top: 20px;"> 52 <div style="margin-top: 20px;">
53 <el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading" 53 <el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading"
  54 + @selection-change="selsChange"
54 element-loading-text="拼命加载中"> 55 element-loading-text="拼命加载中">
  56 + <el-table-column type="selection" width="55" align="center"></el-table-column>
55 <el-table-column type="index" align="center"></el-table-column> 57 <el-table-column type="index" align="center"></el-table-column>
56 <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120"> 58 <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
57 <template slot-scope="scope"> 59 <template slot-scope="scope">
@@ -107,6 +109,13 @@ @@ -107,6 +109,13 @@
107 </el-table> 109 </el-table>
108 <!--分页区域--> 110 <!--分页区域-->
109 <div style="margin-top: 10px"> 111 <div style="margin-top: 10px">
  112 + <el-row :gutter="24">
  113 + <el-col :span="5">
  114 + <el-button type="danger" icon="el-icon-delete" @click="batchRemove"
  115 + :disabled="this.sels.length===0">批量删除
  116 + </el-button>
  117 + </el-col>
  118 + <el-col :span="10" style="margin-top: 5px">
110 <el-pagination 119 <el-pagination
111 @size-change="handleSizeChange" 120 @size-change="handleSizeChange"
112 @current-change="handleCurrentChange" 121 @current-change="handleCurrentChange"
@@ -116,6 +125,8 @@ @@ -116,6 +125,8 @@
116 layout="total, sizes, prev, pager, next, jumper" 125 layout="total, sizes, prev, pager, next, jumper"
117 :total="total"> 126 :total="total">
118 </el-pagination> 127 </el-pagination>
  128 + </el-col>
  129 + </el-row>
119 </div> 130 </div>
120 </div> 131 </div>
121 </el-card> 132 </el-card>
@@ -194,7 +205,7 @@ @@ -194,7 +205,7 @@
194 :rules="editVehicleInfoFormRules" ref="editVehicleInfoFormRef" 205 :rules="editVehicleInfoFormRules" ref="editVehicleInfoFormRef"
195 :inline="true" align="center" 206 :inline="true" align="center"
196 style="background-color: #F5F7FA"> 207 style="background-color: #F5F7FA">
197 - <div > 208 + <div>
198 <br> 209 <br>
199 <el-form-item label="车牌号码：" prop="licensePlateNumber"> 210 <el-form-item label="车牌号码：" prop="licensePlateNumber">
200 <el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable 211 <el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable
@@ -278,6 +289,7 @@ @@ -278,6 +289,7 @@
278 selectVehicleInfoList, 289 selectVehicleInfoList,
279 insertVehicleInfo, 290 insertVehicleInfo,
280 updateVehicleInfo, 291 updateVehicleInfo,
  292 + batchRemoveVehicleInfo,
281 deleteVehicleInfo, deleteDispatchNote 293 deleteVehicleInfo, deleteDispatchNote
282 } from "../../api/dispatch_api"; 294 } from "../../api/dispatch_api";
283 295
@@ -311,6 +323,10 @@ @@ -311,6 +323,10 @@
311 */ 323 */
312 total: 0, 324 total: 0,
313 /** 325 /**
  326 + * 批量删除,选中列表
  327 + */
  328 + sels: [],
  329 + /**
314 * 车辆信息列表 330 * 车辆信息列表
315 */ 331 */
316 vehicleInfoList: [], 332 vehicleInfoList: [],
@@ -543,10 +559,50 @@ @@ -543,10 +559,50 @@
543 this.delLoading = false; 559 this.delLoading = false;
544 this.$message.error(error.toString()); 560 this.$message.error(error.toString());
545 }); 561 });
546 - }).catch(); 562 + }).catch(() => {
  563 + });
547 }, 564 },
548 565
549 /** 566 /**
  567 + * 批量删除，之前的选中
  568 + */
  569 + selsChange: function (sels) {
  570 + this.sels = sels;
  571 + },
  572 + /**
  573 + * 批量删除功能
  574 + */
  575 + batchRemove() {
  576 + var ids = this.sels.map(item => item.id).toString();
  577 + console.log(ids);
  578 + //弹框询问是否批量删除选中的车辆调度记录
  579 + this.$confirm('此操作永久删除选中的车辆信息, 是否继续?', '警告', {
  580 + confirmButtonText: '确定删除',
  581 + cancelButtonText: '取消',
  582 + type: 'warning'
  583 + }
  584 + ).then(() => {
  585 + //开启加载
  586 + this.listLoading = true;
  587 + let params = {ids: ids};
  588 + batchRemoveVehicleInfo(params).then(response => {
  589 + let res = response.data;
  590 + if (res.code !== '200') {
  591 + this.listLoading = false;
  592 + return this.$message.error('批量删除车辆信息，失败');
  593 + }
  594 + this.$message.success('批量删除车辆信息，成功！');
  595 + this.listLoading = false;
  596 + //刷新车辆信息列表
  597 + this.getVehicleInfoList();
  598 + }).catch(error => {
  599 + this.delLoading = false;
  600 + this.$message.error(error.toString());
  601 + });
  602 + }).catch(() => {
  603 + });
  604 + },
  605 + /**
550 * 管理员端，编辑车辆信息 606 * 管理员端，编辑车辆信息
551 */ 607 */
552 editVehicleInfo() { 608 editVehicleInfo() {