Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

zouyu

2023-09-05 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff

 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>