From 2d0a4264dfeff1641f99960cb1a4e3603ca6cd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Wed, 12 Jan 2022 11:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E4=BC=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20=E5=B7=B2=E7=A1=AE=E8=AE=A4=20=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=20=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=B1=E8=B4=A5=20=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 32 ++++++++++++++++- .../ux/billManage/kanBanWithCode/index.vue | 34 +++++++++++++++++-- .../ux/billManage/kanBanWithOutCode/index.vue | 34 +++++++++++++++++-- .../ux/billManage/kanbanOutOrder/detail.vue | 2 +- .../billManage/kanbanWithOutOrder/detail.vue | 2 +- .../views/ux/billManage/sparePart/index.vue | 34 +++++++++++++++++-- .../billManage/sparepartOutOrder/detail.vue | 2 +- .../views/ux/billManage/vwOutOrder/detail.vue | 2 +- 8 files changed, 131 insertions(+), 11 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 4a910c23..d5a1b27f 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -967,7 +967,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -975,7 +976,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ @@ -1041,6 +1056,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -1048,8 +1064,22 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } }); } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", + }); + return; + } if (this.isEdit == true) { this.$message({ message: diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index bd537c40..78b9a239 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -857,7 +857,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -865,7 +866,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ @@ -930,7 +945,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -938,7 +954,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ diff --git a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue index 1ac96886..cbbad397 100644 --- a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue @@ -857,7 +857,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -865,7 +866,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ @@ -930,7 +945,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -938,7 +954,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index 431c3b5e..d5ccde75 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -22,7 +22,7 @@ icon="el-icon-check" size="mini" @click="print()" - >确认出库单(支持批量)确认出库单 确认出库单(支持批量)确认出库单 { let state = element.fileName; @@ -965,7 +966,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ @@ -1030,7 +1045,8 @@ export default { }); return; } else { - var getbillNum = ""; + var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -1038,7 +1054,21 @@ export default { this.isEdit = true; getbillNum += state + ","; } + else if(element.stateName != "Succeeded"){ + this.isTaskSuccess=true; + getTaskState+=element.taskId; + } + }); + } + //任务不成功的不能单击确认 + if(this.isTaskSuccess == true){ + this.$message({ + message: + "有未成功的任务，不能单击确认！：" + + getTaskState.substr(0, getTaskState.length - 1), + type: "warning", }); + return; } if (this.isEdit == true) { this.$message({ diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index e6ac9e7f..ac9479fe 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -22,7 +22,7 @@ icon="el-icon-check" size="mini" @click="handleCreateBills()" - >确认出库单(支持批量)确认出库单 确认出库单(支持批量)确认出库单