From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/components/experiment/template_testReport/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/experiment/template_testReport/index.vue b/src/components/experiment/template_testReport/index.vue
index f9bf7f2..fac5c2c 100644
--- a/src/components/experiment/template_testReport/index.vue
+++ b/src/components/experiment/template_testReport/index.vue
@@ -276,7 +276,7 @@
<span>澶囨敞</span><br>
<span>Remark </span>
</td>
- <td colspan="5"></td>
+ <td colspan="5">{{reportData.notes }}</td>
</tr>
<tr>
<td>
@@ -288,7 +288,7 @@
<span>妫�楠�</span><br>
<span>Tester</span>
</td>
- <td colspan="2"></td>
+ <td colspan="2">{{ reportData.iUserName }}</td>
</tr>
<tr>
<td>
@@ -454,21 +454,21 @@
</td>
</tr>
</thead>
- <tr v-for="(item, index) in table" :key="index">
+ <tr v-for="(item, index) in reportData.equipment" :key="index">
<td>
- <span>{{ item.id }}</span>
+ <span>{{ item.eId }}</span>
</td>
<td colspan="2">
- <span>{{ item.equipment_name }}</span>
+ <span>{{ item.eName }}</span>
</td>
<td>
- <span>{{ item.type }}</span><br>
+ <span>{{ item.eType }}</span><br>
</td>
<td colspan="2">
- <span>{{ item.factory_number }}</span>
+ <span>{{ item.eCode }}</span>
</td>
<td colspan="2">
- <span>{{ item.validity }}</span>
+ <span>{{ item.validty }}</span>
</td>
</tr>
</table>
--
Gitblit v1.9.3