Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

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

@@ -49,11 +49,11 @@
           <thead>
           <tr>
             <th style="width: 50px">序号</th>
-            <th style="width: 100px">检验项目</th>
-            <th style="width: 100px">技术指标</th>
-            <th style="width: 100px">实测记录</th>
-            <th style="width: 100px">交检数</th>
-            <th style="width: 100px">合格数</th>
+            <th style="width: 20%">检验项目</th>
+            <th style="width: 20%">技术指标</th>
+            <th style="width: 20%">实测记录</th>
+            <th style="width: 80px">交检数</th>
+            <th style="width: 80px">合格数</th>
             <th style="width: auto">备注</th>
           </tr>
           </thead>
@@ -70,19 +70,19 @@
           </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">
+               style="font-family: SimSun,serif;font-size: medium;text-align: center;border-width: 0 1px 1px 1px;width: 100%">
           <tbody align="left">
           <tr>
-            <th colspan="4" style="width: 850px; text-align: left">检验结论：</th>
+            <th style="text-align: left; width: 200px">检验结论：</th>
           </tr>
           <tr>
             <td>{{dataForm.conclusion}}</td>
           </tr>
           <tr>
-            <th style="width: 100px">检验员：</th>
-            <td style="width: 350px"><span>{{dataForm.creatorName}}</span>&emsp;<span>{{dataForm.approveDate}}</span></td>
-            <th style="width: 80px">审核：</th>
-            <td colspan="0">梁瑞伟&emsp;<span>{{dataForm.approveDate}}</span></td>
+            <th>检验员：</th>
+            <td><span>{{dataForm.creatorName}}</span>&emsp;<span>{{dataForm.approveDate}}</span></td>
+            <th>审核：</th>
+            <td>梁瑞伟&emsp;<span>{{dataForm.approveDate}}</span></td>
           </tr>
           </tbody>
         </table>

src/views/modules/check/product-check.vue

@@ -27,7 +27,7 @@
         prop="productName"
         header-align="center"
         align="center"
-        min-width="200"
+        min-width="160"
         :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
@@ -43,12 +43,16 @@
         prop="techName"
         header-align="center"
         align="center"
+        width="120"
+        :show-tooltip-when-overflow="true"
         label="工艺名称">
       </el-table-column>
       <el-table-column
         prop="stepName"
         header-align="center"
         align="center"
+        width="100"
+        :show-tooltip-when-overflow="true"
         label="工序号">
       </el-table-column>
       <el-table-column
@@ -61,18 +65,22 @@
         prop="recordsNote"
         header-align="center"
         align="center"
+        width="120"
+        :show-tooltip-when-overflow="true"
         label="记录说明">
       </el-table-column>
       <el-table-column
         prop="operation"
         header-align="center"
         align="center"
+        min-width="120"
         label="检验员">
       </el-table-column>
       <el-table-column
         prop="operationTime"
         header-align="center"
         align="center"
+        min-width="160"
         label="检验时间">
       </el-table-column>
       <el-table-column

src/views/modules/cus/communicate.vue

@@ -46,6 +46,7 @@
         prop="bizManagerName"
         header-align="center"
         align="center"
+        min-width="120"
         label="对接业务员">
       </el-table-column>
       <el-table-column
@@ -59,7 +60,7 @@
         prop="createTime"
         header-align="center"
         align="center"
-        min-width="140"
+        min-width="160"
         :show-tooltip-when-overflow="true"
         label="创建时间">
       </el-table-column>

src/views/modules/msg-center/approve.vue

@@ -60,7 +60,7 @@
         prop="createTime"
         header-align="center"
         align="center"
-        min-width="140"
+        min-width="160"
         :show-overflow-tooltip="true"
         label="申请时间">
       </el-table-column>
@@ -68,7 +68,7 @@
         prop="updateTime"
         header-align="center"
         align="center"
-        min-width="140"
+        min-width="160"
         :show-overflow-tooltip="true"
         label="更新时间">
       </el-table-column>
@@ -104,6 +104,7 @@
         label="处理意见">
       </el-table-column>
       <el-table-column
+        fixed="right"
         header-align="center"
         align="center"
         width="80"

src/views/modules/org/org.vue

@@ -48,6 +48,7 @@
         label="机构ID">
       </el-table-column> -->
       <el-table-column
+        fixed="right"
         header-align="center"
         align="center"
         width="150"