Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

src/views/report/qcReport/israLineReport/index.vue

@@ -3,10 +3,11 @@
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
-			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
 			class="israLineReportTable1"
+			ref="israLineReportTable11"
+			id="israLineReportTable1"
 			:table-props="tableProp"
 			:table-data="tableData"
 			:span-method="objectSpanMethod"
@@ -199,6 +200,12 @@ export default {
 			}
 			this.tableData = part2Data;
 			this.getSpanArr(this.tableData);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.israLineReportTable11.doLayout('israLineReportTable1');
 		},
 		// 产线去重
 		uniqueLine(arr, prop) {