Просмотр исходного кода

refactor(绩效管理): 统一参数命名并优化考核月份处理

- 将 employeeName 统一改为 name 保持命名一致性
- 修改 generateCadreAssessment 参数从 data 改为 params
- 在获取列表和生成考核时拆分 assessmentMonth 为 year 和 month
- 生成考核时使用当前年月作为默认值
huoyi 1 месяц назад
Родитель
Сommit
e9f6759120
2 измененных файлов с 24 добавлено и 8 удалено
  1. 2 2
      src/api/performance/monthlyAssess.js
  2. 22 6
      src/views/performanceManage/monthlyAssess/index.vue

+ 2 - 2
src/api/performance/monthlyAssess.js

@@ -10,10 +10,10 @@ export function listCadreAssessment(query) {
10
 }
10
 }
11
 
11
 
12
 // 生成本月考核数据
12
 // 生成本月考核数据
13
-export function generateCadreAssessment(data) {
13
+export function generateCadreAssessment(params) {
14
   return request({
14
   return request({
15
     url: '/personnel/cadre-assessment/generate',
15
     url: '/personnel/cadre-assessment/generate',
16
     method: 'post',
16
     method: 'post',
17
-    data: data
17
+    params: params
18
   })
18
   })
19
 }
19
 }

+ 22 - 6
src/views/performanceManage/monthlyAssess/index.vue

@@ -12,8 +12,8 @@
12
       <!-- 查询条件 -->
12
       <!-- 查询条件 -->
13
       <div class="filter-container">
13
       <div class="filter-container">
14
         <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="search-form">
14
         <el-form :model="queryParams" ref="queryFormRef" :inline="true" class="search-form">
15
-          <el-form-item label="姓名" prop="employeeName">
16
-            <el-input v-model="queryParams.employeeName" placeholder="请输入姓名" clearable style="width: 200px" />
15
+          <el-form-item label="姓名" prop="name">
16
+            <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable style="width: 200px" />
17
           </el-form-item>
17
           </el-form-item>
18
           
18
           
19
           <el-form-item label="考核月份" prop="assessmentMonth">
19
           <el-form-item label="考核月份" prop="assessmentMonth">
@@ -601,7 +601,7 @@ watch(() => currentTab.value, () => {
601
 const queryParams = reactive({
601
 const queryParams = reactive({
602
   pageNum: 1,
602
   pageNum: 1,
603
   pageSize: 10,
603
   pageSize: 10,
604
-  employeeName: '',
604
+  name: '',
605
   assessmentMonth: ''
605
   assessmentMonth: ''
606
 })
606
 })
607
 
607
 
@@ -763,13 +763,23 @@ const cadreRules = {
763
 const getList = async () => {
763
 const getList = async () => {
764
   loading.value = true
764
   loading.value = true
765
   try {
765
   try {
766
+    // 将 assessmentMonth 拆分为 year 和 month
767
+    let params = { ...queryParams }
768
+    
769
+    if (params.assessmentMonth) {
770
+      const [year, month] = params.assessmentMonth.split('-')
771
+      params.year = parseInt(year)
772
+      params.month = parseInt(month)
773
+      delete params.assessmentMonth
774
+    }
775
+    
766
     if (currentTab.value === 'non-cadre') {
776
     if (currentTab.value === 'non-cadre') {
767
-      // const res = await getNonCadreMonthlyAssessList(queryParams)
777
+      // const res = await getNonCadreMonthlyAssessList(params)
768
       // nonCadreList.value = res.rows || []
778
       // nonCadreList.value = res.rows || []
769
       // total.value = res.total || 0
779
       // total.value = res.total || 0
770
     } else {
780
     } else {
771
       // 干部数据API
781
       // 干部数据API
772
-      const res = await listCadreAssessment(queryParams)
782
+      const res = await listCadreAssessment(params)
773
       
783
       
774
       cadreList.value = res.rows || []
784
       cadreList.value = res.rows || []
775
       total.value = res.total || 0
785
       total.value = res.total || 0
@@ -910,7 +920,13 @@ const generateMonthlyAssessment = async () => {
910
       type: 'warning'
920
       type: 'warning'
911
     }).then(async () => {
921
     }).then(async () => {
912
       loading.value = true
922
       loading.value = true
913
-      const res = await generateCadreAssessment({ assessmentMonth: queryParams.assessmentMonth })
923
+      // 使用当前年月的日期
924
+      const now = new Date()
925
+      const params = {
926
+        year: now.getFullYear(),
927
+        month: now.getMonth() + 1
928
+      }
929
+      const res = await generateCadreAssessment(params)
914
       ElMessage.success('生成成功')
930
       ElMessage.success('生成成功')
915
       getList()
931
       getList()
916
     }).catch(() => {})
932
     }).catch(() => {})