diff --git a/src/api/inout/code.js b/src/api/inout/code.js index 00e2f2ce..a7d80d1d 100644 --- a/src/api/inout/code.js +++ b/src/api/inout/code.js @@ -34,6 +34,12 @@ export function findByOrderId(params) { }); } - +export function getCodeListForEdit(params){ + return axios({ + url: "/udiwms/inout/code/getCodeListForEdit", + method: "get", + params: params + }); +} diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue index 619f1033..6ab5ee24 100644 --- a/src/views/inout/IoEditOrder.vue +++ b/src/views/inout/IoEditOrder.vue @@ -56,7 +56,7 @@ 编辑 提交 - 取消 + + + + @@ -395,6 +409,7 @@ import {isBlank} from "@/utils/strUtil"; import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeList} from "@/api/inout/code"; +import IoEditOrderCodeDetail from "@/views/inout/IoEditOrderCodeDetail.vue"; const formJson = { @@ -408,7 +423,6 @@ export default { name: "IoEditOrder", data() { return { - showSearch: true, filterQuery: { billNo: null }, @@ -484,10 +498,11 @@ export default { let nowDate = new Date(time).getTime(); return (nowDate > endDate); } - } + }, + order: {}, + codeDialogVisible: false }; }, - components: {}, methods: { onReset() { this.$router.push({ @@ -500,9 +515,6 @@ export default { this.list = []; this.clearDetailList(); }, - hideSearch() { - this.showSearch = !this.showSearch; - }, handleSelectionChange(val) { this.currentRow = val; this.getOrderDetails(); @@ -576,7 +588,7 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { - + //TODO 待完善删除全部单据接口 }).catch(() => { }); } @@ -588,9 +600,6 @@ export default { this.editDialogVisible = true; } }, - cancelEdit() { - this.editDialogVisible = false; - }, updateOrderInfo() { if (isBlank(this.createTime)) { this.$message.warning("创建时间不能为空"); @@ -622,7 +631,7 @@ export default { type: "warning", }) .then(() => { - this.deleteOrders(rowId); + //TODO 待完善删除单条单据接口 }) .catch(() => { }); @@ -739,6 +748,10 @@ export default { this.resultTotal = 0; }); }, + showCodes(row) { + this.order.billNo = row.billNo; + this.codeDialogVisible = true; + }, }, filters: { statusFilterType(status) { @@ -755,6 +768,9 @@ export default { event.stopPropagation(); }; }, + components: { + IoEditOrderCodeDetail + }, created() { }, diff --git a/src/views/inout/IoEditOrderCodeDetail.vue b/src/views/inout/IoEditOrderCodeDetail.vue new file mode 100644 index 00000000..451f31c8 --- /dev/null +++ b/src/views/inout/IoEditOrderCodeDetail.vue @@ -0,0 +1,251 @@ + + + + +