打印

public/static/warehouseBatchPrint.html

@@ -5,6 +5,9 @@
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <title></title>
     <style>
+      body{
+        margin: 0;
+      }
       table tr th,
       table tr td {
         border: 2px solid #333333;
@@ -22,7 +25,7 @@
         width: 1000px;
         padding: 70px 20px 20px 20px;
         font-size: 18px;
-        height: calc(100vh - 7.5vh);
+        height:573px;
         top: 0;
         bottom: 0;
         left: 0;
@@ -80,7 +83,7 @@
         <div></div>
         <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
-        <div class="number">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
+        <div class="number" v-if="isEWPrint">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">出货单位</td>
@@ -102,29 +105,29 @@
             <td class="col col-bgc">类型</td>
             <td class="col" colspan="">{{item.type}}</td>
             <td class="col col-bgc">等级</td>
-            <td class="col"  colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+            <td class="col"  colspan="3">{{item.grade}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="">{{item.updateDate}}</td>
 
             <td class="col col-bgc">水分（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+            <td class="col">{{item.waterContent}}
             </td>
             <td class="col col-bgc">热损伤（%）</td>
-            <td class="col" colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+            <td class="col" colspan="3">{{item.jiaorenli}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+            <td class="col">{{item.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+            <td class="col">{{item.mildewGrain}}
             </td>
             <td class="col col-bgc">容量</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+            <td class="col">{{item.bulkDensity}}
             </td>
             <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+            <td class="col">{{item.imperfectGrain}}
             </td>
           </tr>
           <tr class="row">
@@ -158,7 +161,7 @@
         <div></div>
         <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
-        <div class="number">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
+        <div class="number" v-if="isEWPrint">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">出货单位</td>
@@ -180,29 +183,29 @@
             <td class="col col-bgc">类型</td>
             <td class="col" colspan="">{{item.type}}</td>
             <td class="col col-bgc">等级</td>
-            <td class="col"  colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+            <td class="col"  colspan="3">{{item.grade}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="">{{item.updateDate}}</td>
 
             <td class="col col-bgc">水分（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+            <td class="col">{{item.warehouseInOutDetail.waterContent}}
             </td>
             <td class="col col-bgc">热损伤（%）</td>
-            <td class="col" colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+            <td class="col" colspan="3">{{item.warehouseInOutDetail.jiaorenli}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+            <td class="col">{{item.warehouseInOutDetail.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+            <td class="col">{{item.warehouseInOutDetail.mildewGrain}}
             </td>
-            <td class="col col-bgc">容量</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+            <td class="col col-bgc">容重</td>
+            <td class="col">{{item.warehouseInOutDetail.bulkDensity}}
             </td>
             <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+            <td class="col">{{item.warehouseInOutDetail.imperfectGrain}}
             </td>
           </tr>
           <tr class="row">
@@ -269,24 +272,28 @@
         printSmall() {},
         printBig() {},
       },
-      mounted() {debugger
+      mounted() {
         let _ew = decodeURIComponent(this.getQueryVariable("selectEW"))
         let _ewdd = decodeURIComponent(this.getQueryVariable("selectEWDD"))
         if(_ew== 'true'){
            this.tableDataEW = JSON.parse(localStorage.getItem('ewWarehouseBatchPrint'))
              this.isEWPrint = true
+        }else{
+          this.isEWPrint = false
         }
         if(_ewdd== 'true'){
            this.tableDataEW = JSON.parse(localStorage.getItem('ewWarehouseBatchPrint'))
           this.isDDPrint = true
+        }else{
+          this.isDDPrint = false
         }
         this.tableData = JSON.parse(localStorage.getItem("warehouseBatchPrint"))
         console.log("打印数据", this.tableData)
         document.title = "粮食检斤单"
-        // window.print()
-        // window.onafterprint = function(event) {
-        //   window.history.back(-1)
-        // };
+        window.print()
+        window.onafterprint = function(event) {
+          window.history.back(-1)
+        };
       },
       watch: {}
     })

src/views/warehouse/warehouseManagementRecord.vue

@@ -495,7 +495,6 @@
         }
       },
       changeEw(e) {
-        debugger
         this.ddchecked = false
 
         if (e) {
@@ -514,32 +513,31 @@
         localStorage.setItem('ewWarehouseBatchPrint', JSON.stringify(_printList))
       },
       async typePrintClick() {
-        debugger
         this.printList = []
-        if (this.onePrint) {
-          sessionStorage.removeItem('ck_bd_printData')
-          getPrintInfo({
-              id: this.idPrint
-            })
-            .toPromise()
-            .then((response) => {
-              if (response) {
-                if (this.checked || this.ddchecked) {
-                  var arrayPrint = response
-                  // for (let i = 0; i < arrayPrint.length; i++) {
-                    // let _data = arrayPrint[i];
-                    arrayPrint.companyName = this.companyNameEW;
-                    arrayPrint.customer = this.ewCustomer
-                  // }
-                  localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
-                  window.open('../../../../static/weightCheckInOut.html?type=2')
-                  return
-                }
-                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
-                window.open('../../../../static/weightCheckInOut.html?type=2')
-              }
-            })
-        } else {
+        // if (this.onePrint) {
+        //   sessionStorage.removeItem('ck_bd_printData')
+        //   getPrintInfo({
+        //       id: this.idPrint
+        //     })
+        //     .toPromise()
+        //     .then((response) => {
+        //       if (response) {
+        //         if (this.checked || this.ddchecked) {
+        //           var arrayPrint = response
+        //           // for (let i = 0; i < arrayPrint.length; i++) {
+        //             // let _data = arrayPrint[i];
+        //             arrayPrint.companyName = this.companyNameEW;
+        //             arrayPrint.customer = this.ewCustomer
+        //           // }
+        //           localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
+        //           window.open('../../../../static/weightCheckInOut.html?type=2')
+        //           return
+        //         }
+        //         localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+        //         window.open('../../../../static/weightCheckInOut.html?type=2')
+        //       }
+        //     })
+        // } else {
           var count = 0
           for (var i = 0; i < this.modification.length; i++) {
             await getPrintInfo({
@@ -561,7 +559,7 @@
                 }
               })
           }
-        }
+        // }
 
 
 
@@ -625,7 +623,6 @@
           })
       },
       batchPrint() {
-        debugger
         this.printList = []
         if (this.modification.length == 0) {
           this.$message.error("请勾选要打印的条目！")
@@ -749,9 +746,28 @@
         this.value2 = [formatDate, nowData] // 默认赋值一年时间
       },
       print(row) {
-        this.onePrint = true
-        this.isShowPrintType = true
-        this.idPrint = row.id
+        // this.onePrint = true
+        // this.isShowPrintType = true
+        // this.idPrint = row.id
+         sessionStorage.removeItem('ck_bd_printData')
+          getPrintInfo({
+              id: row.id
+            })
+            .toPromise()
+            .then((response) => {
+              if (response) {
+                // if (this.checked || this.ddchecked) {
+                //   var arrayPrint = response
+                //     arrayPrint.companyName = this.companyNameEW;
+                //     arrayPrint.customer = this.ewCustomer
+                //   localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
+                //   window.open('../../../../static/weightCheckInOut.html?type=2')
+                //   return
+                // }
+                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+                window.open('../../../../static/weightCheckInOut.html?type=2')
+              }
+            })
 
       },
       //返回按钮