From 53c5f6245ad3abcdfbaf92ce55f08ad39ab0968a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 10:07:42 +0800
Subject: [PATCH] modified: src/components/experiment/checkTheReport/index.vue modified: src/views/experiment/checkTheReport/index.vue
---
src/components/experiment/checkTheReport/index.vue | 11 +++++++----
src/views/experiment/checkTheReport/index.vue | 9 +++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/components/experiment/checkTheReport/index.vue b/src/components/experiment/checkTheReport/index.vue
index fe7d0f5..f6bbd14 100644
--- a/src/components/experiment/checkTheReport/index.vue
+++ b/src/components/experiment/checkTheReport/index.vue
@@ -26,7 +26,9 @@
</tr>
<tr>
<td>妫�娴嬩緷鎹�</td>
- <td colspan="2">{{reportData.specifications.split("-")[0]}}</td>
+ <td colspan="2">
+ {{reportData.specifications.split("-")[0]}}
+ </td>
<td>妫�娴嬬被鍒�</td>
<td colspan="2">鍘熸潗鏂�</td>
</tr>
@@ -44,7 +46,7 @@
<td>{{item.unit}}</td>
<td>{{item.required}}</td>
<td>{{item.testValue}}</td>
- <td>{{item.testState == 1 ? "鈭�" : "X"}}</td>
+ <td>{{item.testState === 1 ? "鈭�" : "X"}}</td>
</tr>
<tr>
<td colspan="6">妫�楠岀粨璁猴細{{reportData.type == 1 ? "鍚堟牸" : "涓嶅悎鏍�"}}</td>
@@ -60,8 +62,8 @@
<el-col :span="12">瀹℃牳銆佹棩鏈燂細<span>{{reportData.checkTime}}</span></el-col>
</el-row>
<p class="footer">
- <span>缂栧彿:</span><span>{{reportData.reportCode}}</span>
- <span> 鍙戣鏃ユ湡:</span><span>{{new Date() | formatDate}}</span>
+ <span>缂栧彿:</span><span>{{reportData.rcode}}</span>
+ <span> 鍙戣鏃ユ湡:</span><span>{{now}}</span>
<span> 淇濆瓨鏈熼檺:</span><span>闀挎湡</span>
</p>
</div>
@@ -72,6 +74,7 @@
data() {
return {
logoSrc : require("@/assets/404_images/logo.png"),
+ now: new Date().toLocaleDateString()
}
},
methods:{
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