优化

src/views/modules/check/ibc-export.vue

@@ -12,40 +12,68 @@
         <!-- border="1" -->
         <table class="table-first" align="center" cellpadding="8" cellspacing="0" border="1"
                style="margin-top: 10px;font-family: SimSun,serif;font-size: medium;text-align: center;border-width: 1px 1px 0 0;">
-          <tbody align="center">
+          <tbody align="left">
           <tr>
-            <th style="width: 15%">供方单位</th>
-            <td style="width: 30%">{{dataForm.source}}</td>
-            <th style="width: 15%">批次号</th>
-            <td style="width: 40%">{{dataForm.batchNumber}}</td>
+            <td class="title" style="width: 15%">供方单位</td>
+            <td colspan="2" style="width: 30%">{{dataForm.source}}</td>
+            <td class="title" style="width: 15%">批次号</td>
+            <td colspan="3" style="width: 40%">{{dataForm.batchNumber}}</td>
           </tr>
           <tr>
-            <th style="width: 15%">产品名称</th>
-            <td style="width: 30%">{{dataForm.materialName}}</td>
-            <th style="width: 15%">产品图号</th>
-            <td style="width: 40%">{{dataForm.specifications}}</td>
+            <td class="title" style="width: 15%">产品名称</td>
+            <td colspan="2"  style="width: 30%">{{dataForm.materialName}}</td>
+            <td class="title" style="width: 15%">产品图号</td>
+            <td colspan="3" style="width: 40%">{{dataForm.specifications}}</td>
           </tr>
           <tr>
-            <th style="width: 15%">来料类型</th>
-            <td colspan="3" align="left">
+            <td class="title" style="width: 15%">来料类型</td>
+            <td colspan="6" align="left">
               <el-checkbox-group v-model="idsMaterial">
                 <!-- :style="item.id === 1?'margin-left: 30px':''" -->
-                <el-checkbox disabled class="my-cb"  v-for="(item,i) in optionsMaterial" :label="item.code" :key="item.code"><span style="color: #404040">{{item.value}}</span></el-checkbox>
+                <el-checkbox disabled class="my-cb"  v-for="item in optionsMaterial" :label="item.code" :key="item.code"><span style="color: #404040">{{item.value}}</span></el-checkbox>
               </el-checkbox-group>
             </td>
           </tr>
           <tr>
-            <th style="width: 15%">
+            <td class="title">
               检验设备
               （勾选）
-            </th>
-            <td colspan="3" align="left">
+            </td>
+            <td colspan="6" align="left">
               {{dataForm.detectionEquipment}}
             </td>
           </tr>
+          <tr>
+            <td class="title">序号</td>
+            <td class="title">检验项目</td>
+            <td class="title">技术指标</td>
+            <td class="title">实测记录</td>
+            <td class="title">交检数</td>
+            <td class="title">合格数</td>
+            <td class="title">备注</td>
+          </tr>
+          <tr v-for="(item,i) in checkList" :key="i + '+0001'">
+            <td>{{i+1}}</td>
+            <td>{{item.inspectionProject}}</td>
+            <td>{{item.technicalIndicators}}</td>
+            <td>{{item.measuredRecords}}</td>
+            <td>{{dataForm.cnt}}</td>
+            <td>{{dataForm.qualifiedCnt}}</td>
+            <td>{{item.notes}}</td>
+          </tr>
+          <tr>
+            <td class="title">检验结论：</td>
+            <td colspan="7">{{dataForm.conclusion}}</td>
+          </tr>
+          <tr>
+            <td class="title">检验员：</td>
+            <td colspan="2"><span>{{dataForm.creatorName}}</span>&emsp;<span>{{dataForm.approveDate}}</span></td>
+            <td class="title">审核：</td>
+            <td colspan="3">梁瑞伟&emsp;<span>{{dataForm.approveDate}}</span></td>
+          </tr>
           </tbody>
         </table>
-        <table class="table-data-list" align="center" cellpadding="8" cellspacing="0" border="1"
+        <!-- <table class="table-data-list" align="center" cellpadding="8" cellspacing="0" border="1"
                style="width:100%;font-family: SimSun,serif;font-size: medium;text-align: center;border-width: 0 1px 0 0">
           <thead>
           <tr>
@@ -59,7 +87,7 @@
           </tr>
           </thead>
           <tbody align="center">
-          <tr v-for="(item,i) in checkList">
+          <tr v-for="(item,i) in checkList" :key="i + '+0001'">
             <td>{{i+1}}</td>
             <td>{{item.inspectionProject}}</td>
             <td>{{item.technicalIndicators}}</td>
@@ -69,8 +97,8 @@
             <td>{{item.notes}}</td>
           </tr>
           </tbody>
-        </table>
-        <table class="table-conclusion" align="center" cellpadding="8" cellspacing="0" border="1"
+        </table> -->
+        <!-- <table class="table-conclusion" align="center" cellpadding="8" cellspacing="0" border="1"
                style="font-family: SimSun,serif;font-size: medium;text-align: center;border-width: 0 1px 1px 1px;width: 100%">
           <tbody align="left">
           <tr>
@@ -86,7 +114,7 @@
             <td>梁瑞伟&emsp;<span>{{dataForm.approveDate}}</span></td>
           </tr>
           </tbody>
-        </table>
+        </table> -->
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="onChose">取消</el-button>
@@ -179,4 +207,7 @@
     border-color: grey;
     border-width: 0;
   }
+  .title{
+    font-weight: bold;
+  }
 </style>

src/views/modules/check/ibc-export1.vue

@@ -30,7 +30,7 @@
           </tr>
           </thead>
           <tbody align="center">
-          <tr v-for="(item,i) in checkList">
+          <tr v-for="(item,i) in checkList" :key="i + '_key'">
             <td>{{i+1}}</td>
             <td>2021-11-28</td>
             <td>{{item.inspectionProject}}</td>