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

src/views/houseSelfCollect/weighingManagement.vue

@@ -185,8 +185,8 @@
         jjSelectPrintList: [],
         radio: 'A4',
         value2: [],
-        startDate: "",
-        endDate: "",
+        startDate: '',
+        endDate: '',
         excelPrintData: [],
         isExcelPrint: false,
       }
@@ -248,7 +248,7 @@
         var reader = new FileReader();
         //if (!FileReader.prototype.readAsBinaryString) {
         FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = "";
+          var binary = '';
           var rABS = false; //是否将文件读取为二进制字符串
           var pt = this;
           var wb; //读取完成的数据
@@ -418,7 +418,8 @@
       weightCheck(row, num) {
         console.log(this.cangid)
         // 质检是否是已确定状态
-        let _isGoweightCheck = this.isConfirmQuality(row)
+        // let _isGoweightCheck = this.isConfirmQuality(row)
+        let _isGoweightCheck = true
         if (_isGoweightCheck) {
           this.$router.push({
             path: 'weightCheck',

src/views/houseSelfCollect/weightCheck.vue

@@ -631,6 +631,9 @@
         // })
       },
       print() {
+        if(this.reader){
+          this.reader.cancel()
+        }
         if (!this.weighingList.grossWeight) {
           this.$message({
             message: '毛重不能为空',

src/views/warehouse/warehouseManagementGross.vue

@@ -1159,6 +1159,10 @@ export default {
     },
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -1774,6 +1778,10 @@ export default {
         })
     },
     temporaryStorage() {
+      
+        if(this.reader){
+          this.reader.cancel()
+        }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1235,6 +1235,10 @@ export default {
     },
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -957,6 +957,10 @@ export default {
     typeChange(e) {},
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',