优化

components/cancelBlood/cancelBlood.vue

@@ -31,9 +31,9 @@
       index: {
         type: Number,
       },
-      delivery: {
-        type: Number,
-        default: 0,
+      signType4: {
+        type: Boolean,
+        default: false,
       },
       cancelBlood: {
         type: Number,
@@ -194,7 +194,7 @@
       // 取消发血
       selectAccountHandler(data, index){
         console.log(this.cancelBlood)
-        if(this.cancelBlood != 1){
+        if(this.cancelBlood != 1 || !this.signType4){
           return;
         }
         this.coopData = data;

pages/newBlood/endOrderSignBlood/endOrderSignBlood.vue

@@ -27,7 +27,7 @@
               <checkbox class="checkbox" :checked="v2.checked" :disabled="v2.state.value == 5" />
               <text class="newicon newicon-a-ziyuan7"></text>
               <view class="title1 ellipsis">
-                <cancelBlood :data="v2" :index="i2" @refresh="getInfo" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="end"></cancelBlood>
+                <cancelBlood :data="v2" :index="i2" @refresh="getInfo" :signType4="signType4" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="end"></cancelBlood>
               </view>
               <view style="display: flex;align-items: center;justify-content: space-between;">
                 <text>{{v2.count}}袋</text>
@@ -102,7 +102,7 @@
         queryObj: {}, //路由传递过来的数据
         isComplete: false,
         isShowCompleteBtn: false,
-        delivery: 0,
+        signType4: false,
         cancelBlood: 0,
         cancelBloodHandover: 0,
       };
@@ -131,16 +131,17 @@
         let result = await this.getTaskBloodConfig();
         if (result.status == 200) {
           if(result.list && result.list[0]){
-            this.delivery = result.list[0].delivery;
+            let signTypeList = result.list[0].signTypeList || [];
+            this.signType4 = signTypeList.some(v => v.value == 4);
             this.cancelBlood = result.list[0].cancelBlood;
             this.cancelBloodHandover = result.list[0].cancelBloodHandover;
           }else{
-            this.delivery = 0;
+            this.signType4 = false;
             this.cancelBlood = 0;
             this.cancelBloodHandover = 0;
           }
         } else {
-          this.delivery = 0;
+          this.signType4 = false;
           this.cancelBlood = 0;
           this.cancelBloodHandover = 0;
         }

pages/newBlood/startOrderSignBloodDetail/startOrderSignBloodDetail.vue

@@ -11,7 +11,7 @@
         <view class="list_top">
           <text class="newicon newicon-a-ziyuan7"></text>
           <view class="title1 ellipsis">
-            <cancelBlood :data="v2" :index="i2" :delivery="delivery" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="start"></cancelBlood>
+            <cancelBlood :data="v2" :index="i2" :signType4="signType4" :cancelBlood="cancelBlood" :cancelBloodHandover="cancelBloodHandover" :dataList="dataList" type="start"></cancelBlood>
           </view>
           <view>
             <text>{{v2.count}}袋</text>
@@ -74,7 +74,7 @@
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         dataList: {},
         queryObj: {}, //路由传递过来的数据
-        delivery: 0,
+        signType4: false,
         cancelBlood: 0,
         cancelBloodHandover: 0,
       };
@@ -103,16 +103,17 @@
         let result = await this.getTaskBloodConfig();
         if (result.status == 200) {
           if(result.list && result.list[0]){
-            this.delivery = result.list[0].delivery;
+            let signTypeList = result.list[0].signTypeList || [];
+            this.signType4 = signTypeList.some(v => v.value == 4);
             this.cancelBlood = result.list[0].cancelBlood;
             this.cancelBloodHandover = result.list[0].cancelBloodHandover;
           }else{
-            this.delivery = 0;
+            this.signType4 = false;
             this.cancelBlood = 0;
             this.cancelBloodHandover = 0;
           }
         } else {
-          this.delivery = 0;
+          this.signType4 = false;
           this.cancelBlood = 0;
           this.cancelBloodHandover = 0;
         }

pages/receiptpage/receiptpage.vue

@@ -292,9 +292,9 @@
               <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>
             </view>
             <!-- 如果是万能交接-血制品 -->
-            <view class="page_item_btn_wrap" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && delivery === 1 && item.taskType.ordinaryField.value == 'blood'">
+            <view class="page_item_btn_wrap" v-if="selectedLabelSlots == '执行中' && item.taskType.associationType.value == 'ordinary' && signType4 && item.taskType.ordinaryField.value == 'blood'">
               <!-- 送达交接 -->
-              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover" v-if="item.gdState.value == 5">送达交接</view>
+              <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover" v-if="delivery === 1 && item.gdState.value == 5">送达交接</view>
               <!-- 领血证 -->
               <view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
             </view>
@@ -414,6 +414,7 @@
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         clinicalMultiplayerMode: 0,
         showAppendUser: 0,
+        signType4: false,
         delivery: 0,
         useTakeCode: 0,
         takeCodeType: {},
@@ -613,15 +614,19 @@
         let result = await this.getTaskBloodConfig();
         if (result.status == 200) {
           if(result.list && result.list[0]){
+            let signTypeList = result.list[0].signTypeList || [];
+            this.signType4 = signTypeList.some(v => v.value == 4);
             this.delivery = result.list[0].delivery;
             this.useTakeCode = result.list[0].useTakeCode;
             this.takeCodeType = result.list[0].takeCodeType;
           }else{
+            this.signType4 = false;
             this.delivery = 0;
             this.useTakeCode = 0;
             this.takeCodeType = {};
           }
         } else {
+          this.signType4 = false;
           this.delivery = 0;
           this.useTakeCode = 0;
           this.takeCodeType = {};