Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/weightCheck.vue

@@ -605,9 +605,9 @@
       },
       cancel() {
 
-        if (this.reader) {
-          this.reader.cancel()
-        }
+        // if (this.reader) {
+        //   this.reader.cancel()
+        // }
         this.$router.push({
           path: 'weighingManagement'
         })
@@ -658,9 +658,9 @@
         // })
       },
       print() {
-        if (this.reader) {
-          this.reader.cancel()
-        }
+        // if (this.reader) {
+        //   this.reader.cancel()
+        // }
         if (!this.weighingList.grossWeight) {
           this.$message({
             message: '毛重不能为空',
@@ -788,9 +788,9 @@
                           grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
-                            if (this.reader) {
-                              this.reader.cancel()
-                            }
+                            // if (this.reader) {
+                            //   this.reader.cancel()
+                            // }
                             this.$notify.success({
                               title: '成功',
                               message: '保存成功',
@@ -817,9 +817,9 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',

src/views/warehouse/warehouseManagementGross.vue

@@ -1170,9 +1170,9 @@ export default {
     //提交按钮
     submit() {
       
-      if(this.reader){
-        this.reader.cancel()
-      }
+      // if(this.reader){
+      //   this.reader.cancel()
+      // }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -1752,9 +1752,9 @@ export default {
                   // this.deptBudgetList.netWeight = Math.round(this.dataList.netWeight*1000)
                   // this.deptBudgetList.pureWeight = Math.round(this.dataList.pureWeight*1000)
                   // this.deptBudgetList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$message.success('添加成功')
                   this.$router.push({
                     path: 'warehouseManagementList',
@@ -1789,9 +1789,9 @@ export default {
     },
     temporaryStorage() {
       
-        if(this.reader){
-          this.reader.cancel()
-        }
+        // if(this.reader){
+        //   this.reader.cancel()
+        // }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -2286,9 +2286,9 @@ export default {
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$message.success('保存成功')
                   this.$router.push({
                     path: 'warehouseManagementList',

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1248,9 +1248,9 @@ export default {
     //提交按钮
     submit() {
       
-      if(this.reader){
-        this.reader.cancel()
-      }
+      // if(this.reader){
+      //   this.reader.cancel()
+      // }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -1775,9 +1775,9 @@ export default {
                   this.dataList.deductionWeight = Math.round(
                     this.dataList.deductionWeight * 1000
                   )
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$message.success('提交成功')
                   this.$confirm(`是否打印磅单`, {
                     cancelButtonText: '取消',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -970,9 +970,9 @@ export default {
     //提交按钮
     submit() {
       
-      if(this.reader){
-        this.reader.cancel()
-      }
+      // if(this.reader){
+      //   this.reader.cancel()
+      // }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -1396,9 +1396,9 @@ export default {
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$message.success('提交成功')
                   this.$confirm(`是否打印磅单`, {
                     cancelButtonText: '取消',

src/views/warehouse/warehouseManagementTare.vue

@@ -1403,9 +1403,9 @@ export default {
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$message.success('保存成功')
                   this.$router.push({
                     path: 'warehouseManagementList',
@@ -1879,9 +1879,9 @@ export default {
             addstorageputList(this.deptBudgetList)
               .toPromise()
               .then((response) => {
-                if (this.reader) {
-                  this.reader.cancel()
-                }
+                // if (this.reader) {
+                //   this.reader.cancel()
+                // }
                 this.$message.success('添加成功')
                 this.$router.push({
                   path: 'warehouseManagementList',