From 46a8a430cebd1862355f2c7042b817c9573d7aab Mon Sep 17 00:00:00 2001 From: "xunyu.guo" <916759660@qq.com> Date: Wed, 12 Jan 2022 11:27:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ux/vw/dataInput/hq_f_report/index.vue | 32 +++++++++++++++++++ .../ux/vw/dataInput/hq_f_sparepart/index.vue | 32 +++++++++++++++++++ .../ux/vw/dataInput/hq_h_report/index.vue | 17 +++++++++- .../ux/vw/dataInput/hq_h_sparepart/index.vue | 31 ++++++++++++++++++ .../ux/vw/dataInput/hq_m_report/index.vue | 32 +++++++++++++++++++ .../ux/vw/dataInput/hq_m_sparepart/index.vue | 32 +++++++++++++++++++ .../ux/vw/dataInput/hq_y_report/index.vue | 32 +++++++++++++++++++ 7 files changed, 207 insertions(+), 1 deletion(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue index e1620117..e45b7f1b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue @@ -688,6 +688,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -696,6 +697,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -703,8 +705,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: @@ -761,6 +777,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -769,6 +786,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -776,8 +794,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/vw/dataInput/hq_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index 35f8b5d3..44056b1b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue @@ -688,6 +688,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -696,6 +697,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -703,7 +705,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({ @@ -761,6 +777,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -769,6 +786,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -776,8 +794,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/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue index 274a223e..755986d7 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue @@ -717,7 +717,7 @@ export default { if(this.isTaskSuccess == true){ this.$message({ message: - "有未成功的任务，不能单机确认！：" + + "有未成功的任务，不能单击确认！：" + getTaskState.substr(0, getTaskState.length - 1), type: "warning", }); @@ -781,6 +781,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -789,6 +790,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -796,8 +798,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({ message: diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue index cbc6ebed..40c0ef78 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -688,6 +688,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -696,6 +697,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -703,8 +705,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: @@ -761,6 +777,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -769,6 +786,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -776,7 +794,20 @@ 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/vw/dataInput/hq_m_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue index c3577194..b0f96b94 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue @@ -690,6 +690,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -698,6 +699,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -705,7 +707,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({ @@ -765,6 +781,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -773,6 +790,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -780,8 +798,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/vw/dataInput/hq_m_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue index 244ddfd5..ff6aae67 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue @@ -688,6 +688,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -696,6 +697,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -703,8 +705,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: @@ -761,6 +777,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -769,6 +786,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -776,8 +794,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/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index 26ead6c5..21b355d0 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -689,6 +689,7 @@ export default { //已确认 handleConfirm(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -697,6 +698,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -704,7 +706,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({ @@ -762,6 +778,7 @@ export default { //出库单 handleCreateBills(row) { this.isEdit = false; + this.isTaskSuccess=false; if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -770,6 +787,7 @@ export default { return; } else { var getbillNum = ""; + var getTaskState=""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; @@ -777,8 +795,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: