优化

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -359,9 +359,6 @@
 							line-height: 60rpx;
 							width: 50%;
 							border-bottom: 1rpx solid #E6E6E6;
-							&:last-child{
-								border-bottom: none;
-							}
 						}
 					}
         }

pages/checkAfterScanning/checkAfterScanning.vue

@@ -589,11 +589,11 @@
 	/deep/ .uni-collapse-item--border{
 		border-bottom-color: #fff !important;
 	}
-	
+
 	/deep/ .uni-collapse-item__title-arrow{
 		margin-right: 0 !important;
 	}
-	
+
   .checkAfterScanning {
     .checkAfterScanning_title {
       padding: 50rpx 0;
@@ -620,16 +620,16 @@
         font-weight: 700;
         // margin-top: 10rpx;
       }
-			
+
 			.underline{
 			  text-decoration: underline;
 			}
-			
+
 			.underline-item{
 				// text-decoration: underline;
 				// margin-right: 40rpx;
 			}
-			
+
       .page_item_cont_T {
         padding-top: 28rpx;
         padding-bottom: 28rpx;
@@ -638,7 +638,7 @@
 				border: 1px solid #CBCBCB;
 				border-radius: 10rpx;
 				padding: 20rpx;
-						
+
         .page_item_cont_title {
           height: 100%;
           font-size: 32rpx;
@@ -655,9 +655,6 @@
 							line-height: 60rpx;
 							width: 50%;
 							border-bottom: 1rpx solid #E6E6E6;
-							&:last-child{
-								border-bottom: none;
-							}
 						}
 					}
         }
@@ -671,14 +668,14 @@
           align-items: center;
         }
       }
-			
+
 			.page_item_cont_title_coll{
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				margin-right: 8rpx;
 			}
-			
+
       .page_item_cont_B {
         padding-top: 28rpx;
         margin-bottom: 28rpx;

pages/specimenChecking/specimenChecking.vue

@@ -730,9 +730,6 @@
 							line-height: 60rpx;
 							width: 50%;
 							border-bottom: 1rpx solid #E6E6E6;
-							&:last-child{
-								border-bottom: none;
-							}
 						}
 					}
         }

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -55,13 +55,13 @@
 						<view class="name" v-if="type === 'speTubeType'">
 						  {{item.tubeTypeName}}
 						</view>
-						
+
 						<view class="value" v-if="type === 'speTubeType'">
 						  <view>
 						    {{item.count}}
 						  </view>
 						</view>
-						
+
             <view class="value" v-if="type != 'speTubeType'">
               <view>
                 {{item.count}}
@@ -99,26 +99,7 @@
         type: '',//patient|speTubeType|specimenDesc
         queryObj: {}, //路由传递过来的数据
         taskTypeConfig: {}, //页面控制
-        typeList: {
-          "patient": {
-            id: -1,
-            name: '患者标本',
-            count: 0,
-            titleCount: 0,
-          },
-					"speTubeType":{
-						id: -3,
-						name: '试管类型',
-						count: 0,
-						titleCount: 0,
-					},
-          "specimenDesc": {
-            id: -2,
-            name: '检验项目',
-            count: 0,
-            titleCount: 0,
-          }
-        },
+        typeList: {},
         dataList: [],
         // 填写交接人工号弹窗model
         hosModels: {
@@ -155,21 +136,73 @@
           if (result.status == 200) {
             if(result.list.length){
               this.taskTypeConfig = result.list[0] || {};
-              
-              if(this.taskTypeConfig.speHandoverTubeType == 1){
-                // 患者
-                this.type = 'patient';
-              }else if(this.taskTypeConfig.speHandoverTubeType == 2){
-                // 试管类型
-                this.type = 'speTubeType';
-              }else if(this.taskTypeConfig.speHandoverTubeType == 3){
-                // 检验标本
-                this.type = 'specimenDesc';
+
+              if(this.taskTypeConfig.speExpandTube == 1){
+                this.typeList = {
+                  "patient": {
+                    id: -1,
+                    name: '患者标本',
+                    count: 0,
+                    titleCount: 0,
+                  },
+                  "speTubeType":{
+                    id: -3,
+                    name: '试管类型',
+                    count: 0,
+                    titleCount: 0,
+                  },
+                  "specimenDesc": {
+                    id: -2,
+                    name: '检验项目',
+                    count: 0,
+                    titleCount: 0,
+                  }
+                }
+
+                if(this.taskTypeConfig.speHandoverTubeType == 1){
+                  // 患者
+                  this.type = 'patient';
+                }else if(this.taskTypeConfig.speHandoverTubeType == 2){
+                  // 试管类型
+                  this.type = 'speTubeType';
+                }else if(this.taskTypeConfig.speHandoverTubeType == 3){
+                  // 检验标本
+                  this.type = 'specimenDesc';
+                }else{
+                  // 默认-患者
+                  this.type = 'patient';
+                }
               }else{
-                // 默认-患者
-                this.type = 'patient';
+                this.typeList = {
+                  "patient": {
+                    id: -1,
+                    name: '患者标本',
+                    count: 0,
+                    titleCount: 0,
+                  },
+                  "specimenDesc": {
+                    id: -2,
+                    name: '检验项目',
+                    count: 0,
+                    titleCount: 0,
+                  }
+                }
+
+                if(this.taskTypeConfig.speHandoverTubeType == 1){
+                  // 患者
+                  this.type = 'patient';
+                }else if(this.taskTypeConfig.speHandoverTubeType == 2){
+                  // 试管类型-默认患者
+                  this.type = 'patient';
+                }else if(this.taskTypeConfig.speHandoverTubeType == 3){
+                  // 检验标本
+                  this.type = 'specimenDesc';
+                }else{
+                  // 默认-患者
+                  this.type = 'patient';
+                }
               }
-              
+
               this.clickTab(this.type);
             }else{
               uni.showToast({
@@ -489,11 +522,11 @@
             border-bottom: none;
             flex-shrink: 0;
           }
-					
+
 					.underline{
 						text-decoration: underline;
 					}
-					
+
           .name,
           .value{
             padding: 0 40rpx;
@@ -515,7 +548,7 @@
       display: flex;
       justify-content: center;
 			padding: 0 20rpx;
-			
+
       .btn {
         height: 66rpx;
         flex: 1;