From 694ffa950bf2435affef95272c7bfd6b62704639 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/checkTheReport/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index ab2d6ee..47cd9c1 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -60,7 +60,8 @@
<el-button type="primary" @click="printFun()">鎵撳嵃</el-button>
</span>
<div class="printStyle">
- <preview id="printDiv" :reportData="reportData"></preview>
+ <preview id="printDiv" :reportData="reportData" v-if="reportType===0"></preview>
+ <div v-else>鎴愬搧妫�娴嬫姤鍛�</div>
</div>
</el-dialog>
<div class="table-box">
@@ -186,6 +187,7 @@
data() {
return {
reportData: [],
+ reportType: 0,
searchData:{
sample_code:'',
reportCode:'',
@@ -217,6 +219,7 @@
//鏌ョ湅鎶ュ憡鎸夐挳
previewFun(row){
this.dialogVisible = true;
+ this.reportType = row.type;
this.queryReportByRCode(row.reportCode);
},
//鎵撳嵃鎸夐挳
@@ -295,6 +298,8 @@
}
}
.library-table {
+ height: 80vh;
+ overflow: scroll;
background-color: #fff;
flex: 1;
margin: 0px -15px;
@@ -324,7 +329,7 @@
}
.printStyle{
overflow: scroll;
- height:600px;
+ height:500px;
.el-button{
position: absolute;
top: 10vh;
--
Gitblit v1.9.3