bugfix

components/showIntegralModel/showIntegralModel.vue

@@ -70,7 +70,7 @@
               {{orderInfo.grade.evaluationDetails?'('+orderInfo.grade.evaluationDetails+')':''}}
             </view>
           </view> -->
-          <view class="showIntegralModel__list">
+          <view class="showIntegralModel__list" v-if="orderInfo.taskType && (orderInfo.taskType.associationType.value === 'patientTransport' || orderInfo.taskType.associationType.value === 'inspect')">
             <view class="showIntegralModel__T">
               <view class="showIntegralModel__item">陪检方式分</view>
               <view class="showIntegralModel__item">{{orderInfo.grade?orderInfo.grade.estimateInspectModeGrade:'-'}}

components/showModel/showModel.vue

@@ -5,7 +5,7 @@
         {{ title }}
         <text v-if="operate.know == '知道了' && timerFlag">({{ time }})</text>
       </view>
-      <view class="showModel__article" :class="{ p0: textareaFlag }">
+      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length }">
         <text
           v-if="icon"
           class="showModel__icon icon_transport"
@@ -248,6 +248,10 @@ export default {
       &.p0 {
         padding: 0;
       }
+      
+      &.p1 {
+        text-align: left;
+      }
 
       .showModel__icon {
         font-size: 138rpx;

components/smallScreen/smallScreen.vue

@@ -9,7 +9,7 @@
     </selectAccount>
     <!-- 弹窗 -->
     <showModel :title="models4.title" :icon="models4.icon" :disjunctor="models4.disjunctor"
-      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @radioChange="radioChange4" :operate="models4.operate">
+      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @cancel="cancel4" @radioChange="radioChange4" :operate="models4.operate">
     </showModel>
   </view>
 </template>
@@ -97,6 +97,7 @@
                       icon: "",
                       operate: {
                         ok: "确定",
+                        cancel: "取消",
                       },
                     };
                   } else {
@@ -135,6 +136,9 @@
         this.models4.disjunctor = false;
         this.Scan_ss(this.sData,this.sType);
       },
+      cancel4() {
+        this.models4.disjunctor = false;
+      },
       // 如果不是静配，药配，标本配送,标本轮巡
       // 科室签到（小扫描）
       nextDeptOrder_ss(data, accountObj) {

pages/my_list/my_list.vue

@@ -197,17 +197,17 @@
       },
       //积分详情
       detailIt(infoDATA) {
-        if (infoDATA.gdState.value == 6) {
-          this.models6 = {
-            disjunctor: true,
-            content: "暂未评价，无法查看积分详情",
-            icon: "warn",
-            operate: {
-              know: "知道了"
-            },
-          };
-          return;
-        }
+        // if (infoDATA.gdState.value == 6) {
+        //   this.models6 = {
+        //     disjunctor: true,
+        //     content: "暂未评价，无法查看积分详情",
+        //     icon: "warn",
+        //     operate: {
+        //       know: "知道了"
+        //     },
+        //   };
+        //   return;
+        // }
         this.models.disjunctor = true;
         this.models.orderId = infoDATA.id;
         this.models.timestamp = Date.now();

pages/scanning_ins/scanning_ins.vue

@@ -236,7 +236,7 @@
       :operate="models3.operate" @ok="ok3" @cancel="cancel3"></showModel>
     <!-- 弹窗 -->
     <showModel :title="models4.title" :icon="models4.icon" :disjunctor="models4.disjunctor"
-      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @radioChange="radioChange4" :operate="models4.operate">
+      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @cancel="cancel4" @radioChange="radioChange4" :operate="models4.operate">
     </showModel>
   </view>
 </template>
@@ -342,6 +342,7 @@
                       icon: "",
                       operate: {
                         ok: "确定",
+                        cancel: "取消",
                       },
                     };
                   } else {
@@ -387,6 +388,9 @@
         this.models4.disjunctor = false;
         this.allStart(this.typeData);
       },
+      cancel4() {
+        this.models4.disjunctor = false;
+      },
       ok2() {
         this.models2.disjunctor = false;
         uni.showLoading({