Browse Source

导出样式调整

chris 3 years ago
parent
commit
5dc4578da0

+ 1 - 1
src/views/common/login.vue

@@ -3,7 +3,7 @@
       <div class="site-content__wrapper">
         <div class="site-content">
           <div class="brand-info">
-            <h2 class="brand-info__text">重庆木之科技公司</h2>
+            <h2 class="brand-info__text">重庆木之科技有限公司</h2>
             <p class="brand-info__intro">即时生产ERP,服务于各类生产型企业</p>
           </div>
           <div class="login-main">

+ 1 - 1
src/views/modules/check/ibc-detail.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog
       title="详情"
-      width="80%"
+      width="70%"
       :close-on-click-modal="false"
       :visible.sync="visible">
       <div style="margin-left: 20px;margin-right: 20px">

+ 56 - 79
src/views/modules/check/ibc-export.vue

@@ -9,8 +9,8 @@
         <h1 style="text-align: center">入  厂  检  验  报  告</h1>
         <h4 style="text-align: right;margin-right: 100px;margin-top: 40px">编号: {{dataForm.inspectionCode}}</h4>
         <!-- border="1" -->
-        <table align="center" cellpadding="8" cellspacing="0" border="1"
-               style="margin-top: 10px;font-family: SimSun,serif;font-size: medium;text-align: center ">
+        <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">
           <el-row>
             <th style="width: 100px">供方单位</th>
@@ -29,7 +29,7 @@
             <td align="left" style="width: 750px">
               <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 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-group>
             </td>
           </el-row>
@@ -39,69 +39,48 @@
               {{dataForm.detectionEquipment}}
             </td>
           </el-row>
-          <el-table
-          :data="checkList"
-          border
-          style="width: 850px; padding-top: 1px">
-            <el-table-column
-              label="序号"
-              type="index"
-              align="center">
-            </el-table-column>
-            <el-table-column
-              prop="inspectionProject"
-              header-align="center"
-              align="center"
-              label="检验项目">
-            </el-table-column>
-            <el-table-column
-              prop="technicalIndicators"
-              header-align="center"
-              align="center"
-              label="技术指标">
-            </el-table-column>
-            <el-table-column
-              prop="measuredRecords"
-              header-align="center"
-              align="center"
-              label="实测记录">
-            </el-table-column>
-            <el-table-column
-              prop="-"
-              header-align="center"
-              align="center"
-              label="交检数">
-            </el-table-column>
-            <el-table-column
-              prop="-"
-              header-align="center"
-              align="center"
-              label="合格数">
-            </el-table-column>
-            <el-table-column
-              prop="notes"
-              header-align="center"
-              align="center"
-              label="备注">
-            </el-table-column>
-          </el-table>
-          <table align="center" cellpadding="8" cellspacing="0"
-                 style="margin-top: 10px;font-family: SimSun,serif;font-size: medium;text-align: center">
-            <tbody align="left">
-            <el-row>
-              <th style="width: 850px; text-align: left">检验结论:</th>
-            </el-row>
-            <el-row style="height: 200px">
-              <td>{{dataForm.conclusion}}</td>
-            </el-row>
-            <el-row>
-              <th style="width: 100px">检验员:</th>
-              <td style="width: 400px">{{dataForm.creatorName}}</td>
-              <th style="width: 80px">审核:</th>
-              <td style="width: 250px">梁瑞伟</td>
-            </el-row>
-            </tbody>
-          </table>
+          </tbody>
+        </table>
+        <table class="table-data-list" align="center" cellpadding="8" cellspacing="0" border="1"
+               style="font-family: SimSun,serif;font-size: medium;text-align: center;border-width: 0 1px 0 0">
+          <thead>
+          <tr>
+            <th style="width: 100px">序号</th>
+            <th style="width: 150px">检验项目</th>
+            <th style="width: 100px">技术指标</th>
+            <th style="width: 100px">实测记录</th>
+            <th style="width: 100px">交检数</th>
+            <th style="width: 100px">合格数</th>
+            <th style="width: 200px">备注</th>
+          </tr>
+          </thead>
+          <tbody align="center">
+          <tr v-for="(item,i) in checkList">
+            <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>
+          </tbody>
+        </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">
+          <tbody align="left">
+          <el-row>
+            <th style="width: 850px; text-align: left">检验结论:</th>
+          </el-row>
+          <el-row style="height: 200px">
+            <td>{{dataForm.conclusion}}</td>
+          </el-row>
+          <el-row>
+            <th style="width: 100px">检验员:</th>
+            <td style="width: 400px">{{dataForm.creatorName}}</td>
+            <th style="width: 80px">审核:</th>
+            <td style="width: 250px">梁瑞伟</td>
+          </el-row>
           </tbody>
         </table>
       </div>
@@ -168,18 +147,16 @@
     font-family: SimSun,serif;
     font-size: large;
   }
-  /*.my-table table, .my-table table tr, .my-table table th, .my-table table td{*/
-  /*  border: 1px solid black;*/
-  /*  !*border-collapse: collapse;*!*/
-  /*}*/
-  /*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
-  /*  border-color: black;*/
-  /*}*/
-  /*.el-table--border::after, .el-table--group::after, .el-table::before{*/
-  /*  background-color: #8a979e;*/
-  /*}*/
-
-  .el-table{
-    border-collapse: collapse;
+  .table-first td, .table-first th, .table-data-list th, .table-data-list td{
+    border-color: grey;
+    border-width: 0 0 1px 1px;
+  }
+  .table-conclusion td{
+    border-color: grey;
+    border-width: 0;
+  }
+  .table-conclusion th{
+    border-color: grey;
+    border-width: 0;
   }
 </style>