seimin 1 年之前
父节点
当前提交
1e84b5b514

+ 9 - 7
pages/scanning_Result/scanning_Result.vue

@@ -14,7 +14,7 @@
14
         </view>
14
         </view>
15
       </view>
15
       </view>
16
     </view>
16
     </view>
17
-    
17
+
18
     <view class="Scanning_top" v-if="res.status == 11111">
18
     <view class="Scanning_top" v-if="res.status == 11111">
19
       <view class="Scanning_top_icon">
19
       <view class="Scanning_top_icon">
20
         <text class="cubeic-close icon_transport transport-shibai"></text>
20
         <text class="cubeic-close icon_transport transport-shibai"></text>
@@ -33,7 +33,7 @@
33
         <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容:{{queryObj.qrcode}} </view>
33
         <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容:{{queryObj.qrcode}} </view>
34
       </view>
34
       </view>
35
     </view>
35
     </view>
36
-    
36
+
37
     <view class="Scanning_cont" v-if="
37
     <view class="Scanning_cont" v-if="
38
         (res.status == 200 && type == 'specimenPlan') ||
38
         (res.status == 200 && type == 'specimenPlan') ||
39
         (res.status == 200 && type == 'specimen')
39
         (res.status == 200 && type == 'specimen')
@@ -48,7 +48,7 @@
48
       <view>患者姓名 : {{ infoDATA.patientName}}({{infoDATA.bedNum}})</view>
48
       <view>患者姓名 : {{ infoDATA.patientName}}({{infoDATA.bedNum}})</view>
49
       <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
49
       <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
50
     </view>
50
     </view>
51
-    
51
+
52
     <view class="Scanning_cont" v-if="
52
     <view class="Scanning_cont" v-if="
53
         (res.status == 11111 && type == 'specimenPlan') ||
53
         (res.status == 11111 && type == 'specimenPlan') ||
54
         (res.status == 11111 && type == 'specimen')
54
         (res.status == 11111 && type == 'specimen')
@@ -386,7 +386,9 @@
386
               let postType = "";
386
               let postType = "";
387
               if (this.type == "jPBag" || this.type == "drugsBag") {
387
               if (this.type == "jPBag" || this.type == "drugsBag") {
388
                 postType = "handleDrugsAndJp";
388
                 postType = "handleDrugsAndJp";
389
-                delete data.ids;
389
+                if(this.type == "drugsBag"){
390
+                  delete data.ids;
391
+                }
390
                 data.deptId = this.deptId;
392
                 data.deptId = this.deptId;
391
                 data.handover = this.handover;
393
                 data.handover = this.handover;
392
               }
394
               }
@@ -931,7 +933,7 @@
931
         margin-top: 116rpx;
933
         margin-top: 116rpx;
932
         border-radius: 50%;
934
         border-radius: 50%;
933
         line-height: 140rpx;
935
         line-height: 140rpx;
