|
|
@ -32,6 +32,15 @@ |
|
|
|
@click="handleCancelBills()" |
|
|
|
>取消出库(支持批量) |
|
|
|
</el-button> |
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
size="mini" |
|
|
|
type="danger" |
|
|
|
v-model="listDeleteQuery.billNum" |
|
|
|
icon="el-icon-download" |
|
|
|
@click="handleDelete()" |
|
|
|
>删除出库单(支持批量) |
|
|
|
</el-button> |
|
|
|
<el-input |
|
|
|
v-model="searchContent" |
|
|
|
clearable |
|
|
@ -93,19 +102,13 @@ |
|
|
|
{{ scope.column.label }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="OutPutQty" |
|
|
|
label="出库数量" |
|
|
|
width="100"> |
|
|
|
<template slot-scope="list"> |
|
|
|
<el-input size="small" v-model="list.row.outPutQty" @change="handleEdit(list.$index, list.row)"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="state" |
|
|
|
:formatter="fieldFormatter" |
|
|
|
label="状态" |
|
|
|
width="100"> |
|
|
|
width="100" |
|
|
|
> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="操作" align="center"> |
|
|
|
<template slot-scope="list"> |
|
|
@ -134,7 +137,7 @@ |
|
|
|
:title="formTitle" |
|
|
|
width="700px" |
|
|
|
> |
|
|
|
<el-form |
|
|
|
<el-form |
|
|
|
ref="accountDatelist" |
|
|
|
:inline="true" |
|
|
|
:model="accountDatelist" |
|
|
@ -160,9 +163,7 @@ |
|
|
|
<el-button |
|
|
|
v-loading="formLoading" |
|
|
|
type="primary" |
|
|
|
|
|
|
|
@click="handleCreateBills()" |
|
|
|
|
|
|
|
>确认</el-button |
|
|
|
> |
|
|
|
</div> |
|
|
@ -230,6 +231,7 @@ export default { |
|
|
|
return {}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
listQuery: { |
|
|
|
Filters: [ |
|
|
|
{ |
|
|
@ -247,9 +249,18 @@ export default { |
|
|
|
version: "", |
|
|
|
guids: "", |
|
|
|
billNum: "", |
|
|
|
<<<<<<< .mine |
|
|
|
accountDate:"", |
|
|
|
branchId:"", |
|
|
|
outPutQty:"", |
|
|
|
======= |
|
|
|
accountDate: "", |
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> .theirs |
|
|
|
}, |
|
|
|
listDeleteQuery: { |
|
|
|
billNum: "", |
|
|
|
}, |
|
|
|
page: 1, |
|
|
|
JobversionValue: "", |
|
|
@ -261,9 +272,9 @@ export default { |
|
|
|
showExcelImport: false, |
|
|
|
tableHeight: document.documentElement.clientHeight - 230, |
|
|
|
isEdit: false, |
|
|
|
accountDatelist:{ |
|
|
|
accountDate:"" |
|
|
|
} |
|
|
|
accountDatelist: { |
|
|
|
accountDate: "", |
|
|
|
}, |
|
|
|
}; |
|
|
|
}, |
|
|
|
mounted() { |
|
|
@ -442,45 +453,94 @@ export default { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
print() { |
|
|
|
print() { |
|
|
|
this.dialogFormVisible = true; |
|
|
|
}, |
|
|
|
//出库单 |
|
|
|
handleCreateBills(row) { |
|
|
|
this.dialogFormVisible = true; |
|
|
|
this.listLoading = true; |
|
|
|
this.listOutPutQuery.guids = []; |
|
|
|
this.listOutPutQuery.version = this.customerInfo.version; |
|
|
|
this.listOutPutQuery.billNum = this.customerInfo.parentId; |
|
|
|
if (this.accountDatelist != "") { |
|
|
|
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; |
|
|
|
} |
|
|
|
//this.listOutPutQuery.accountDate = this.accountDatelist; |
|
|
|
console.log( |
|
|
|
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery) |
|
|
|
); |
|
|
|
this.listLoading = true; |
|
|
|
this.listOutPutQuery.guids = []; |
|
|
|
this.listOutPutQuery.version = this.customerInfo.version; |
|
|
|
this.listOutPutQuery.billNum = this.customerInfo.parentId; |
|
|
|
if (this.accountDatelist != "") { |
|
|
|
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; |
|
|
|
} |
|
|
|
//this.listOutPutQuery.accountDate = this.accountDatelist; |
|
|
|
console.log( |
|
|
|
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery) |
|
|
|
); |
|
|
|
|
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass", |
|
|
|
this.listOutPutQuery |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
const index = this.list.indexOf(row); |
|
|
|
this.$notify({ |
|
|
|
title: "成功", |
|
|
|
message: "生成成功", |
|
|
|
type: "success", |
|
|
|
duration: 2000, |
|
|
|
}); |
|
|
|
this.getList(); |
|
|
|
this.listLoading = false; |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.listLoading = false; |
|
|
|
}); |
|
|
|
}, |
|
|
|
//删除出库单 |
|
|
|
handleDelete(row) { |
|
|
|
var params = []; |
|
|
|
let myalert = ""; //声明变量,其变量必须在此声明后使用 |
|
|
|
if (row) { |
|
|
|
//单行 |
|
|
|
params.push(row.id); |
|
|
|
myalert = row.name; |
|
|
|
} else { |
|
|
|
//多选 |
|
|
|
this.multipleSelection.forEach((element) => { |
|
|
|
let id = element.id; |
|
|
|
params.push(id); |
|
|
|
}); |
|
|
|
myalert = "选中项"; |
|
|
|
} |
|
|
|
// if (this.listDeleteQuery != "") { |
|
|
|
// this.listQuery.billNum = this.listDeleteQuery.billNum; |
|
|
|
// } |
|
|
|
this.listDeleteQuery.billNum = this.listQuery.billNum ; |
|
|
|
console.log("单据号:" + JSON.stringify(this.listDeleteQuery)); |
|
|
|
this.$confirm("是否删除" + myalert + "?", "提示", { |
|
|
|
confirmButtonText: "确定", |
|
|
|
cancelButtonText: "取消", |
|
|
|
type: "warning", |
|
|
|
}) |
|
|
|
.then(() => { |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/settleaccount/wmsHQFSharePartoutput/WmsOutPutDelete", |
|
|
|
this.listDeleteQuery |
|
|
|
) |
|
|
|
|
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass", |
|
|
|
this.listOutPutQuery |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
const index = this.list.indexOf(row); |
|
|
|
this.$notify({ |
|
|
|
title: "成功", |
|
|
|
message: "生成成功", |
|
|
|
type: "success", |
|
|
|
duration: 2000, |
|
|
|
.then((response) => { |
|
|
|
const index = this.list.indexOf(row); |
|
|
|
this.$notify({ |
|
|
|
title: "成功", |
|
|
|
message: "删除成功", |
|
|
|
type: "success", |
|
|
|
duration: 2000, |
|
|
|
}); |
|
|
|
this.getList(); |
|
|
|
}); |
|
|
|
this.getList(); |
|
|
|
this.listLoading = false; |
|
|
|
this.dialogFormVisible = false; |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.listLoading = false; |
|
|
|
}); |
|
|
|
|
|
|
|
.catch(() => { |
|
|
|
this.$message({ |
|
|
|
type: "info", |
|
|
|
message: "已取消操作", |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
/** 刷新列表 */ |
|
|
|
handleHandle(data) { |
|
|
|