药品和静配增加一种检验方式

pages/scanning_djEnd/scanning_djEnd.vue

@@ -34,10 +34,14 @@
         (infoDATA.status == 200 && type == 'inspect')
       ">扫描患者腕带并将患者送往目标科室.</view>
     <view class="Scanning_cont" v-if="
-        (infoDATA.status == 200 && type == 'drugsBag') ||
-        (infoDATA.status == 200 && type == 'jPBag')
+        (infoDATA.status == 200 && type == 'drugsBag'&&(type1 == 'drug-ddd-2'||type1 == 'drug-dsd-2')) ||
+        (infoDATA.status == 200 && type == 'jPBag'&&(type1 == 'jp-ddd-2'||type1 == 'jp-dsd-2'))
       ">已到达目标科室,请扫描药包或静配包.</view>
     <view class="Scanning_cont" v-if="
+          (infoDATA.status == 200 && type == 'drugsBag'&&(type1 == 'drug-ddd-1'||type1 == 'drug-dsd-1')) ||
+          (infoDATA.status == 200 && type == 'jPBag'&&(type1 == 'jp-ddd-1'||type1 == 'jp-dsd-1'))
+        ">已到达目标科室,请取药包或静配包后送达目标科室.</view>
+    <view class="Scanning_cont" v-if="
         infoDATA.status == 200 && type == 'other' && infoDATA.type == 'qt-ddd-1'
       ">已到达目标科室,请执行该工单.</view>
     <view class="Scanning_cont" v-if="
@@ -83,7 +87,10 @@
       <view class="btn3" @click="Scanning_again()">继续扫描</view>
     </view>
     <view class="foot_btn" v-if="type == 'drugsBag' || type == 'jPBag'">
-      <view class="btn3" @click="Scanning_again()">继续扫描</view>
+      <view class="btn3" @click="Scanning_again()"
+        v-if="type1==='drug-ddd-2'||type1==='drug-dsd-2'||type1==='jp-ddd-2'||type1==='jp-dsd-2'">继续扫描</view>
+      <view class="btn3" @click="showAlert()"
+        v-if="type1==='drug-ddd-1'||type1==='drug-dsd-1'||type1==='jp-ddd-1'||type1==='jp-dsd-1'">知道了</view>
     </view>
     <view class="foot_btn" v-if="
         (type == 'specimenPlan' &&