|
|
@@ -55,7 +55,7 @@
|
|
|
:pageSize="pageSize"
|
|
|
:expandRowKeys="expandRowKeys"
|
|
|
>
|
|
|
- <el-table-column fixed="right" label="点后出入库详情" width="120">
|
|
|
+ <el-table-column fixed="right" label="操作" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button @click="detailclick1(scope.row)" type="text" size="small">
|
|
|
入库详情
|
|
|
@@ -63,6 +63,9 @@
|
|
|
<el-button @click="detailclick2(scope.row)" type="text" size="small">
|
|
|
出库详情
|
|
|
</el-button>
|
|
|
+ <el-button @click="detailclick3(scope.row)" type="text" size="small">
|
|
|
+ 手动清场
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column type="expand" width="1">
|
|
|
@@ -128,7 +131,7 @@ export default {
|
|
|
tableHead1:[
|
|
|
{
|
|
|
prop: "resultMaterialNumber",
|
|
|
- label: "入库吨位",
|
|
|
+ label: "点后入库吨位",
|
|
|
width: 150
|
|
|
},
|
|
|
{
|
|
|
@@ -140,12 +143,12 @@ export default {
|
|
|
tableHead2:[
|
|
|
{
|
|
|
prop: "resultMaterialNumber",
|
|
|
- label: "出库吨位",
|
|
|
+ label: "点后出库吨位",
|
|
|
width: 150
|
|
|
},
|
|
|
{
|
|
|
prop: "wagonNumber",
|
|
|
- label: "出库车皮数",
|
|
|
+ label: "点后出库车皮数",
|
|
|
width: 150
|
|
|
},
|
|
|
{
|
|
|
@@ -206,6 +209,29 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ detailclick3(row){
|
|
|
+ console.log("row",row);
|
|
|
+ this.$confirm('确认清场?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ this.axios.post("/api/v1/wmsh/clearWmshGridMaterial", row).then(res => {
|
|
|
+ console.log("res", res);
|
|
|
+ if(res.data.succeed){
|
|
|
+ this.$message.success("清场成功！");
|
|
|
+ this.onclick();
|
|
|
+ }else{
|
|
|
+ this.$message.error("清场失败！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '取消操作'
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
func(res) {
|
|
|
console.log("aaa" + res);
|
|
|
var resultActualInstallations = 0;
|
|
|
@@ -216,11 +242,13 @@ export default {
|
|
|
},
|
|
|
// 点击查询查看
|
|
|
onclick() {
|
|
|
- this.option.requestUrl =
|
|
|
+ let requestUrl=
|
|
|
"/api/v1/wmsh/getLoadPortStockList?apiId=158&i=" +
|
|
|
- new Date() +
|
|
|
- "&con=" +
|
|
|
- this.input;
|
|
|
+ new Date()
|
|
|
+ if(this.input){
|
|
|
+ requestUrl+="&con=" + this.input;
|
|
|
+ }
|
|
|
+ this.option.requestUrl =requestUrl;
|
|
|
},
|
|
|
onclick1() {
|
|
|
this.option2.requestUrl =
|
