seimin 1 周之前
父节点
当前提交
d59a6ed717
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      pages/specimenPackage/checkPage/checkPage.vue

+ 7 - 7
pages/specimenPackage/checkPage/checkPage.vue

@@ -2,7 +2,7 @@
2 2
   <view class="Scanning_Result">
3 3
     <view class="Scanning_top">
4 4
       <view class="Scanning_top_icon">
5
-        <text v-if="workOrder.endDepts">{{workOrder.endDepts[0].dept}}签到—{{noScanNum}}/{{totalNum}}</text>
5
+        <text v-if="workOrder.endDepts">{{workOrder.endDepts[0].dept}}签到—{{scanNum}}/{{totalNum}}</text>
6 6
       </view>
7 7
     </view>
8 8
 
@@ -24,14 +24,14 @@
24 24
     <view class="foot_btn_spe">
25 25
       <view class="column">
26 26
         <template v-if="!config.drugsEndManual">
27
-          <view class="btn" @click="Scanning_again()">继续扫描</view>
28
-          <view class="btn" @click="scanCode()">扫一扫核对交接</view>
27
+          <view :class="[(scanNum == totalNum) ? 'btn' : 'btnW100']" @click="Scanning_again()">继续扫描</view>
28
+          <view class="btn" v-if="scanNum == totalNum" @click="scanCode()">扫一扫核对交接</view>
29 29
         </template>
30 30
         
31 31
         <!-- 三个按钮-样式 -->
32 32
         <template v-else-if="config.drugsEndManual">
33
-          <view class="btn" @click="scanCode()">扫一扫核对交接</view>
34
-          <view class="btn" @click="fillInManually(config.drugsEndManual.value)">{{config.drugsEndManual.name}}核对交接</view>
33
+          <view class="btn" v-if="scanNum == totalNum" @click="scanCode()">扫一扫核对交接</view>
34
+          <view class="btn" v-if="scanNum == totalNum" @click="fillInManually(config.drugsEndManual.value)">{{config.drugsEndManual.name}}核对交接</view>
35 35
           <view class="btnW100"  @click="Scanning_again()">继续扫描</view>
36 36
         </template>
37 37
       </view>
@@ -70,7 +70,7 @@
70 70
         isNumberKey:false, //是否开启动态密钥
71 71
         keyArr: [],
72 72
         totalNum: 0,//总数量
73
-        noScanNum: 0,//未扫描
73
+        scanNum: 0,//已扫描
74 74
       };
75 75
     },
76 76
     components: {
@@ -480,7 +480,7 @@
480 480
             uni.hideLoading();
481 481
             if(ress.state == 200){
482 482
               this.specimenPackageList = ress.data || [];
483
-              this.noScanNum = this.specimenPackageList.filter(v => v.sacnState !== 0).length;
483
+              this.scanNum = this.specimenPackageList.filter(v => v.sacnState !== 0).length;
484 484
               this.totalNum = this.specimenPackageList.length;
485 485
             }else{
486 486
               uni.showToast({