ccjgmwz 3 年之前
父節點
當前提交
cf32bf0e94
共有 2 個文件被更改,包括 8 次插入4 次删除
  1. 5 4
      src/views/houseSelfCollect/weighingManagement.vue
  2. 3 0
      src/views/houseSelfCollect/weightCheck.vue

+ 5 - 4
src/views/houseSelfCollect/weighingManagement.vue

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

+ 3 - 0
src/views/houseSelfCollect/weightCheck.vue

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