feat(performance): 添加非干部月度考核功能及界面优化

- 新增非干部月度考核的CRUD及导出API接口
- 重构非干部考核表格列名及表单字段以匹配后端
- 实现非干部考核数据的列表展示、增删改查功能
- 添加字典标签显示用工形式、岗位和考核组
- 完善导出功能实现

src/api/performance/monthlyAssess.js

@@ -16,4 +16,44 @@ export function generateCadreAssessment(params) {
     method: 'post',
     params: params
   })
-}
+}
+
+//查询非干部月度考核列表
+export function listNonCadreAssessment(query) {
+  return request({
+    url: '/personnel/assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+//新增非干部月度考核
+export function addNonCadreAssessment(params) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'post',
+    params: params
+  })
+}
+//修改非干部月度考核
+export function updateNonCadreAssessment(params) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'put',
+    params: params
+  })
+}
+//删除非干部月度考核
+export function deleteNonCadreAssessment(ids) {
+  return request({
+    url: `/personnel/assessment/${ids}`,
+    method: 'delete',
+  })
+}
+//导出非干部月度考核列表
+export function exportNonCadreAssessment(params) {
+  return request({
+    url: '/personnel/assessment/export',
+    method: 'post',
+    params: params
+  })
+}

src/views/performanceManage/monthlyAssess/index.vue

@@ -47,54 +47,67 @@
       <div v-if="currentTab === 'non-cadre'">
         <el-table v-loading="loading" :data="nonCadreList" border fit highlight-current-row style="width: 100%; margin-top: 20px;">
           <el-table-column label="大队" prop="brigade" align="center" min-width="100" />
-          <el-table-column label="用工形式" prop="employmentType" align="center" min-width="100" />
-          <el-table-column label="员工编号" prop="employeeCode" align="center" min-width="120" />
-          <el-table-column label="员工姓名" prop="employeeName" align="center" min-width="120" />
-          <el-table-column label="考核组" prop="assessmentGroup" align="center" min-width="100" />
-          <el-table-column label="分管班组长" prop="teamLeader" align="center" min-width="120" />
-          <el-table-column label="分管主管" prop="supervisor" align="center" min-width="120" />
-          <el-table-column label="红线指标触发次数" prop="redLineTriggerCount" align="center" min-width="140" />
-          <el-table-column label="红线指标依据" prop="redLineBasis" align="center" min-width="120" show-overflow-tooltip />
-          <el-table-column label="核心指标分值" prop="coreIndicatorScore" align="center" min-width="120" />
-          <el-table-column label="核心指标依据" prop="coreIndicatorBasis" align="center" min-width="120" show-overflow-tooltip />
-          <el-table-column label="其他指标分值" prop="otherIndicatorScore" align="center" min-width="120" />
-          <el-table-column label="其他指标依据" prop="otherIndicatorBasis" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column label="用工形式" prop="employmentType" align="center" min-width="100">
+            <template #default="scope">
+              <dict-tag :options="employment_type" :value="scope.row.employmentType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="岗位" prop="post" align="center" min-width="120">
+            <template #default="scope">
+              <dict-tag :options="post" :value="scope.row.post" />
+            </template>
+          </el-table-column>
+          <el-table-column label="员工姓名" prop="userName" align="center" min-width="120" />
+          <el-table-column label="考核组" prop="assessmentTeam" align="center" min-width="100">
+            <template #default="scope">
+              <dict-tag :options="assessment_team" :value="scope.row.assessmentTeam" />
+            </template>
+          </el-table-column>
+          <el-table-column label="分管班组长" prop="deputyTeamLeaderName" align="center" min-width="120" />
+          <el-table-column label="分管主管" prop="deputySupervisorName" align="center" min-width="120" />
+          <el-table-column label="分管经理" prop="deputyManagerName" align="center" min-width="120" />
+          <el-table-column label="红线指标触发次数" prop="redLineIndexTriggerCount" align="center" min-width="140" />
+          <el-table-column label="红线指标依据" prop="redLineIndexAccordList" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column label="核心指标分值" prop="coreIndexScore" align="center" min-width="120" />
+          <el-table-column label="核心指标依据" prop="coreIndexAccordList" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column label="其他指标分值" prop="otherIndexScore" align="center" min-width="120" />
+          <el-table-column label="其他指标依据" prop="otherIndexAccordList" align="center" min-width="120" show-overflow-tooltip />
           
