Merge branch 'master' into develop

src/app/views/batch-distribution/batch-distribution.component.less

@@ -341,6 +341,8 @@
 					.error-fix{
 						margin-top: 10px;
 						color: red;
+						font-size: 18px;
+						font-weight: 600;
 						text-align: center;
 					}
 					.form-list{

src/app/views/pathology-check/pathology-check.component.less

@@ -117,6 +117,8 @@
       }
 			.error-class{
 				color: red;
+				font-size: 18px;
+				font-weight: 600;
 				margin-left: 10px;
 			}
     }
@@ -768,10 +770,13 @@
 							width: 300px;
 						}
 						.error-class{
-							font-size: 14px;
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							position: absolute;
 							right: 0;
+							height: 57px;
+							width: 38%;
 						}
 					}
 					
@@ -993,6 +998,8 @@
 						}
 						.error-class{
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							margin-left: 10px;
 						}
 					}

src/app/views/pathology-communication-book/pathology-communication-book.component.less

@@ -120,6 +120,8 @@
 				
 				.error-class{
 					color: red;
+					font-size: 18px;
+					font-weight: 600;
 					// width:280px;
 				}
 			}
@@ -1064,6 +1066,8 @@
 						}
 						.error-class{
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							margin-left: 10px;
 						}
 					}

src/app/views/pathology-sample/pathology-sample.component.less

@@ -122,6 +122,8 @@
       }
 			.error-class{
 				color: red;
+				font-size: 18px;
+				font-weight: 600;
 			}
     }
 

src/app/views/pathology/pathology.component.less

@@ -118,6 +118,8 @@
       }
 			.error-class{
 				color: red;
+				font-size: 18px;
+				font-weight: 600;
 				margin-left: 10px;
 			}
     }
@@ -768,6 +770,8 @@
 						}
 						.error-class{
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							margin-left: 10px;
 						}
 					}

src/app/views/pathologyScan/pathologyScan.component.less

@@ -117,6 +117,8 @@
       }
 			.error-class{
 				color: red;
+				font-size: 18px;
+				font-weight: 600;
 				margin-left: 10px;
 			}
     }
@@ -758,8 +760,13 @@
 						}
 						.error-class{
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							position: absolute;
 							right: 0;
+							height: 60px;
+							width: 38%;
+							text-align: left;
 						}
 					}
 					.df-center{
@@ -945,6 +952,8 @@
 						}
 						.error-class{
 							color: red;
+							font-size: 18px;
+							font-weight: 600;
 							margin-left: 10px;
 						}
 					}

src/app/views/specimen-room-view/specimen-room-view.component.less

@@ -116,6 +116,8 @@
       }
 			.error-class{
 				color: red;
+				font-size: 18px;
+				font-weight: 600;
 			}
 			.right-btn{
 				position: absolute;
@@ -825,6 +827,8 @@
 					.error-fix{
 						margin-top: 10px;
 						color: red;
+						font-size: 18px;
+						font-weight: 600;
 						text-align: center;
 					}
 					.form-list{

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -255,7 +255,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}else{
 					this.barCode = null
 					this.fixationError = null
-					this.searchMsg = '该申请单类型不是病理检查申请单'
+					this.searchMsg = '您扫描的是快速标本,' +'扫描结果: '+ '"' +this.codeData.pathologySpecimenDTOList[0].specimenCode +'"'
 				}
 				
 			}else{