Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/dispatch/modules/printMaterials.vue

@@ -36,7 +36,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="margin-top:10px;text-align:right" v-if="nowSelect == '检验报告'">
+        <div style="margin-top:10px;text-align:right" v-if="nowSelect == '检验报告' || nowSelect == '合格证'">
           <el-pagination
               background
               @size-change="handleSizeChange"
@@ -70,9 +70,9 @@ export default {
       param:{
         "id": 20221115104703,
         "content": {
-          "sa_orderid": 0,
           "pageNumber": 1,
           "pageSize": 20,
+          "size":100,
           "where": {
             "condition": ""
           }
@@ -111,6 +111,7 @@ export default {
         this.idName = 'sa_dispatchid'
         this.drawerTitle = '打印合格证'
         this.dataid = this.$route.query.id
+        // this.dataid = this.$route.query.id
       }
       this.queryReportId(type)
     },
@@ -136,12 +137,23 @@ export default {
     async listData(){
       this.param.content.sa_dispatchid = this.$route.query.id
       const res = await this.$api.requested(this.param)
-      let tableData = res.data.map(item=>{
-        return {
-          name:item.itemno + ' ' + item.itemname + '_检验报告',
-          sa_dispatch_itemsid:item.sa_dispatch_itemsid
-        }
-      })
+      let tableData = []
+      if (this.nowSelect == '合格证'){
+        tableData = res.data.map((item,index)=>{
+          return {
+            name:'合格证' + (index + 1),
+            startid:item.startid,
+            endid:item.endid
+          }
+        })
+      }else {
+        tableData = res.data.map(item=>{
+          return {
+            name:item.itemno + ' ' + item.itemname + '_检验报告',
+            sa_dispatch_itemsid:item.sa_dispatch_itemsid
+          }
+        })
+      }
       this.list = tableData
       this.total = res.total
       this.currentPage = res.pageNumber
@@ -169,7 +181,12 @@ export default {
         this.tool.showMessage(res,()=>{
         })
       }else {
-        this.printBtn()
+        this.param.id = 2025110115370902
+        this.param.content.pageNUmber = 1
+        this.drawer = true
+        this.loading = true
+        this.heightTable = 'calc(100vh - 160px)'
+        this.listData()
       }
     },
     async printBtn (data) {
@@ -188,7 +205,13 @@ export default {
 
         })
       }else {
-        window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`)
+        if (this.nowSelect == '合格证'){
+          // window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
+          window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
+        }else {
+          window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`)
+        }
+
         // window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`)
       }
     },