-          <el-table-column label="其他指标中的安全（仅含SOC/站品控检查扣分）分值" prop="safetyWithSocScore" align="center" min-width="200" show-overflow-tooltip />
-          <el-table-column label="其他指标中的安全（仅含SOC/站品控检查扣分）依据" prop="safetyWithSocBasis" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="其他指标中的安全（仅含SOC/站品控检查扣分）分值" prop="otherIndexSafetyScoreWithSocStationQcDeduction" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="其他指标中的安全（仅含SOC/站品控检查扣分）依据" prop="otherIndexSafetyScoreWithSocStationQcAccordList" align="center" min-width="200" show-overflow-tooltip />
           
-          <el-table-column label="其他指标中的安全（不含SOC/站品控检查扣分）分值" prop="safetyWithoutSocScore" align="center" min-width="200" show-overflow-tooltip />
-          <el-table-column label="其他指标中的安全（不含SOC/站品控检查扣分）依据" prop="safetyWithoutSocBasis" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="其他指标中的安全（不含SOC/站品控检查扣分）分值" prop="otherIndexSafetyScoreWithoutSocStationQcDeduction" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="其他指标中的安全（不含SOC/站品控检查扣分）依据" prop="otherIndexSafetyScoreWithoutSocStationQcAccordList" align="center" min-width="200" show-overflow-tooltip />
           
-          <el-table-column label="其他指标中的非安全指标扣分" prop="nonSafetyDeduction" align="center" min-width="160" show-overflow-tooltip />
-          <el-table-column label="其他指标中的非安全指标扣分依据" prop="nonSafetyDeductionBasis" align="center" min-width="160" show-overflow-tooltip />
+          <el-table-column label="其他指标中的非安全指标扣分" prop="otherIndexNonSafetyDeduction" align="center" min-width="160" show-overflow-tooltip />
+          <el-table-column label="其他指标中的非安全指标扣分依据" prop="otherIndexNonSafetyAccordList" align="center" min-width="160" show-overflow-tooltip />
           
-          <el-table-column label="非核心安全+核心扣分" prop="nonCoreSafetyCoreDeduction" align="center" min-width="140" />
-          <el-table-column label="SOC/站品控检查的涉及核心、安全指标扣分" prop="socSafetyCoreDeduction" align="center" min-width="200" show-overflow-tooltip />
-          <el-table-column label="SOC/站品控检查的涉及核心、安全指标扣分依据" prop="socSafetyCoreDeductionBasis" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="非核心安全+核心扣分" prop="nonCoreSafetyPlusCoreDeduction" align="center" min-width="140" />
+          <el-table-column label="SOC/站品控检查的涉及核心、安全指标扣分" prop="socStationQcInvolvedCoreSafetyDeduction" align="center" min-width="200" show-overflow-tooltip />
+          <el-table-column label="SOC/站品控检查的涉及核心、安全指标扣分依据" prop="socStationQcInvolvedCoreSafetyAccordList" align="center" min-width="200" show-overflow-tooltip />
           
-          <el-table-column label="分管员工数量" prop="managedEmployeeCount" align="center" min-width="120" />
-          <el-table-column label="扣分平均值" prop="averageDeduction" align="center" min-width="100" />
+          <el-table-column label="分管员工数量" prop="inChargeEmployeeCount" align="center" min-width="120" />
+          <el-table-column label="扣分平均值" prop="deductionAverage" align="center" min-width="100" />
           <el-table-column label="总分" prop="totalScore" align="center" min-width="100" sortable />
