diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 8d4b528..d0610f0 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -255,7 +255,7 @@ - + diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue index d579d1b..73226bc 100644 --- a/src/views/business/stockOrderEditDistribution.vue +++ b/src/views/business/stockOrderEditDistribution.vue @@ -165,6 +165,7 @@ diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index d03fe32..e50232e 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -369,7 +369,7 @@ - + @@ -456,6 +456,7 @@ diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index bccffe0..6963dfd 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -363,7 +363,7 @@ @@ -443,6 +443,7 @@ diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 32e88ad..61da8ff 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -51,10 +51,11 @@ @@ -69,7 +70,7 @@ - - - 允许无库存出库 + 允许无库存出库 + @@ -259,6 +264,7 @@ diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index 9a8aa19..643dd9e 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -347,7 +347,7 @@ - + diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index 6b48b1b..b0de5af 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -235,7 +235,8 @@ - + @@ -343,11 +344,11 @@ diff --git a/src/views/inout/IOAdditionalOrder.vue b/src/views/inout/IOAdditionalOrder.vue index 170a597..e13cb6e 100644 --- a/src/views/inout/IOAdditionalOrder.vue +++ b/src/views/inout/IOAdditionalOrder.vue @@ -291,6 +291,7 @@ export default { locStorageCode: null, invWarehouseCode: null, id: "", + status: 5, mainAction: null, action: null, page: 1, @@ -343,6 +344,7 @@ export default { }, addType: "edit", deleteData: { + status: 5, id: "", }, erpCheckStatus: { @@ -447,11 +449,18 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - this.getList(); - this.$message({ - type: "success", - message: "删除成功!", - }); + + if (response.code == 20000) { + this.getList(); + this.$message({ + type: "success", + message: "删除成功!", + }); + } else if (response.code == 520) { + this.$message.error("补录单据列表已不存在该扫码单据!"); + this.getList(); + } + }) .catch(() => { }); diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index 7ef8ba2..6518151 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -414,7 +414,7 @@ export default { orderId: "", }, deleteData: { - id: "", + id: "", status: 2, }, idQuery: { id: "", @@ -700,12 +700,18 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - this.getList(); - this.refresgOrderDetail(); - this.$message({ - type: "success", - message: "删除成功!", - }); + if (response.code == 20000) { + this.getList(); + this.refresgOrderDetail(); + this.$message({ + type: "success", + message: "删除成功!", + }); + } else if (response.code == 520) { + this.$message.error("新增扫码单据列表已不存在该扫码单据!"); + this.getList(); + } + }) .catch(() => { }); diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index 2a2a0bd..e104bb9 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -299,6 +299,7 @@ export default { mainAction: null, action: null, page: 1, + status: 3, limit: 20, locStorageCode: this.$store.getters.locInvCode, invWarehouseCode: this.$store.getters.locSubInvCode, @@ -353,6 +354,7 @@ export default { }, deleteData: { id: "", + status: 3, }, dialogTableVisible: false, formLoading: false, @@ -473,11 +475,16 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - this.getList(); - this.$message({ - type: "success", - message: "删除成功!", - }); + if (response.code == 20000) { + this.getList(); + this.$message({ + type: "success", + message: "删除成功!", + }); + } else if (response.code == 520) { + this.$message.error("异常扫码单据列表已不存在该扫码单据!"); + this.getList(); + } }) .catch(() => { }); diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 504be5c..8ad3bec 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -359,6 +359,7 @@ export default { }, deleteData: { id: "", + status: 10, }, dialogTableVisible: false, formLoading: false, @@ -594,11 +595,18 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - this.getList(); - this.$message({ - type: "success", - message: "删除成功!", - }); + + if (response.code == 20000) { + this.getList(); + this.$message({ + type: "success", + message: "删除成功!", + }); + } else if (response.code == 520) { + this.$message.error("新增扫码单据列表已不存在该扫码单据!"); + this.getList(); + } + }) .catch(() => { }); diff --git a/src/views/inout/IOWaitOrder.vue b/src/views/inout/IOWaitOrder.vue index 4926f49..e2b4c06 100644 --- a/src/views/inout/IOWaitOrder.vue +++ b/src/views/inout/IOWaitOrder.vue @@ -81,7 +81,7 @@ @@ -199,294 +199,302 @@