feat开发

src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentAdvancedPerson.vue

@@ -262,7 +262,7 @@
   // 考核表详情
   const evaluationDetail = ref<Partial<EvaluationTargetItem>>({});
   // isAdvancedGroup 为 true 表示先进集体部门，false 表示普通部门
-  const isAdvancedGroup = computed(() => Boolean(evaluationDetail.value?.isAdvancedGroup));
+  const isAdvancedGroup = computed(() => Boolean(route.query.isAdvancedGroup));
   const deptId = ref<number | undefined>(undefined); // 部门ID
   const psemId = ref<number | undefined>(undefined); // 考核表ID（从接口获取）
   const deptUserId = ref<number | undefined>(undefined); // 部门用户ID（从接口获取）

src/views/production-safety/safetyAssessment/evaluationDepartment/evaluationDepartment.vue

@@ -97,7 +97,7 @@
                 <!-- 已完成(1)：显示反馈和先进个人申报 -->
                 <template v-else-if="Number(scope.row.status) === 1">
                   <!-- <ActionButton text="反馈" @click="handleFeedback(scope.row.id)" /> -->
-                  <ActionButton text="先进个人申报" @click="handleAdvancedPerson(scope.row.id)" />
+                  <ActionButton text="先进个人申报" @click="handleAdvancedPerson(scope.row)" />
                 </template>
                 <!-- 已作废(5)：显示反馈 -->
                 <template v-else-if="Number(scope.row.status) === 5">
@@ -201,6 +201,7 @@
           deptName: item.deptName,
           scores: item.scores,
           scoreRank: item.scoreRank,
+          isAdvancedGroup: item.isAdvancedGroup,
         }));
         pagination.total = res.totalRow;
       }
@@ -244,12 +245,13 @@
     });
   };
 
-  const handleAdvancedPerson = (id: number) => {
+  const handleAdvancedPerson = (row: any) => {
     router.push({
       name: 'EvaluationDepartmentItem',
       query: {
-        id,
+        id: row.id,
         operate: 'evaluationDepartment-advanced-person',
+        isAdvancedGroup: row.isAdvancedGroup,
       },
     });
   };

src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationTarget.vue

@@ -461,7 +461,7 @@
               isAdvancedGroup: item.isAdvancedGroup || false, // 是否先进集体（需要接口返回，暂时使用 false）
               departmentSort: item.scoreRank || 0, // 部门排序（使用排名）
               departmentLeader: item.deptUserName || '-', // 部门负责人
-              baseScore: item.baseNum || 0, // 基础分，默认为100
+              baseScore: item.basicNum || 0, // 基础分，默认为100
               reviewSum: item.reviewSum || 0, // 总分数
               addSum: item.addSum || 0, // 加分项分数
               subSum: item.subSum || 0, // 减分项分数