From 02f83a345368d062a5e6d33d91d85b94a5e586d1 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Sun, 20 Feb 2022 17:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=B7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/yieldReport/com_merge_roll.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index 652ab13..66407dd 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -169,6 +169,19 @@ export default {
 
     /*执行是否需要提示的操作*/
     warnMergeSfdcRollsConfirm() {
+      //首先判断数值是否通过判断
+      let newRollQty = this.pageData.newRollQty;
+      if (newRollQty == null || newRollQty == '') {
+        this.$message.error('请输入新卷数量!');
+        this.pageData.newRollQty = 0;//重新赋值
+        return false;
+      }
+
+      if (newRollQty <= 0 || !Number.isInteger(newRollQty)) {
+        this.$message.error('新卷数量必须是大于零的整数!');
+        this.pageData.newRollQty = 0;//重新赋值
+        return false;
+      }
       let requestData = {
         'site': this.pageData.site,
         'orderNo': this.pageData.orderNo,