From 649f76187291a6613d7c2c026259a1122b066603 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 18:05:09 +0800
Subject: [PATCH] bug修复
---
src/components/experiment/checkTheReport/index.vue | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 37 deletions(-)
diff --git a/src/components/experiment/checkTheReport/index.vue b/src/components/experiment/checkTheReport/index.vue
index 72f4c28..3f4d022 100644
--- a/src/components/experiment/checkTheReport/index.vue
+++ b/src/components/experiment/checkTheReport/index.vue
@@ -5,28 +5,32 @@
</div>
<div class="center">
<h1>鍘熸潗鏂欐娴嬫姤鍛�</h1>
- <table>
+ <table height="30px">
<tr>
<td>鏉愭枡鍚嶇О</td>
- <td colspan="5"></td>
+ <td colspan="5">{{reportData.name}}</td>
</tr>
<tr>
<td>瑙勬牸鍨嬪彿</td>
- <td colspan="2"></td>
+ <td colspan="2">
+ {{reportData.specifications.split("-")[1]}}
+ </td>
<td>鏉愭枡鍘傚</td>
- <td colspan="2"></td>
+ <td colspan="2">{{reportData.supplier}}</td>
</tr>
<tr>
- <td>鏉愭枡鎵瑰彿</td>
- <td colspan="2"></td>
+ <td>鏉愭枡缂栧彿</td>
+ <td colspan="2">{{reportData.imCode}}</td>
<td>妫�娴嬬紪鍙�</td>
- <td colspan="2"></td>
+ <td colspan="2">{{reportData.insCode}}</td>
</tr>
<tr>
<td>妫�娴嬩緷鎹�</td>
- <td colspan="2"></td>
+ <td colspan="2">
+ {{reportData.specifications.split("-")[0]}}
+ </td>
<td>妫�娴嬬被鍒�</td>
- <td colspan="2"></td>
+ <td colspan="2">鍘熸潗鏂�</td>
</tr>
<tr>
<td>搴忓彿</td>
@@ -36,44 +40,78 @@
<td>妫�娴嬬粨鏋�</td>
<td>鍗曢」鍒ゆ柇</td>
</tr>
- <tr v-for="item in 15" :key="item">
- <td>{{item}}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <tr v-for="(item,index) in arr" :key="index">
+ <td>{{index+1}}</td>
+ <td>{{item.ipName}}</td>
+ <td>{{item.unit}}</td>
+ <td>{{item.required}}</td>
+ <td>{{item.testValue}}</td>
+ <td >
+ {{isIfState(item.testState) }}
+ </td>
</tr>
<tr>
- <td colspan="6">妫�楠岀粨璁猴細</td>
+ <td colspan="6">妫�楠岀粨璁猴細{{reportData.type == 1 ? "鍚堟牸" : "涓嶅悎鏍�"}}</td>
</tr>
<tr>
<td colspan="6">
- 娉細鈥溾垰鈥濊〃绀鸿椤圭洰鍚堟牸锛屸�溍椻�濊〃绀鸿椤圭洰涓嶅悎鏍尖�溾�斺�濊〃绀鸿椤圭洰涓嶈姹傛娴嬨��
+ 娉細鈥溾垰鈥濊〃绀鸿椤圭洰鍚堟牸锛屸�溍椻�濊〃绀鸿椤圭洰涓嶅悎鏍硷紝鈥溾�斺�濊〃绀鸿椤圭洰涓嶈姹傛娴嬨��
</td>
</tr>
</table>
- <el-row class="date-group" :gutter="20">
- <el-col :span="8">妫�娴嬨�佹棩鏈燂細<span>2023-08-25</span></el-col>
- <el-col :span="8">瀹℃牳銆佹棩鏈燂細<span>2023-08-25</span></el-col>
- <el-col :span="8">鎵瑰噯銆佹棩鏈燂細<span>2023-08-25</span></el-col>
+ <el-row class="date-group">
+ <p>妫�娴嬨�佹棩鏈燂細<span>{{reportData.createTime}}</span></p>
+ <p>瀹℃牳銆佹棩鏈燂細<span>{{reportData.checkTime}}</span></p>
</el-row>
<p class="footer">
- <span>缂栧彿:</span><span>ZTT/ICSRCP18-003</span>
- <span> 鍙戣鏃ユ湡:</span><span>2023-08-25</span>
- <span> 鍙戣閮ㄩ棬:</span><span>璐ㄩ噺閮�</span>
- <span> 淇濆瓨鏈熼檺:</span><span>闀挎湡</span>
+ <span>缂栧彿锛�</span><span>{{reportData.rcode}} </span>
+ <span>鍙戣鏃ユ湡锛�</span><span>{{now}} </span>
+ <span>淇濆瓨鏈熼檺锛�</span><span>闀挎湡</span>
</p>
</div>
</div>
</template>
<script>
export default({
+ name: 'Preview',
data() {
return {
logoSrc : require("@/assets/404_images/logo.png"),
+ now: new Date().toLocaleDateString(),
+ arr: []
}
- }
+ },
+ mounted(){
+ this.arr = this.reportData.products;
+ if(this.reportData.products.length < 10){
+ let size = this.reportData.products.length;
+ let num=10-size
+ for(let i=0;i< num;i++){
+ this.arr.push({
+ code: null,
+ ipName: "",
+ required: "",
+ testState: null,
+ testValue: "",
+ unit: ""})
+ }
+ }
+ },
+ methods:{
+ formatDate(val){
+ var dt = new Date(val);
+ let year = dt.getFullYear();
+ let month = (dt.getMonth() + 1).toString().padStart(2,'0');
+ let date = dt.getDate().toString().padStart(2,'0');
+ return `${year}-${month}-${date}`;
+ },
+ isIfState(val){
+ if(val===1)return "鈭�"
+ else if(val===null || val=== undefined) return null
+ else return "X"
+ }
+ },
+ props:["reportData"]
})
</script>
<style scoped lang="scss">
@@ -97,7 +135,6 @@
}
table{
width:100%;
- height:100vh;
border-collapse: collapse;
font-size: 18px;
}
@@ -105,21 +142,25 @@
border: 2px solid black;
}
tr,td,th{
- padding: 15px 20px;
+ padding: 15px 10px;
}
- .date-group .el-col{
- text-align: center;
- padding: 50px 0px;
- font-size: 18px;
+ .date-group{
+ width: 90%;
+ margin-left: 5%;
+ p{
+ width: 50%;
+ float: left;
+ text-align: center;
+ padding: 50px 0px;
+ font-size: 18px;
+ }
}
.footer{
- margin: 0;
- padding: 0;
width:90%;
margin-left: 5%;
- color: gray;
+ color: lightgray;
text-align: center;
- margin-top: 250px;
+ margin-top: 300px;
}
}
}
--
Gitblit v1.9.3