Merge branch 'fouradd' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into fiveadd

src/views/education/examManagement/applicationData/byTrainee.vue

@@ -379,9 +379,9 @@
           >
             <span>{{
               activeInfoType === 1
-                ? infoData.examNumber
+                ? infoData.examNumber - infoData.examNumberAll
                 : activeInfoType === 2
-                ? infoData.doNumber
+                ? infoData.doNumber - infoData.doNumberAll
                 : ""
             }}</span>
           </el-form-item>
@@ -752,6 +752,14 @@ export default {
         })
         .then((res) => {
           this.infoData = JSON.parse(JSON.stringify(res.data));
+          this.infoData.doNumberAll = 0;
+          this.infoData.examNumberAll = 0;
+          this.infoData.userExamGoodsSupplement.forEach((item) => {
+            this.infoData.examNumberAll += item.examNumber;
+          });
+          this.infoData.userExamGoodsSupplementVos.forEach((item) => {
+            this.infoData.doNumberAll += item.doNumber;
+          });
           this.dialoginfoWatch = true;
         });
     },