王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 13e2ffedd56649629c7015d9a358ed745dbc3860 1 个父辈 11dae202

执行状态不可删除

内嵌 并排对比
正在显示 4 个修改的文件 包含 51 行增加 和 16 行删除
@@ -646,10 +646,10 @@ @@ -646,10 +646,10 @@
646 getUser(param).then((response) => { 646 getUser(param).then((response) => {
647 let res = response.data; 647 let res = response.data;
648 if (res.code !== '200') { 648 if (res.code !== '200') {
649 - return this.$message.error('请刷新一下界面！'); 649 + return this.$message.error('网络异常，请刷新界面！');
650 } 650 }
651 if (res.data.list.length === 0) { 651 if (res.data.list.length === 0) {
652 - return this.$message.error('请刷新一下界面！'); 652 + return this.$message.error('网络异常，请刷新界面！');
653 } 653 }
654 if (res.data.list[0].mobilephone === null || res.data.list[0].mobilephone === '') { 654 if (res.data.list[0].mobilephone === null || res.data.list[0].mobilephone === '') {
655 return this.$message.error('请填写您的手机号码'); 655 return this.$message.error('请填写您的手机号码');
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 :row-class-name="rowStatus" 65 :row-class-name="rowStatus"
66 @selection-change="selsChange" 66 @selection-change="selsChange"
67 element-loading-text="拼命加载中"> 67 element-loading-text="拼命加载中">
68 - <el-table-column type="selection" width="55" align="center"></el-table-column> 68 + <el-table-column type="selection" width="55" :selectable="isSelectable" align="center"></el-table-column>
69 <el-table-column type="index" align="center"></el-table-column> 69 <el-table-column type="index" align="center"></el-table-column>
70 <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>
71 <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>
@@ -122,6 +122,7 @@ @@ -122,6 +122,7 @@
122 style="margin-left: 1px;"> 122 style="margin-left: 1px;">
123 <el-button type="danger" icon="el-icon-delete" size="mini" style="width:97px" 123 <el-button type="danger" icon="el-icon-delete" size="mini" style="width:97px"
124 :loading="delLoading" 124 :loading="delLoading"
  125 + :disabled="scope.row.status==='2'"
125 @click.native.prevent="removeDispatchNode(scope.$index,scope.row)">删除 126 @click.native.prevent="removeDispatchNode(scope.$index,scope.row)">删除
126 </el-button> 127 </el-button>
127 </el-tooltip> 128 </el-tooltip>
@@ -816,6 +817,16 @@ @@ -816,6 +817,16 @@
816 this.sels = sels; 817 this.sels = sels;
817 }, 818 },
818 /** 819 /**
  820 + * 车辆状态为执行状态的时候，无法被选中
  821 + */
  822 + isSelectable(row, index) {
  823 + if (row.status === '2') {
  824 + return false;
  825 + } else {
  826 + return true;
  827 + }
  828 + },
  829 + /**
819 * 批量删除功能 830 * 批量删除功能
820 */ 831 */
821 batchRemove() { 832 batchRemove() {
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
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 @selection-change="selsChange"
48 element-loading-text="拼命加载中"> 48 element-loading-text="拼命加载中">
49 - <el-table-column type="selection" width="55" align="center"></el-table-column> 49 + <el-table-column type="selection" width="55" :selectable="isSelectable" align="center"></el-table-column>
50 <el-table-column type="index" align="center"></el-table-column> 50 <el-table-column type="index" align="center"></el-table-column>
51 <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>
52 <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>
@@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
82 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false"> 82 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
83 <el-button type="danger" icon="el-icon-delete" size="mini" 83 <el-button type="danger" icon="el-icon-delete" size="mini"
84 :loading="delLoading" 84 :loading="delLoading"
  85 + :disabled="scope.row.driverStatus==='2'"
85 @click="removeDriverInfo(scope.$index,scope.row)">删除 86 @click="removeDriverInfo(scope.$index,scope.row)">删除
86 </el-button> 87 </el-button>
87 </el-tooltip> 88 </el-tooltip>
@@ -537,6 +538,16 @@ @@ -537,6 +538,16 @@
537 this.sels = sels; 538 this.sels = sels;
538 }, 539 },
539 /** 540 /**
  541 + * 驾驶员状态为执行状态的时候，无法被选中
  542 + */
  543 + isSelectable(row, index) {
  544 + if (row.driverStatus === '2') {
  545 + return false;
  546 + } else {
  547 + return true;
  548 + }
  549 + },
  550 + /**
540 * 批量删除功能 551 * 批量删除功能
541 */ 552 */
542 batchRemove() { 553 batchRemove() {
@@ -53,7 +53,8 @@ @@ -53,7 +53,8 @@
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 @selection-change="selsChange"
55 element-loading-text="拼命加载中"> 55 element-loading-text="拼命加载中">
56 - <el-table-column type="selection" width="55" align="center"></el-table-column> 56 + <el-table-column type="selection" width="55" :selectable="isSelectable"
  57 + align="center"></el-table-column>
57 <el-table-column type="index" align="center"></el-table-column> 58 <el-table-column type="index" align="center"></el-table-column>
58 <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120"> 59 <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
59 <template slot-scope="scope"> 60 <template slot-scope="scope">
@@ -67,15 +68,6 @@ @@ -67,15 +68,6 @@
67 </el-table-column> 68 </el-table-column>
68 <el-table-column label="车牌号码" prop="licensePlateNumber" align="center" 69 <el-table-column label="车牌号码" prop="licensePlateNumber" align="center"
69 width="130"></el-table-column> 70 width="130"></el-table-column>
70 - <el-table-column label="车辆载重/Kg" prop="vehicleLoad" align="center"  
71 - width="110"></el-table-column>  
72 - <el-table-column label="挂车与否" prop="isTrailer" align="center" width="110">  
73 - <template slot-scope="scope">  
74 - <span v-if="scope.row.isTrailer ==='1'">有挂车</span>  
75 - <span v-if="scope.row.isTrailer ==='2'">没有挂车</span>  
76 - </template>  
77 - </el-table-column>  
78 - <el-table-column label="开始空闲时间" prop="freetime" align="center" width="160"></el-table-column>  
79 <el-table-column label="车辆状态" prop="vehicleStatus" align="center" width="100"> 71 <el-table-column label="车辆状态" prop="vehicleStatus" align="center" width="100">
80 <template slot-scope="scope"> 72 <template slot-scope="scope">
81 <span v-if="scope.row.vehicleStatus ==='1'">空闲状态</span> 73 <span v-if="scope.row.vehicleStatus ==='1'">空闲状态</span>
@@ -85,6 +77,16 @@ @@ -85,6 +77,16 @@
85 <span v-if="scope.row.vehicleStatus ==='5'">保养状态</span> 77 <span v-if="scope.row.vehicleStatus ==='5'">保养状态</span>
86 </template> 78 </template>
87 </el-table-column> 79 </el-table-column>
  80 + <el-table-column label="车辆载重/Kg" prop="vehicleLoad" align="center"
  81 + width="110"></el-table-column>
  82 + <el-table-column label="挂车与否" prop="isTrailer" align="center" width="110">
  83 + <template slot-scope="scope">
  84 + <span v-if="scope.row.isTrailer ==='1'">有挂车</span>
  85 + <span v-if="scope.row.isTrailer ==='2'">没有挂车</span>
  86 + </template>
  87 + </el-table-column>
  88 + <el-table-column label="开始空闲时间" prop="freetime" align="center" width="160"></el-table-column>
  89 +
88 <el-table-column label="车辆公司" prop="vehicleCompany" align="center" 90 <el-table-column label="车辆公司" prop="vehicleCompany" align="center"
89 width="200"></el-table-column> 91 width="200"></el-table-column>
90 <el-table-column label="行驶证号" prop="drivingLicenseNumber" align="center" 92 <el-table-column label="行驶证号" prop="drivingLicenseNumber" align="center"
@@ -101,6 +103,7 @@ @@ -101,6 +103,7 @@
101 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false"> 103 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
102 <el-button type="danger" icon="el-icon-delete" size="mini" 104 <el-button type="danger" icon="el-icon-delete" size="mini"
103 :loading="delLoading" 105 :loading="delLoading"
  106 + :disabled="scope.row.vehicleStatus==='2'"
104 @click="removeVehicleInfo(scope.$index,scope.row)">删除 107 @click="removeVehicleInfo(scope.$index,scope.row)">删除
105 </el-button> 108 </el-button>
106 </el-tooltip> 109 </el-tooltip>
@@ -491,7 +494,7 @@ @@ -491,7 +494,7 @@
491 this.listLoading = true; 494 this.listLoading = true;
492 selectVehicleInfoList(this.queryInfo).then((response) => { 495 selectVehicleInfoList(this.queryInfo).then((response) => {
493 let res = response.data; 496 let res = response.data;
494 - if (res.code !== '200'){ 497 + if (res.code !== '200') {
495 //关闭加载 498 //关闭加载
496 this.listLoading = false; 499 this.listLoading = false;
497 return this.$message.error('获取车辆信息列表失败'); 500 return this.$message.error('获取车辆信息列表失败');
@@ -521,7 +524,7 @@ @@ -521,7 +524,7 @@
521 insertVehicleInfo(this.addVehicleInfoForm).then((response) => { 524 insertVehicleInfo(this.addVehicleInfoForm).then((response) => {
522 let res = response.data; 525 let res = response.data;
523 //添加调度记录信息,失败 526 //添加调度记录信息,失败
524 - if (res.code !== '200'){ 527 + if (res.code !== '200') {
525 //关闭加载 528 //关闭加载
526 this.addLoading = false; 529 this.addLoading = false;
527 return this.$message.error('添加车辆信息，失败'); 530 return this.$message.error('添加车辆信息，失败');
@@ -580,6 +583,16 @@ @@ -580,6 +583,16 @@
580 this.sels = sels; 583 this.sels = sels;
581 }, 584 },
582 /** 585 /**
  586 + * 车辆状态为执行状态的时候，无法被选中
  587 + */
  588 + isSelectable(row, index) {
  589 + if (row.vehicleStatus === '2') {
  590 + return false;
  591 + } else {
  592 + return true;
  593 + }
  594 + },
  595 + /**
583 * 批量删除功能 596 * 批量删除功能
584 */ 597 */
585 batchRemove() { 598 batchRemove() {