Browse Source

拉取代码

maotao 3 months ago
parent
commit
8656f5b5bf

+ 2 - 0
src/app/views/batch-distribution/batch-distribution.component.less

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

+ 8 - 1
src/app/views/pathology-check/pathology-check.component.less

@@ -117,6 +117,8 @@
117
       }
117
       }
118
 			.error-class{
118
 			.error-class{
119
 				color: red;
119
 				color: red;
120
+				font-size: 18px;
121
+				font-weight: 600;
120
 				margin-left: 10px;
122
 				margin-left: 10px;
121
 			}
123
 			}
122
     }
124
     }
@@ -768,10 +770,13 @@
768
 							width: 300px;
770
 							width: 300px;
769
 						}
771
 						}
770
 						.error-class{
772
 						.error-class{
771
-							font-size: 14px;
772
 							color: red;
773
 							color: red;
774
+							font-size: 18px;
775
+							font-weight: 600;
773
 							position: absolute;
776
 							position: absolute;
774
 							right: 0;
777
 							right: 0;
778
+							height: 57px;
779
+							width: 38%;
775
 						}
780
 						}
776
 					}
781
 					}
777
 					
782
 					
@@ -993,6 +998,8 @@
993
 						}
998
 						}
994
 						.error-class{
999
 						.error-class{
995
 							color: red;
1000
 							color: red;
1001
+							font-size: 18px;
1002
+							font-weight: 600;
996
 							margin-left: 10px;
1003
 							margin-left: 10px;
997
 						}
1004
 						}
998
 					}
1005
 					}

+ 4 - 0
src/app/views/pathology-communication-book/pathology-communication-book.component.less

@@ -120,6 +120,8 @@
120
 				
120
 				
121
 				.error-class{
121
 				.error-class{
122
 					color: red;
122
 					color: red;
123
+					font-size: 18px;
124
+					font-weight: 600;
123
 					// width:280px;
125
 					// width:280px;
124
 				}
126
 				}
125
 			}
127
 			}
@@ -1064,6 +1066,8 @@
1064
 						}
1066
 						}
1065
 						.error-class{
1067
 						.error-class{
1066
 							color: red;
1068
 							color: red;
1069
+							font-size: 18px;
1070
+							font-weight: 600;
1067
 							margin-left: 10px;
1071
 							margin-left: 10px;
1068
 						}
1072
 						}
1069
 					}
1073
 					}

+ 2 - 0
src/app/views/pathology-sample/pathology-sample.component.less

@@ -122,6 +122,8 @@
122
       }
122
       }
123
 			.error-class{
123
 			.error-class{
124
 				color: red;
124
 				color: red;
125
+				font-size: 18px;
126
+				font-weight: 600;
125
 			}
127
 			}
126
     }
128
     }
127
 
129
 

+ 4 - 0
src/app/views/pathology/pathology.component.less

@@ -118,6 +118,8 @@
118
       }
118
       }
119
 			.error-class{
119
 			.error-class{
120
 				color: red;
120
 				color: red;
121
+				font-size: 18px;
122
+				font-weight: 600;
121
 				margin-left: 10px;
123
 				margin-left: 10px;
122
 			}
124
 			}
123
     }
125
     }
@@ -768,6 +770,8 @@
768
 						}
770
 						}
769
 						.error-class{
771
 						.error-class{
770
 							color: red;
772
 							color: red;
773
+							font-size: 18px;
774
+							font-weight: 600;
771
 							margin-left: 10px;
775
 							margin-left: 10px;
772
 						}
776
 						}
773
 					}
777
 					}

+ 9 - 0
src/app/views/pathologyScan/pathologyScan.component.less

@@ -117,6 +117,8 @@
117
       }
117
       }
118
 			.error-class{
118
 			.error-class{
119
 				color: red;
119
 				color: red;
120
+				font-size: 18px;
121
+				font-weight: 600;
120
 				margin-left: 10px;
122
 				margin-left: 10px;
121
 			}
123
 			}
122
     }
124
     }
@@ -758,8 +760,13 @@
758
 						}
760
 						}
759
 						.error-class{
761
 						.error-class{
760
 							color: red;
762
 							color: red;
763
+							font-size: 18px;
764
+							font-weight: 600;
761
 							position: absolute;
765
 							position: absolute;
762
 							right: 0;
766
 							right: 0;
767
+							height: 60px;
768
+							width: 38%;
769
+							text-align: left;
763
 						}
770
 						}
764
 					}
771
 					}
765
 					.df-center{
772
 					.df-center{
@@ -945,6 +952,8 @@
945
 						}
952
 						}
946
 						.error-class{
953
 						.error-class{
947
 							color: red;
954
 							color: red;
955
+							font-size: 18px;
956
+							font-weight: 600;
948
 							margin-left: 10px;
957
 							margin-left: 10px;
949
 						}
958
 						}
950
 					}
959
 					}

+ 4 - 0
src/app/views/specimen-room-view/specimen-room-view.component.less

@@ -116,6 +116,8 @@
116
       }
116
       }
117
 			.error-class{
117
 			.error-class{
118
 				color: red;
118
 				color: red;
119
+				font-size: 18px;
120
+				font-weight: 600;
119
 			}
121
 			}
120
 			.right-btn{
122
 			.right-btn{
121
 				position: absolute;
123
 				position: absolute;
@@ -825,6 +827,8 @@
825
 					.error-fix{
827
 					.error-fix{
826
 						margin-top: 10px;
828
 						margin-top: 10px;
827
 						color: red;
829
 						color: red;
830
+						font-size: 18px;
831
+						font-weight: 600;
828
 						text-align: center;
832
 						text-align: center;
829
 					}
833
 					}
830
 					.form-list{
834
 					.form-list{

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

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