张丁 修复新增爆红、表格错位bug

ui/src/views/invoice/bookingworkticket/index.vue

@@ -113,7 +113,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="cancelQuery"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="bookingworkticketList" :span-method="mergeMethod"  @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable" class="table-fixed" :span-method="mergeMethod"  @selection-change="handleSelectionChange" :height="clientHeight" border>
 
       <el-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" width="100" :show-overflow-tooltip="true"/>
@@ -132,8 +132,8 @@
       <el-table-column label="作业类型" align="center" prop="workType" width="110" :formatter="workTypeFormat"/>
       <el-table-column label="风险等级" align="center" prop="riskLevel" width="60" :formatter="riskLevelFormat"/>
       <el-table-column label="作业内容描述" align="center" prop="workDescription" width="160":show-overflow-tooltip="true"/>
-      <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="70" :show-overflow-tooltip="true"/>
+      <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="70" :show-overflow-tooltip="true"/>
       <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" width="100" :show-overflow-tooltip="true"/>
        <el-table-column label="创建时间" align="center" prop="createdate" width="90">
@@ -142,7 +142,7 @@
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
-      <el-table-column label="票号"  align="center" prop="reservationNumber" width="170">
+      <el-table-column label="票号"  align="center" prop="reservationNumber" width="160">
          <template slot-scope="scope">
          <span>  {{scope.row.reservationNumber}}</span>
           <el-button
@@ -1002,6 +1002,7 @@ export default {
               this.open = false;
               this.getList();
               this.resetForm1();
+              this.cancel();
             });
 
 
@@ -1165,6 +1166,11 @@ export default {
             }
           }
         });
+         this.$nextTick(() => {
+        this.$refs.multipleTable.doLayout();
+
+        // table加ref="multipleTable" 表格不会错位 不对齐
+      });
         return {
           merge: spanArr
         };
@@ -1278,4 +1284,14 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+  .table-fixed {
+    /deep/ .el-table__fixed-right {
+      height: 100% !important; //设置高优先，以覆盖内联样式
+    }
+    /deep/ .el-table__fixed {
+      height: 100% !important; //设置高优先，以覆盖内联样式
+    }
+  }
+</style>