Merge remote-tracking branch 'origin/master'

src/views/gp/contract/GpContract.vue

@@ -887,10 +887,10 @@
         }
       },
       headerStyle(){
-      	return 'background:none; border:0; margin:0; padding:0; line-height:24px; color:#6D779A; font-size:12px; text-align:center'
+      	return 'background:none; border:0; margin:0; padding:0; line-height:28px; color:#6D779A; font-size:12px; text-align:center'
       },
       cellStyle(){
-      	return 'background:none;color:#fff;border:0; margin:0; padding:0; line-height:25px; color:#AAB1D2; font-size:12px; text-align:center'
+      	return 'background:none;color:#fff;border:0; margin:0; padding:0; line-height:28px; color:#AAB1D2; font-size:12px; text-align:center'
       },
       yzbackto() {
         this.$router.push('/YSigning');
@@ -992,7 +992,7 @@
 	.el-table::before{background:none}
 	/deep/ .el-table th>.cell{ padding: 0 2px;}
 	/deep/ .el-table td>.cell{ padding: 0 2px;}
-	/deep/ .el-table__row{ height: 25px;}
+	/deep/ .el-table__row{ height: 28px;}
 	/deep/ .el-table, .el-table__expanded-cell{ background: none;}
 	/deep/ .lbname{ line-height: 24px; text-align: center;}
 	/deep/ .lbnamea{ line-height: 24px; text-align: center; text-decoration: underline;}