BUG修改

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,