修改

pages/endOrderSignBlood/endOrderSignBlood.vue

@@ -8,11 +8,11 @@
         <view class="text1"> 签到成功 </view>
       </view>
     </view>
-    
+
     <view class="Scanning_cont_cont">
        <view>您已到达{{queryObj.deptName}}，您需要交接血制品数量为 <text class="red fz58">{{dataList.bloodTotalCount}}</text></view>
     </view>
-    
+
     <view class="Scanning_top">
       <view class="title1">{{queryObj.deptName}}</view>
       <view>{{dataList.patientTotalCount}}人</view>
@@ -41,7 +41,7 @@
               <text class="newicon newicon-a-ziyuan3" :class="{active: v3.checked}"></text>
             </view>
           </view>
-          
+
           <view class="list_detail" v-if="v3.checked">
             <view class="list_detail_item" v-for="(v4, i4) of v3.children" :key="i4">
               <view class="list_detail_item_title">
@@ -133,7 +133,7 @@
             uni.showToast({
               icon: "none",
               title: "请配置血制品任务类型！",
-            }); 
+            });
            }
           }else{
             uni.showToast({
@@ -203,7 +203,7 @@
           mask: true,
         });
         let postData = {
-          "type": "blood",
+          "type": "bloodTake",
           "orderId": 0,
           "orderIds": this.queryObj.orderIds || undefined,
         };
@@ -237,7 +237,7 @@
         post('/transflow/scanInfo', {
           "code": "nb",
           "id": 0,
-          "type": "blood",
+          "type": "bloodTake",
           "deptOrderDetails": true,
           "orderIds": this.queryObj.orderIds,
           "deptId": this.queryObj.deptId,
@@ -251,7 +251,7 @@
               patientTotalCount: 0,
               children: [],
             };
-            
+
             for (let key2 in dataList) {
               let value2 = dataList[key2];
               console.log(value2);
@@ -314,83 +314,83 @@
     flex-direction: column;
     height: 100vh;
     background-color: #f5f7fb;
-    
+
     .ml16{
       margin-left: 16rpx;
     }
-    
+
     .blue{
       color: #49b856!important;
     }
-    
+
     .ellipsis{
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
     }
-    
+
     .flex1{
       flex: 1;
     }
-    
+
     .Scanning_top_top {
       .Scanning_top_icon {
         width: 140rpx;
         height: 140rpx;
         margin: 50rpx auto 40rpx;
         border-radius: 50%;
-        
+
         .speNum{
           text-align: center;
           font-size: 140rpx;
         }
-    
+
         .cubeic-ok {
           font-size: 140rpx;
           color: #35b34a;
         }
-    
+
         .cubeic-close {
           font-size: 140rpx;
           color: #ff3b53;
         }
       }
-    
+
       .Scanning_top_text {
         .text1 {
           font-size: 48rpx;
           text-align: center;
         }
-    
+
         .success_tips {
           color: red;
           font-size: 30rpx;
         }
       }
     }
-    
+
     .Scanning_cont_cont {
       padding-bottom: 50rpx;
       text-align: center;
       display: flex;
       flex-direction: column;
-      
+
       .fz58{
         font-size: 58rpx;
       }
-      
+
       .table_bodys{
         overflow-y: auto;
         flex: 1;
       }
-      
+
       .table_head{
         display: flex;
         margin-top: 50rpx;
         .ml16{
           margin-left: 16rpx;
         }
-        
+
         view {
           height: 110rpx;
           line-height: 1;
@@ -403,7 +403,7 @@
           align-items: center;
         }
       }
-      
+
       .table_body{
         background: #F3FAF7;
         border-radius: 8px;
@@ -423,7 +423,7 @@
         }
       }
     }
-    
+
 
     .Scanning_top {
       margin-top: 16rpx;
@@ -434,7 +434,7 @@
       display: flex;
       align-items: center;
       line-height: 1.1;
-      
+
       view{
         padding: 16rpx 20rpx;
         flex: 1;
@@ -450,11 +450,11 @@
       display: flex;
       flex-direction: column;
       overflow-y: auto;
-      
+
       .list{
         background-color: #fff;
         margin-top: 16rpx;
-        line-height: 1;        
+        line-height: 1;
         .list_top{
           display: flex;
           font-weight: bold;
@@ -462,7 +462,7 @@
           font-size: 30rpx;
           position: relative;
           padding-bottom: 16rpx;
-          
+
           .newicon-a-ziyuan7{
             position: absolute;
             left: 12rpx;
@@ -510,7 +510,7 @@
             }
           }
         }
-        
+
         .list_detail{
           border: 2rpx solid #C6C6C6;
           padding: 22rpx 30rpx 0;
@@ -525,14 +525,14 @@
               display: flex;
               align-items: center;
               justify-content: space-between;
-              
+
               .serialNumber{
                 font-size: 38rpx;
               }
             }
             .list_detail_item_content{
               padding: 0 17rpx;
-              
+
               view{
                 line-height: 35rpx;
                 margin-top: 17rpx;
@@ -540,12 +540,12 @@
                   margin-top: 9rpx;
                 }
               }
-              
+
               .zhi{
                 margin-left: 60rpx;
                 margin-right: 60rpx;
               }
-              
+
               .list_detail_item_content_status{
                 display: flex;
                 justify-content: flex-end;
@@ -566,7 +566,7 @@
       text-align: center;
       display: flex;
       justify-content: space-between;
-    
+
       view {
         height: 64rpx;
         flex: 1;

pages/startOrderSignBlood/startOrderSignBlood.vue

@@ -95,7 +95,7 @@
             uni.showToast({
               icon: "none",
               title: "请配置血制品任务类型！",
-            }); 
+            });
            }
           }else{
             uni.showToast({
@@ -165,7 +165,7 @@
           mask: true,
         });
         let postData = {
-          "type": "blood",
+          "type": "bloodTake",
           "orderId": 0,
           "orderIds": this.orderIds || undefined,
         };
@@ -205,7 +205,7 @@
         post('/transflow/scanInfo', {
           "code": "nb",
           "id": 0,
-          "type": "blood",
+          "type": "bloodTake",
           "deptOrder": true,
           "deptId": this.queryObj.deptId,
           "taskTypeId": this.queryObj.taskTypeId,
@@ -253,7 +253,7 @@
         height: 140rpx;
         margin: 50rpx auto 40rpx;
         border-radius: 50%;
-        
+
         .speNum{
           text-align: center;
           font-size: 140rpx;
@@ -288,19 +288,19 @@
       text-align: center;
       display: flex;
       flex-direction: column;
-      
+
       .table_bodys{
         overflow-y: auto;
         flex: 1;
       }
-      
+
       .table_head{
         display: flex;
         margin-top: 50rpx;
         .ml16{
           margin-left: 16rpx;
         }
-        
+
         view {
           height: 110rpx;
           line-height: 1;
@@ -313,7 +313,7 @@
           align-items: center;
         }
       }
-      
+
       .table_body{
         background: #F3FAF7;
         border-radius: 8px;
@@ -341,7 +341,7 @@
       text-align: center;
       display: flex;
       justify-content: space-between;
-    
+
       view {
         height: 64rpx;
         flex: 1;

pages/startOrderSignBloodDetail/startOrderSignBloodDetail.vue

@@ -28,7 +28,7 @@
               <text class="newicon newicon-a-ziyuan3" :class="{active: v3.checked}"></text>
             </view>
           </view>
-          
+
           <view class="list_detail" v-if="v3.checked">
             <view class="list_detail_item" v-for="(v4, i4) of v3.children" :key="i4">
               <view class="list_detail_item_title">
@@ -89,7 +89,7 @@
         post('/transflow/scanInfo', {
           "code": "nb",
           "id": 0,
-          "type": "blood",
+          "type": "bloodTake",
           "deptOrderDetails": true,
           "bloodIds": this.queryObj.bloodIds,
         }).then(res => {
@@ -102,7 +102,7 @@
               patientTotalCount: 0,
               children: [],
             };
-            
+
             for (let key2 in dataList) {
               let value2 = dataList[key2];
               console.log(value2);
@@ -165,21 +165,21 @@
     flex-direction: column;
     height: 100vh;
     background-color: #f5f7fb;
-    
+
     .ml16{
       margin-left: 16rpx;
     }
-    
+
     .blue{
       color: #49b856!important;
     }
-    
+
     .ellipsis{
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
     }
-    
+
     .flex1{
       flex: 1;
     }
@@ -193,7 +193,7 @@
       display: flex;
       align-items: center;
       line-height: 1.1;
-      
+
       view{
         padding: 16rpx 20rpx;
         flex: 1;
@@ -209,11 +209,11 @@
       display: flex;
       flex-direction: column;
       overflow-y: auto;
-      
+
       .list{
         background-color: #fff;
         margin-top: 16rpx;
-        line-height: 1;        
+        line-height: 1;
         .list_top{
           display: flex;
           font-weight: bold;
@@ -221,7 +221,7 @@
           font-size: 30rpx;
           position: relative;
           padding-bottom: 16rpx;
-          
+
           .newicon-a-ziyuan7{
             position: absolute;
             left: 12rpx;
@@ -269,7 +269,7 @@
             }
           }
         }
-        
+
         .list_detail{
           border: 2rpx solid #C6C6C6;
           padding: 22rpx 30rpx 0;
@@ -284,14 +284,14 @@
               display: flex;
               align-items: center;
               justify-content: space-between;
-              
+
               .serialNumber{
                 font-size: 38rpx;
               }
             }
             .list_detail_item_content{
               padding: 0 17rpx;
-              
+
               view{
                 line-height: 35rpx;
                 margin-top: 17rpx;
@@ -299,12 +299,12 @@
                   margin-top: 9rpx;
                 }
               }
-              
+
               .zhi{
                 margin-left: 60rpx;
                 margin-right: 60rpx;
               }
-              
+
               .list_detail_item_content_status{
                 display: flex;
                 justify-content: flex-end;
@@ -325,7 +325,7 @@
       text-align: center;
       display: flex;
       justify-content: space-between;
-    
+
       view {
         height: 64rpx;
         flex: 1;