fix(inspectionReport): 修复报告模板字段显示并补充检验内容列

src/views/inspectionReport/template/inspection_report2.vue

@@ -32,28 +32,28 @@
           >
             <span style="font-weight: bold; margin-right: 10px">表单编号:</span>
 
-            <span v-if="isView">
+            <span >
               {{ basicInfoData.reportNumber }}
             </span>
-            <span v-else>
+            <!-- <span v-else>
               <el-input
                 v-model="basicInfoData.reportNumber"
                 placeholder="请输入报告编号"
               ></el-input>
-            </span>
+            </span> -->
             <span style="font-weight: bold; margin-left: 3px">
               <span> 版本：</span>
 
-              <span v-if="isView">
+              <span >
                 {{ basicInfoData.version }}
               </span>
-              <span v-else>
+              <!-- <span v-else>
                 <el-input
                   style="width: 120px"
                   v-model="basicInfoData.version"
                   placeholder="请输入版本"
                 ></el-input>
-              </span>
+              </span> -->
             </span>
           </div>
         </el-col>

src/views/inspectionReport/template/inspection_report5.vue

@@ -32,28 +32,28 @@
           >
             <span style="font-weight: bold; margin-right: 10px">表单编号:</span>
 
-            <span v-if="isView">
+            <span>
               {{ basicInfoData.reportNumber }}
             </span>
-            <span v-else>
+            <!-- <span v-else>
               <el-input
                 v-model="basicInfoData.reportNumber"
                 placeholder="请输入报告编号"
               ></el-input>
-            </span>
+            </span> -->
             <span style="font-weight: bold; margin-left: 3px">
               <span> 版本：</span>
 
-              <span v-if="isView">
+              <span>
                 {{ basicInfoData.version }}
               </span>
-              <span v-else>
+              <!-- <span v-else>
                 <el-input
                   style="width: 120px"
                   v-model="basicInfoData.version"
                   placeholder="请输入版本"
                 ></el-input>
-              </span>
+              </span> -->
             </span>
           </div>
         </el-col>
@@ -93,7 +93,9 @@
         </tr>
         <tr>
           <td style="border: 1px solid #ccc; padding: 8px">供应商名称</td>
-          <td style="border: 1px solid #ccc; padding: 8px">{{}}</td>
+          <td style="border: 1px solid #ccc; padding: 8px">{{
+            basicInfoData.supplierName
+          }}</td>
           <td style="border: 1px solid #ccc; padding: 8px">抽检数量</td>
           <td style="border: 1px solid #ccc; padding: 8px"
             >{{ basicInfoData.sampleQuantity
@@ -159,6 +161,9 @@
           >
           <th style="border: 1px solid #ccc; padding: 8px">标准规定</th>
           <th style="border: 1px solid #ccc; padding: 8px">检验工具及编号</th>
+          <th style="border: 1px solid #ccc; padding: 8px; width: 90px"
+            >检测内容</th
+          >
           <th style="width: 80px; border: 1px solid #ccc; padding: 8px"
             >检验结果</th
           >
@@ -175,7 +180,12 @@
           <td style="border: 1px solid #ccc; padding: 8px">{{
             item.standardRegulations
           }}</td>
-          <td style="border: 1px solid #ccc; padding: 8px">{{ item.uns }}</td>
+          <td style="border: 1px solid #ccc; padding: 8px">{{
+            item.toolList?.map((item) => item.name + ' ' + item.code).join(',')
+          }}</td>
+          <td style="border: 1px solid #ccc; padding: 8px">{{
+            item.qualityResultContent
+          }}</td>
           <td style="border: 1px solid #ccc; padding: 8px">{{
             item.results
           }}</td>

src/views/inspectionReport/template/inspection_report6.vue

@@ -32,28 +32,28 @@
           >
             <span style="font-weight: bold; margin-right: 10px">表单编号:</span>
 
-            <span v-if="isView">
+            <span >
               {{ basicInfoData.reportNumber }}
             </span>
-            <span v-else>
+            <!-- <span v-else>
               <el-input
                 v-model="basicInfoData.reportNumber"
                 placeholder="请输入报告编号"
               ></el-input>
-            </span>
+            </span> -->
             <span style="font-weight: bold; margin-left: 3px">
               <span> 版本：</span>
 
-              <span v-if="isView">
+              <span>
                 {{ basicInfoData.version }}
               </span>
-              <span v-else>
+              <!-- <span v-else>
                 <el-input
                   style="width: 120px"
                   v-model="basicInfoData.version"
                   placeholder="请输入版本"
                 ></el-input>
-              </span>
+              </span> -->
             </span>
           </div>
         </el-col>
@@ -154,6 +154,9 @@
           >
           <th style="border: 1px solid #ccc; padding: 8px">标准规定</th>
           <th style="border: 1px solid #ccc; padding: 8px">检验工具及编号</th>
+          <th style="border: 1px solid #ccc; padding: 8px; width: 90px"
+            >检测内容</th
+          >
           <th style="width: 80px; border: 1px solid #ccc; padding: 8px"
             >检验结果</th
           >
@@ -170,7 +173,12 @@
           <td style="border: 1px solid #ccc; padding: 8px">{{
             item.standardRegulations
           }}</td>
-          <td style="border: 1px solid #ccc; padding: 8px">{{ item.uns }}</td>
+          <td style="border: 1px solid #ccc; padding: 8px">{{
+            item.toolList?.map((item) => item.name + ' ' + item.code).join(',')
+          }}</td>
+          <td style="border: 1px solid #ccc; padding: 8px">{{
+            item.qualityResultContent
+          }}</td>
           <td style="border: 1px solid #ccc; padding: 8px">{{
             item.results
           }}</td>