组合颜色

src/views/system/user/profile/components/report-table.vue

@@ -17,7 +17,7 @@
       </template>
       <template #group="{row}">
         <el-badge class="group" value="荐" :hidden="!row.isRecommend" type="success">
-          <el-tag size="medium" :type="row.allowSelect ? 'warning' : 'danger'" >{{row.groupName}}</el-tag>
+          <el-tag size="medium" :type="isGroupOverSetting(row) ? 'danger' : 'warning'">{{ row.groupName }}</el-tag>
         </el-badge>
       </template>
       <template #temp="{row}">
@@ -190,15 +190,15 @@ export default {
       // 当前代
       const activeModels = this.generation.models.find(item => item.generation == this.generation.active)
       const isRefuse = activeModels.models.filter(item => item.rejected)
-      if(isRefuse.length > 0) {
+      if (isRefuse.length > 0) {
         // 拒绝了
         return '拒绝填报志愿'
-      }else {
+      } else {
         //  填报 or 未选择
         const supply = activeModels.models.filter(item => item.selected)
         if (supply.length > 0) {
           return `填报志愿为${supply[0].groupName}`
-        }else {
+        } else {
           return '未填报志愿'
         }
       }
@@ -377,6 +377,13 @@ export default {
     getModelsByStep() {
       return this.models.findIndex()
     },
+    isGroupOverSetting(row) {
+      if (this.generation.activeOpt.decisionMaking) {
+        return row.groupApprovedCount >= row.personCount
+      } else {
+        return row.actualCount >= row.groupIndicator
+      }
+    },
     toReport() {
       // 是否更改了报名数据 ?
       const flag = this.activeModels.models.filter(item => item.selected).length == this.activeModels.selectedList.length
@@ -482,6 +489,7 @@ export default {
 .cell .el-tag {
   margin-right: 5px;
 }
+
 .group /deep/ .el-badge__content.is-fixed {
   top: 8px;
   right: 14px;