合并卷操作

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,