From 95e69f4f64da7d09c28a232568b564762b44dc12 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Wed, 30 Mar 2022 18:33:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/yieldReport/com_merge_roll.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue index c74a3d7..9e1172a 100644 --- a/src/views/modules/yieldReport/com_merge_roll.vue +++ b/src/views/modules/yieldReport/com_merge_roll.vue @@ -131,6 +131,7 @@ export default { this.pageData.operatorId = operatorData.operatorId; this.pageData.newRollNo = ''; this.pageData.newRollQty = 0; + this.pageData.totalQty = 0; //执行获取页面参数的功能 this.refreshPageData(); //自动获取焦点 @@ -201,7 +202,13 @@ export default { this.pageData.newRollQty = 0;//重新赋值 return false; } - debugger; + //判断卷号是否相同 + if (this.pageData.rollNo === this.pageData.newRollNo) { + this.$message.error('相同卷号无法合并!'); + this.pageData.newRollNo = ''; + return false; + } + let requestData = { 'site': this.pageData.site, 'orderNo': this.pageData.orderNo, From ae8287b3dec97f094443cabaea1336a680359bb3 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Thu, 31 Mar 2022 14:33:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/schedule/order_schedule.vue | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index ce3efab..35a455c 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -1,13 +1,10 @@