王勇 / dispatch_sys_vue · 提交

转到一个项目

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

执行状态不可删除

内嵌 并排对比
正在显示 4 个修改的文件 包含 51 行增加 和 16 行删除
... ... @@ -646,10 +646,10 @@
getUser(param).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error('请刷新一下界面！');
return this.$message.error('网络异常，请刷新界面！');
}
if (res.data.list.length === 0) {
return this.$message.error('请刷新一下界面！');
return this.$message.error('网络异常，请刷新界面！');
}
if (res.data.list[0].mobilephone === null || res.data.list[0].mobilephone === '') {
return this.$message.error('请填写您的手机号码');
... ...
... ... @@ -65,7 +65,7 @@
:row-class-name="rowStatus"
@selection-change="selsChange"
element-loading-text="拼命加载中">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="selection" width="55" :selectable="isSelectable" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column>
<el-table-column label="联系方式" prop="userMobile" align="center" width="120"></el-table-column>
... ... @@ -122,6 +122,7 @@
style="margin-left: 1px;">
<el-button type="danger" icon="el-icon-delete" size="mini" style="width:97px"
:loading="delLoading"
:disabled="scope.row.status==='2'"
@click.native.prevent="removeDispatchNode(scope.$index,scope.row)">删除
</el-button>
</el-tooltip>
... ... @@ -816,6 +817,16 @@
this.sels = sels;
},
/**
* 车辆状态为执行状态的时候，无法被选中
*/
isSelectable(row, index) {
if (row.status === '2') {
return false;
} else {
return true;
}
},
/**
* 批量删除功能
*/
batchRemove() {
... ...
... ... @@ -46,7 +46,7 @@
<el-table :data="driverInfoList" border stripe highlight-current-row v-loading="listLoading"
@selection-change="selsChange"
element-loading-text="拼命加载中">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="selection" width="55" :selectable="isSelectable" align="center"></el-table-column>
<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>
... ... @@ -82,6 +82,7 @@
<el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
<el-button type="danger" icon="el-icon-delete" size="mini"
:loading="delLoading"
:disabled="scope.row.driverStatus==='2'"
@click="removeDriverInfo(scope.$index,scope.row)">删除
</el-button>
</el-tooltip>
... ... @@ -537,6 +538,16 @@
this.sels = sels;
},
/**
* 驾驶员状态为执行状态的时候，无法被选中
*/
isSelectable(row, index) {
if (row.driverStatus === '2') {
return false;
} else {
return true;
}
},
/**
* 批量删除功能
*/
batchRemove() {
... ...
... ... @@ -53,7 +53,8 @@
<el-table :data="vehicleInfoList" border stripe highlight-current-row v-loading="listLoading"
@selection-change="selsChange"
element-loading-text="拼命加载中">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="selection" width="55" :selectable="isSelectable"
align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
<template slot-scope="scope">
... ... @@ -67,15 +68,6 @@
</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>
<span v-if="scope.row.isTrailer ==='2'">没有挂车</span>
</template>
</el-table-column>
<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>
... ... @@ -85,6 +77,16 @@
<span v-if="scope.row.vehicleStatus ==='5'">保养状态</span>
</template>
</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" 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"
... ... @@ -101,6 +103,7 @@
<el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
<el-button type="danger" icon="el-icon-delete" size="mini"
:loading="delLoading"
:disabled="scope.row.vehicleStatus==='2'"
@click="removeVehicleInfo(scope.$index,scope.row)">删除
</el-button>
</el-tooltip>
... ... @@ -491,7 +494,7 @@
this.listLoading = true;
selectVehicleInfoList(this.queryInfo).then((response) => {
let res = response.data;
if (res.code !== '200'){
if (res.code !== '200') {
//关闭加载
this.listLoading = false;
return this.$message.error('获取车辆信息列表失败');
... ... @@ -521,7 +524,7 @@
insertVehicleInfo(this.addVehicleInfoForm).then((response) => {
let res = response.data;
//添加调度记录信息,失败
if (res.code !== '200'){
if (res.code !== '200') {
//关闭加载
this.addLoading = false;
return this.$message.error('添加车辆信息，失败');
... ... @@ -580,6 +583,16 @@
this.sels = sels;
},
/**
* 车辆状态为执行状态的时候，无法被选中
*/
isSelectable(row, index) {
if (row.vehicleStatus === '2') {
return false;
} else {
return true;
}
},
/**
* 批量删除功能
*/
batchRemove() {
... ...