seimin 1 year ago
parent
commit
ab6a13dead

+ 4 - 4
components/cancelBlood/cancelBlood.vue

@@ -31,9 +31,9 @@
31 31
       index: {
32 32
         type: Number,
33 33
       },
34
-      delivery: {
35
-        type: Number,
36
-        default: 0,
34
+      signType4: {
35
+        type: Boolean,
36
+        default: false,
37 37
       },
38 38
       cancelBlood: {
39 39
         type: Number,
@@ -194,7 +194,7 @@
194 194
       // 取消发血
195 195
       selectAccountHandler(data, index){
196 196
         console.log(this.cancelBlood)
197
-        if(this.cancelBlood != 1){
197
+        if(this.cancelBlood != 1 || !this.signType4){
198 198
           return;
199 199
         }
200 200
         this.coopData = data;

+ 6 - 5
pages/newBlood/endOrderSignBlood/endOrderSignBlood.vue

@@ -27,7 +27,7 @@
27 27
               <checkbox class="checkbox" :checked="v2.checked" :disabled="v2.state.value == 5" />
28 28
               <text class="newicon newicon-a-ziyuan7"></text>
29 29
               <view class="title1 ellipsis">
30
-                <cancelBlood :data="v2" :index="i2" @refresh="getInfo" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="end"></cancelBlood>
30
+                <cancelBlood :data="v2" :index="i2" @refresh="getInfo" :signType4="signType4" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="end"></cancelBlood>
31 31
               </view>
32 32
               <view style="display: flex;align-items: center;justify-content: space-between;">
33 33
                 <text>{{v2.count}}袋</text>
@@ -102,7 +102,7 @@
102 102
         queryObj: {}, //路由传递过来的数据
103 103
         isComplete: false,
104 104
         isShowCompleteBtn: false,
105
-        delivery: 0,
105
+        signType4: false,
106 106
         cancelBlood: 0,
107 107
         cancelBloodHandover: 0,
108 108
       };
@@ -131,16 +131,17 @@
131 131
         let result = await this.getTaskBloodConfig();
132 132
         if (result.status == 200) {
133 133
           if(result.list && result.list[0]){
134
-            this.delivery = result.list[0].delivery;
134
+            let signTypeList = result.list[0].signTypeList || [];
135
+            this.signType4 = signTypeList.some(v => v.value == 4);
135 136
             this.cancelBlood = result.list[0].cancelBlood;
136 137
             this.cancelBloodHandover = result.list[0].cancelBloodHandover;
137 138
           }else{
138
-            this.delivery = 0;
139
+            this.signType4 = false;
139 140
             this.cancelBlood = 0;
140 141
             this.cancelBloodHandover = 0;
141 142
           }
142 143
         } else {
143
-          this.delivery = 0;
144
+          this.signType4 = false;
144 145
           this.cancelBlood = 0;
145 146
           this.cancelBloodHandover = 0;
146 147
         }

+ 6 - 5
pages/newBlood/startOrderSignBloodDetail/startOrderSignBloodDetail.vue

@@ -11,7 +11,7 @@
11 11
         <view class="list_top">
12 12
           <text class="newicon newicon-a-ziyuan7"></text>
13 13
           <view class="title1 ellipsis">
14
-            <cancelBlood :data="v2" :index="i2" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="start"></cancelBlood>
14
+            <cancelBlood :data="v2" :index="i2" :signType4="signType4" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="start"></cancelBlood>
15 15
           </view>
16 16
           <view>
17 17
             <text>{{v2.count}}袋</text>
@@ -74,7 +74,7 @@
74 74
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
75 75
         dataList: {},
76 76
         queryObj: {}, //路由传递过来的数据
77
-        delivery: 0,
77
+        signType4: false,
78 78
         cancelBlood: 0,
79 79
         cancelBloodHandover: 0,
80 80
       };
@@ -103,16 +103,17 @@
103 103
         let result = await this.getTaskBloodConfig();
104 104
         if (result.status == 200) {
105 105
           if(result.list && result.list[0]){
106
-            this.delivery = result.list[0].delivery;
106
+            let signTypeList = result.list[0].signTypeList || [];
107
+            this.signType4 = signTypeList.some(v => v.value == 4);
107 108
             this.cancelBlood = result.list[0].cancelBlood;
108 109
             this.cancelBloodHandover = result.list[0].cancelBloodHandover;
109 110
           }else{
110
-            this.delivery = 0;
111
+            this.signType4 = false;
111 112
             this.cancelBlood = 0;
112 113
             this.cancelBloodHandover = 0;
113 114
           }
114 115
         } else {
115
-          this.delivery = 0;
116
+          this.signType4 = false;
116 117
           this.cancelBlood = 0;
117 118
           this.cancelBloodHandover = 0;
118 119
         }

+ 7 - 2
pages/receiptpage/receiptpage.vue

@@ -292,9 +292,9 @@
292 292
               <view v-if="item.taskType.associationType.value == 'other' && item.worker && item.worker.id && clinicalMultiplayerMode === 1 && showAppendUser === 1 && item.clinicalTaskIdsFlag && !item.copyBy" class="page_item_btn" @click="additionalUser(item)" hover-class="seimin-btn-hover">追加</view>
293 293
             </view>
294 294
             <!-- 如果是万能交接-血制品 -->
295
-            <view class="page_item_btn_wrap" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && delivery === 1 && item.taskType.ordinaryField.value == 'blood'">
295
+            <view class="page_item_btn_wrap" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && signType4 && item.taskType.ordinaryField.value == 'blood'">
296 296
               <!-- 送达交接 -->
297
-              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover" v-if="item.gdState.value == 5">送达交接</view>
297
+              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover" v-if="delivery === 1 && item.gdState.value == 5">送达交接</view>
298 298
               <!-- 领血证 -->
299 299
               <view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
300 300
             </view>
@@ -414,6 +414,7 @@
414 414
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
415 415
         clinicalMultiplayerMode: 0,
416 416
         showAppendUser: 0,
417
+        signType4: false,
417 418
         delivery: 0,
418 419
         useTakeCode: 0,
419 420
         takeCodeType: {},
@@ -613,15 +614,19 @@
613 614
         let result = await this.getTaskBloodConfig();
614 615
         if (result.status == 200) {
615 616
           if(result.list && result.list[0]){
617
+            let signTypeList = result.list[0].signTypeList || [];
618
+            this.signType4 = signTypeList.some(v => v.value == 4);
616 619
             this.delivery = result.list[0].delivery;
617 620
             this.useTakeCode = result.list[0].useTakeCode;
618 621
             this.takeCodeType = result.list[0].takeCodeType;
619 622
           }else{
623
+            this.signType4 = false;
620 624
             this.delivery = 0;
621 625
             this.useTakeCode = 0;
622 626
             this.takeCodeType = {};
623 627
           }
624 628
         } else {
629
+          this.signType4 = false;
625 630
           this.delivery = 0;
626 631
           this.useTakeCode = 0;
627 632
           this.takeCodeType = {};