elective master - enroll info

src/views/elective/generation/components/elective-generation-enroll-info.vue

@@ -193,14 +193,6 @@ export default {
       return this.getCategoryValue(this.prevApplyData, 'nonmatchedNotOptional', group)?.value || 0
     },
     getMatchedNonaction(group) {
-      // 初录未填，初录段只需要适配1个未填条件即可unfinishedCount
-      if (!this.prevDMData) {
-        // 报名人数，只取第一志愿
-        const isMultiplePreference = this.prevApplyData.categories.some(sub => Array.isArray(sub))
-        const tableData = isMultiplePreference ? { categories: this.prevApplyData.categories.first() } : this.prevApplyData
-        const val = this.getCategoryValue(tableData, 'unfinishedCount', group)
-        return val?.value || 0
-      }
       // 专业符合未填
       return this.getCategoryValue(this.prevApplyData, 'matchedNonaction', group)?.value || 0
     },
@@ -225,9 +217,18 @@ export default {
       return this.getCategoryValue(this.prevApplyData, 'nonmatchedRejected', group)?.value || 0
     },
     getAllUnAppliedOfReject() {
+      if (!this.prevDMData) return 0
       return this.hasIndicateGroups.sum(g => this.getMatchedReject(g) + this.getNonMatchedReject(g))
     },
     getAllUnAppliedOfNonaction() {
+      // 初录未填，初录段只需要适配1个未填条件即可unfinishedCount
+      if (!this.prevDMData) {
+        // 报名人数，只取第一志愿
+        const isMultiplePreference = this.prevApplyData.categories.some(sub => Array.isArray(sub))
+        const tableData = isMultiplePreference ? { categories: this.prevApplyData.categories.first() } : this.prevApplyData
+        const val = this.getCategoryValue(tableData, 'unfinishedCount', { groupId: 0 })
+        return val?.value || 0
+      }
       return this.hasIndicateGroups.sum(g => this.getMatchedNonaction(g) + this.getNonMatchedNonaction(g))
     },
     getAllUnApplied() {