-          <el-table-column label="奖励明细" prop="rewardDetails" align="center" min-width="120" show-overflow-tooltip />
-          <el-table-column label="惩罚明细" prop="penaltyDetails" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column label="奖励明细" prop="rewardAccordList" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column label="惩罚明细" prop="punishmentAccordList" align="center" min-width="120" show-overflow-tooltip />
           <el-table-column label="奖励（元）" prop="rewardAmount" align="center" min-width="100" />
-          <el-table-column label="扣罚（元）" prop="penaltyAmount" align="center" min-width="100" />
+          <el-table-column label="扣罚（元）" prop="punishmentAmount" align="center" min-width="100" />
           <el-table-column label="考核结果" prop="assessmentResult" align="center" min-width="100" />
           <el-table-column label="考核结果备注" prop="assessmentResultRemark" align="center" min-width="140" show-overflow-tooltip />
           <el-table-column label="应用方式" prop="applicationMethod" align="center" min-width="100" />
           <el-table-column label="应用方式备注" prop="applicationMethodRemark" align="center" min-width="140" show-overflow-tooltip />
-          <el-table-column label="是否豁免" prop="isExempted" align="center" min-width="100">
+          <el-table-column label="是否豁免" prop="exemption" align="center" min-width="100">
             <template #default="scope">
-              <el-tag :type="scope.row.isExempted ? 'success' : 'info'">
-                {{ scope.row.isExempted ? '是' : '否' }}
+              <el-tag :type="scope.row.exemption ? 'success' : 'info'">
+                {{ scope.row.exemption ? '是' : '否' }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="是否豁免备注" prop="exemptionRemark" align="center" min-width="140" show-overflow-tooltip />
+          <el-table-column label="是否豁免备注" prop="exemptionReasonRemark" align="center" min-width="140" show-overflow-tooltip />
           <el-table-column label="考核月份" prop="assessmentMonth" align="center" min-width="120" />
 
-          <el-table-column label="操作" align="center" width="120" fixed="right">
+          <el-table-column label="操作" align="center" width="150" fixed="right">
             <template #default="scope">
               <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row, 'non-cadre')">修改</el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
@@ -147,8 +160,8 @@
         <!-- 第一部分：基础信息 -->
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="姓名" prop="employeeName">
-              <el-input v-model="nonCadreForm.employeeName" placeholder="请输入姓名" />
+            <el-form-item label="姓名" prop="userName">
+              <el-input v-model="nonCadreForm.userName" placeholder="请输入姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -173,43 +186,39 @@
           <el-col :span="8">
             <el-form-item label="用工形式" prop="employmentType">
               <el-select v-model="nonCadreForm.employmentType" placeholder="请选择用工形式" style="width: 100%">
-                <el-option v-for="item in employmentTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in employment_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分管班组长" prop="teamLeader">
-              <el-input v-model="nonCadreForm.teamLeader" placeholder="请输入分管班组长" />
+            <el-form-item label="分管班组长" prop="deputyTeamLeaderName">
+              <el-input v-model="nonCadreForm.deputyTeamLeaderName" placeholder="请输入分管班组长" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分管主管" prop="supervisor">
-              <el-input v-model="nonCadreForm.supervisor" placeholder="请输入分管主管" />
+            <el-form-item label="分管主管" prop="deputySupervisorName">
+              <el-input v-model="nonCadreForm.deputySupervisorName" placeholder="请输入分管主管" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="分管经理" prop="manager">
-              <el-input v-model="nonCadreForm.manager" placeholder="请输入分管经理" />
+            <el-form-item label="分管经理" prop="deputyManagerName">
+              <el-input v-model="nonCadreForm.deputyManagerName" placeholder="请输入分管经理" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="大队" prop="brigade">
-              <el-select v-model="nonCadreForm.brigade" placeholder="请选择大队" style="width: 100%">
-                <el-option label="一大队" value="1" />
-                <el-option label="二大队" value="2" />
-                <el-option label="三大队" value="3" />
+            <el-form-item label="考核组" prop="assessmentTeam">
+              <el-select v-model="nonCadreForm.assessmentTeam" placeholder="请选择考核组" style="width: 100%">
+                <el-option v-for="item in assessment_team" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="考核组" prop="assessmentGroup">
-              <el-select v-model="nonCadreForm.assessmentGroup" placeholder="请选择考核组" style="width: 100%">
-                <el-option label="一组" value="1" />
-                <el-option label="二组" value="2" />
-                <el-option label="三组" value="3" />
+            <el-form-item label="岗位" prop="post">
+              <el-select v-model="nonCadreForm.post" placeholder="请选择岗位" style="width: 100%">
+                <el-option v-for="item in post" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -580,10 +589,10 @@ import { ref, reactive, onMounted, getCurrentInstance, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 // API导入（需要根据实际API路径调整）
-import { listCadreAssessment, generateCadreAssessment } from '@/api/performance/monthlyAssess.js'
+import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment } from '@/api/performance/monthlyAssess.js'
 
 const { proxy } = getCurrentInstance()