934
-        
936
+
935
         .speNum{
937
         .speNum{
936
           text-align: center;
938
           text-align: center;
937
           font-size: 140rpx;
939
           font-size: 140rpx;
@@ -1013,12 +1015,12 @@
1013
       display: flex;
1015
       display: flex;
1014
       justify-content: space-between;
1016
       justify-content: space-between;
1015
       flex-wrap: wrap;
1017
       flex-wrap: wrap;
1016
-    
1018
+
1017
       &::after {
1019
       &::after {
1018
         content: '';
1020
         content: '';
1019
         flex: 1;
1021
         flex: 1;
1020
       }
1022
       }
1021
-    
1023
+
1022
       view {
1024
       view {
1023
         height: 88rpx;
1025
         height: 88rpx;
1024
         width: 48%;
1026
         width: 48%;

+ 3 - 1
pages/scanning_code/scanning_code.vue

@@ -843,7 +843,9 @@
843
                 this.infoDATA.taskType.associationType.value == "drugsBag"
843
                 this.infoDATA.taskType.associationType.value == "drugsBag"
844
               ) {
844
               ) {
845
                 postType = "handleDrugsAndJp";
845
                 postType = "handleDrugsAndJp";
846
-                delete data.ids;
846
+                if(this.infoDATA.taskType.associationType.value == "drugsBag"){
847
+                  delete data.ids;
848
+                }
847
                 if (this.accountObj) {
849
                 if (this.accountObj) {
848
                   data.handover = this.accountObj.accountId;
850
                   data.handover = this.accountObj.accountId;
849
                 }
851
                 }

+ 4 - 2
pages/scanning_djEnd/scanning_djEnd.vue

@@ -636,7 +636,9 @@
636
             let postType = "";
636
             let postType = "";
637
             if (this.type == "jPBag" || this.type == "drugsBag") {
637
             if (this.type == "jPBag" || this.type == "drugsBag") {
638
               postType = "handleDrugsAndJp";
638
               postType = "handleDrugsAndJp";
639
-              delete data.ids;
639
+              if(this.type == "drugsBag"){
640
+                delete data.ids;
641
+              }
640
               if (this.accountObj) {
642
               if (this.accountObj) {
641
                 data.handover = this.accountObj.accountId;
643
                 data.handover = this.accountObj.accountId;
642
               }
644
               }
@@ -721,7 +723,7 @@
721
                   )}&deptId=${this.deptId}&scanOrHand=${type}`,
723
                   )}&deptId=${this.deptId}&scanOrHand=${type}`,
722
                   });
724
                   });
723
                 }
725
                 }
724
-                
726
+
725
               } else {
727
               } else {
726
                 uni.navigateTo({
728
                 uni.navigateTo({
727
                   url: `../scanning_djInfo/scanning_djInfo?type=${
729
                   url: `../scanning_djInfo/scanning_djInfo?type=${

+ 7 - 5
pages/scanning_djInfo/scanning_djInfo.vue

@@ -11,7 +11,7 @@
11
         <view class="text1">操作成功</view>
11
         <view class="text1">操作成功</view>
12
       </view>
12
       </view>
13
     </view>
13
     </view>
14
-    
14
+
15
     <view class="Scanning_top" v-if="res.status == 11111">
15
     <view class="Scanning_top" v-if="res.status == 11111">
16
       <view class="Scanning_top_icon">
16
       <view class="Scanning_top_icon">
17
         <text class="cubeic-close icon_transport transport-shibai"></text>
17
         <text class="cubeic-close icon_transport transport-shibai"></text>
@@ -298,7 +298,9 @@
298
                   list.handover = this.accountObj.accountId;
298
                   list.handover = this.accountObj.accountId;
299
                 }
299
                 }
300
                 list.deptId = this.deptId;
300
                 list.deptId = this.deptId;
301
-                delete list.ids;
301
+                if(this.type == "drugsBag"){
302
+                  delete list.ids;
303
+                }
302
               }
304
               }
303
               if (this.type == "specimen") {
305
               if (this.type == "specimen") {
304
                 postType = "handleSpes";
306
                 postType = "handleSpes";
@@ -733,7 +735,7 @@
733
         margin-top: 116rpx;
735
         margin-top: 116rpx;
734
         border-radius: 50%;
736
         border-radius: 50%;
735
         line-height: 140rpx;
737
         line-height: 140rpx;
736
-        
738
+
737
         .speNum{
739
         .speNum{
738
           text-align: center;
740
           text-align: center;
739
           font-size: 140rpx;
741
           font-size: 140rpx;
@@ -806,12 +808,12 @@
806
       display: flex;
808
       display: flex;
807
       justify-content: space-between;
809
       justify-content: space-between;
808
       flex-wrap: wrap;
810
       flex-wrap: wrap;
809
-    
811
+
810
       &::after {
812
       &::after {
811
         content: '';
813
         content: '';
812
         flex: 1;
814
         flex: 1;
813
       }
815
       }
814
-    
816
+
815
       view {
817
       view {
816
         height: 88rpx;
818
         height: 88rpx;
817
         width: 48%;
819
         width: 48%;