朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 8bbac6b1b341b6e3dbd29c1f05b0a29f5ef01062 1 个父辈 a248716d

解决一傻逼 提出的无理要求

内嵌 并排对比
正在显示 3 个修改的文件 包含 63 行增加 和 6 行删除
... ... @@ -11,6 +11,8 @@ export const aisleList = params => {return http.get(`${base}/businesstype/aisleL
export const barCodeDel = params => {return http.get(`${base}/businesstype/barCodeDel`, params);};
export const forwarderBarCodeDel = params => {return http.get(`${base}/businesstype/forwarderBarCodeDel`, params);};
export const remove = params => {return http.get(`${base}/businesstype/remove`, params);};
export const save = params => {return axios.post(`${base}/businesstype/save`, params);};
... ...
... ... @@ -60,11 +60,11 @@
</el-table-column>
<el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效">
</el-table-column>
<el-table-column prop="trailerFrameNo" label="车牌号" width="100">
<el-table-column prop="trailerFrameNo" label="车牌号" width="90">
</el-table-column>
<el-table-column prop="agentname" label="挂靠单位">
</el-table-column>
<el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="100">
<el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="90">
</el-table-column>
<el-table-column prop="aisle" :formatter="aisleName" label="卡口" width="100">
</el-table-column>
... ... @@ -80,7 +80,7 @@
</el-table-column>
<el-table-column prop="cocode" label="货物类型">
</el-table-column>
<el-table-column prop="barcode" label="二维码编号" width="110">
<el-table-column prop="barcode" label="二维码编号" width="100">
</el-table-column>
<el-table-column prop="turnoverflag" :formatter="turnoverflagFormatter" label="进出场站">
</el-table-column>
... ... @@ -88,12 +88,13 @@
</el-table-column>
<el-table-column prop="updateDate" label="更新时间" width="155">
</el-table-column>
<el-table-column fixed="right" label="操作" width="150">
<el-table-column fixed="right" label="操作" width="245">
<template slot-scope="scope">
<el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
<!-- <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>-->
<!-- <el-button type="warning" disabled size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>-->
<el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
<el-button type="info" @click="forwarderDelete(scope.$index, scope.row)" size="mini">取消申请</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -360,7 +361,7 @@
</section>
</template>
<script>
import {list, aisleList, barCodeDel, remove, edit} from '../../api/remote_interface/byont_import';
import {list, aisleList, barCodeDel, remove, edit, forwarderBarCodeDel} from '../../api/remote_interface/byont_import';
import {getYardList as yartList} from "../../api/station_dispatch";
export default {
filters: {
... ... @@ -596,6 +597,44 @@
});
},
// 取消申请
forwarderDelete(index, row) {
this.$confirm('确认取消吗？', '提示', {}).then(() => {
let para = {
trailerFrameNo: row.trailerFrameNo,
barCode: row.barcode
}
forwarderBarCodeDel(para).then((res) =>{
if (res.data.code == 200){
this.$message({
message: res.data.msg,
type: 'success'
});
this.getList();
}else if (res.data.code == 201){
this.$message({
message: res.data.msg,
type: 'error'
});
}else if (res.data.code == 202){
this.$message({
message: res.data.msg,
type: 'error'
});
}
}).catch((error)=>{
this.$message({
message: error,
type: 'error'
});
});
}).catch(() =>{
});
},
// 删除
deleteClick(index, row){
this.$confirm('确认删除吗？', '提示', {}).then(() => {
... ...
... ... @@ -68,7 +68,6 @@
<el-input
type="text"
v-model="addForm.remark3"
maxlength="10"
show-word-limit
size="small" style="width: 180px">
</el-input>
... ... @@ -446,11 +445,28 @@
let _this = this;
this.$refs.addForm.validate((valid) => {
if (valid) {
// 调拨分拨 最少选择两个场站
if (this.addForm.businesstype == '分拨业务' || this.addForm.businesstype =='调拨业务'){
if (this.addForm.endstationList.length > 1){
console.log("222222")
this.$confirm('确认提交吗？', '提示', {}).then(() => {
_this.addsubmit();
}).catch(() =>{
});
}else {
this.$message({
message: '场站最少选择两个',
type: "error"
})
}
}else {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
_this.addsubmit();
}).catch(() =>{
});
}
} else {
console.log('error submit!!');
return false;
... ...