-const { post, work_area } = proxy.useDict('post', 'work_area')
+const { post, work_area, employment_type, assessment_team } = proxy.useDict('post', 'work_area', 'employment_type', 'assessment_team')
 
 // 响应式数据
 const loading = ref(false)
@@ -707,14 +716,6 @@ const dialog = reactive({
 const nonCadreList = ref([])
 const cadreList = ref([])
 
-// 选项配置
-const employmentTypeOptions = [
-  { label: '正式员工', value: 'formal' },
-  { label: '合同工', value: 'contract' },
-  { label: '临时工', value: 'temporary' },
-  { label: '实习生', value: 'intern' }
-]
-
 const assessmentResultOptions = [
   { label: '优秀', value: 'excellent' },
   { label: '良好', value: 'good' },
@@ -774,9 +775,9 @@ const getList = async () => {
     }
     
     if (currentTab.value === 'non-cadre') {
-      // const res = await getNonCadreMonthlyAssessList(params)
-      // nonCadreList.value = res.rows || []
-      // total.value = res.total || 0
+      const res = await listNonCadreAssessment(params)
+      nonCadreList.value = res.rows || []
+      total.value = res.total || 0
     } else {
       // 干部数据API
       const res = await listCadreAssessment(params)
@@ -866,7 +867,7 @@ const handleDelete = async (row) => {
       type: 'warning'
     })
     
-    await deleteNonCadreMonthlyAssess(row.id)
+    await deleteNonCadreAssessment(row.id)
     ElMessage.success('删除成功')
     getList()
   } catch (error) {
@@ -884,10 +885,10 @@ const submitForm = async () => {
   try {
     if (dialog.type === 'non-cadre') {
       if (dialog.title === '新增非干部月度考核') {
-        await addNonCadreMonthlyAssess(nonCadreForm)
+        await addNonCadreAssessment(nonCadreForm)
         ElMessage.success('新增成功')
       } else {
-        await updateNonCadreMonthlyAssess(nonCadreForm)
+        await updateNonCadreAssessment(nonCadreForm)
         ElMessage.success('更新成功')
       }
     } else {
@@ -905,7 +906,22 @@ const submitForm = async () => {
 // 导出
 const handleExport = async () => {
   try {
-    ElMessage.success('导出功能开发中')
+    let params = { ...queryParams }
+    
+    if (params.assessmentMonth) {
+      const [year, month] = params.assessmentMonth.split('-')
+      params.year = parseInt(year)
+      params.month = parseInt(month)
+      delete params.assessmentMonth
+    }
+    
+    Object.keys(params).forEach(key => {
+      if (params[key] === null || params[key] === undefined || params[key] === '') {
+        delete params[key]
+      }
+    })
+    
+    proxy.download('personnel/assessment/export', params, `非干部月度考核_${new Date().getTime()}.xlsx`)
   } catch (error) {
     ElMessage.error('导出失败')
   }