修复

pages/endOrderSignBlood/endOrderSignBlood.vue

@@ -74,7 +74,7 @@
       </view>
     </view>
     <view class="foot_btn_spe">
-      <view class="btn1" @click="complete()" v-if="dataList.bloodTotalCount">{{isComplete ? '核对完成-完成工单' : '核对完成'}}</view>
+      <view class="btn1" @click="complete()" v-if="isShowCompleteBtn">{{isComplete ? '核对完成-完成工单' : '核对完成'}}</view>
       <view class="btn3" @click="goBack()">返回</view>
     </view>
     <!-- 填写交接人工号弹窗 -->
@@ -101,6 +101,7 @@
         dataList: {},
         queryObj: {}, //路由传递过来的数据
         isComplete: false,
+        isShowCompleteBtn: false,
       };
     },
     methods: {
@@ -144,6 +145,7 @@
         
         let allData = this.dataList.children.filter(v => v.state.value == 4);
         let allDataChecked = this.dataList.children.filter(v => v.checked && v.state.value == 4);
+        this.isShowCompleteBtn = allDataChecked.length > 0;
         this.isComplete = allData.length === allDataChecked.length;
       },
       // 核对完成
@@ -336,6 +338,7 @@
               }
               // 第二层
               dataNewList.children.push({
+                checked: array3[0].children[0].state.value == 4 ? true : false,// 默认
                 patientName: key2.split('|')[0],
                 hosNum: key2.split('|')[1],
                 state: array3[0].children[0].state,
@@ -343,6 +346,11 @@
                 children: array3,
               });
             }
+            // 默认
+            let allData = dataNewList.children.filter(v => v.state.value == 4);
+            let allDataChecked = dataNewList.children.filter(v => v.checked && v.state.value == 4);
+            this.isShowCompleteBtn = allDataChecked.length > 0;
+            this.isComplete = allData.length === allDataChecked.length;
             // 计算第一层血袋数量
             dataNewList.bloodTotalCount = dataNewList.children.reduce((pre, current) => pre + current.count, 0);
             // 计算第一层患者数量

pages/my_list/my_list.vue

@@ -43,40 +43,38 @@
       <view class="page_items" v-if="workData && workData.length > 0">
         <view class="page_item" v-for="(infoDATA, i) of workData" :key="infoDATA.id" @click="detailIt(infoDATA)">
           <view class="page_item_top">
-            <view class="page_item_top_L">
-              <text class="L_text">{{ infoDATA.gdcode }}</text>
-              <view class="page_item_cont_start emergency1" v-if="infoDATA.emergencyType.value == 1">
-                <text>
-                  <text
-                    class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
-              </view>
-              <view class="page_item_cont_start emergency" v-if="infoDATA.emergencyType.value == 2">
-                <text>
-                  <text
-                    class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
-              </view>
-              <view class="page_item_cont_start emergencys" v-if="infoDATA.emergencyType.value == 3">
-                <text>
-                  <text
-                    class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
-              </view>
-            </view>
-            <view class="page_item_top_L">
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimen'">标本<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimenPlan'">标本<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">药品<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'jPBag'">静配<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'inspect'">陪检<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'patientTransport'">转运<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'">血制品<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
-            </view>
-            <view class="page_item_top_R">
-              <view class="num" v-if="infoDATA.gdState.value != 6">
-                {{infoDATA.grade?(infoDATA.grade.gradeTotal>=0?'+'+infoDATA.grade.gradeTotal:'-'+infoDATA.grade.gradeTotal):''}}
+            <view class="page_item_top_All_wrap">
+              <view class="page_item_top_L_wrap">
+                <view class="page_item_top_L">
+                  <text class="L_text">{{ infoDATA.gdcode }}</text>
+                  <view class="page_item_cont_start emergency1" v-if="infoDATA.emergencyType.value == 1">
+                    <text>
+                      <text
+                        class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
+                  </view>
+                  <view class="page_item_cont_start emergency" v-if="infoDATA.emergencyType.value == 2">
+                    <text>
+                      <text
+                        class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
+                  </view>
+                  <view class="page_item_cont_start emergencys" v-if="infoDATA.emergencyType.value == 3">
+                    <text>
+                      <text
+                        class="cubeic-star icon_transport transport-shiwujiaoxing"></text>{{ infoDATA.emergencyType.name }}</text>
+                  </view>
+                </view>
+                <view class="page_item_top_L page_item_top_M">
+                  <view class="L_iocn" v-if="infoDATA.taskType.associationType.value != 'ordinary'">{{infoDATA.taskType.taskName}}<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></view>
+                  <view class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'">{{infoDATA.taskType.ordinaryField.name}}<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></view>
+                </view>
               </view>
-              <view class="num" v-if="infoDATA.gdState.value == 6">
-                未评价
+              <view class="page_item_top_R">
+                <view class="num" v-if="infoDATA.gdState.value != 6">
+                  {{infoDATA.grade?(infoDATA.grade.gradeTotal>=0?'+'+infoDATA.grade.gradeTotal:'-'+infoDATA.grade.gradeTotal):''}}
+                </view>
+                <view class="num" v-if="infoDATA.gdState.value == 6">
+                  未评价
+                </view>
               </view>
             </view>
             <view class="L"> </view>
@@ -584,10 +582,26 @@
           .page_item_top {
             height: 86rpx;
             border-bottom: 2rpx dashed #e5e9ed;
+            
+            .page_item_top_All_wrap{
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+            .page_item_top_L_wrap{
+              height: 100%;
+              display: flex;
+              flex: 1;
+              min-width: 0;
+            }
+            
+            .page_item_top_M{
+              flex: 1;
+              min-width: 0;
+            }
 
             .page_item_top_L {
-              height: 100%;
-              float: left;
               line-height: 88rpx;
 
               .ac {
@@ -656,23 +670,23 @@
               }
 
               .L_iocn {
-                display: inline-block;
-                height: 52rpx;
+                height: 100%;
                 color: rgb(7, 134, 60);
                 font-size: 28rpx;
                 font-weight: 700;
                 margin-left: 20rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
               }
             }
 
             .page_item_top_R {
-              height: 60rpx;
-              float: right;
-              padding-top: 20rpx;
+              margin-right: 16rpx;
               font-size: 32rpx;
-              position: absolute;
-              right: 50rpx;
-              line-height: 48rpx;
+              display: flex;
+              justify-content: center;
+              align-items: center;
 
               .num {
                 color: rgb(7, 134, 60);