seimin 2 weeks ago
parent
commit
d59a6ed717
1 changed files with 7 additions and 7 deletions
  1. 7 7
      pages/specimenPackage/checkPage/checkPage.vue

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

@@ -2,7 +2,7 @@
2
   <view class="Scanning_Result">
2
   <view class="Scanning_Result">
3
     <view class="Scanning_top">
3
     <view class="Scanning_top">
4
       <view class="Scanning_top_icon">
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
       </view>
6
       </view>
7
     </view>
7
     </view>
8
 
8
 
@@ -24,14 +24,14 @@
24
     <view class="foot_btn_spe">
24
     <view class="foot_btn_spe">
25
       <view class="column">
25
       <view class="column">
26
         <template v-if="!config.drugsEndManual">
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
         </template>
29
         </template>
30
         
30
         
31
         <!-- 三个按钮-样式 -->
31
         <!-- 三个按钮-样式 -->
32
         <template v-else-if="config.drugsEndManual">
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
           <view class="btnW100"  @click="Scanning_again()">继续扫描</view>
35
           <view class="btnW100"  @click="Scanning_again()">继续扫描</view>
36
         </template>
36
         </template>
37
       </view>
37
       </view>
@@ -70,7 +70,7 @@
70
         isNumberKey:false, //是否开启动态密钥
70
         isNumberKey:false, //是否开启动态密钥
71
         keyArr: [],
71
         keyArr: [],
72
         totalNum: 0,//总数量
72
         totalNum: 0,//总数量
73
-        noScanNum: 0,//未扫描
73
+        scanNum: 0,//已扫描
74
       };
74
       };
75
     },
75
     },
76
     components: {
76
     components: {
@@ -480,7 +480,7 @@
480
             uni.hideLoading();
480
             uni.hideLoading();
481
             if(ress.state == 200){
481
             if(ress.state == 200){
482
               this.specimenPackageList = ress.data || [];
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
               this.totalNum = this.specimenPackageList.length;
484
               this.totalNum = this.specimenPackageList.length;
485
             }else{
485
             }else{
486
               uni.showToast({
486
               uni.showToast({