From 34a1fc56d3845fb353ee1c7f234360e30ead3add Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 25 Dec 2024 17:05:06 +0800
Subject: [PATCH] sc

---
 src/views/Finance/Salary/Comp/DialogSalary.vue | 7 ++++---
 src/views/Kpi/Record/index.vue                 | 2 +-
 src/views/Kpi/Score/index.vue                  | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/Finance/Salary/Comp/DialogSalary.vue b/src/views/Finance/Salary/Comp/DialogSalary.vue
index 920543a..39afa1d 100644
--- a/src/views/Finance/Salary/Comp/DialogSalary.vue
+++ b/src/views/Finance/Salary/Comp/DialogSalary.vue
@@ -133,9 +133,10 @@ const open = async (row) => {
   formLoading.value = true
   try {
     const data = await SalaryApi.getSalaryDetail(row.id)
-    formData.value = { ...data, meritsRate: data.meritsRate * 100 }
-    if (!formData.value) {
+    if (!data) {
       resetForm(row.id)
+    } else {
+      formData.value = { ...data }
     }
   } finally {
     formLoading.value = false
@@ -179,7 +180,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = { ...formData.value }
     await SalaryApi.updateSalary(data)
     message.success('配置成功')
     dialogVisible.value = false
diff --git a/src/views/Kpi/Record/index.vue b/src/views/Kpi/Record/index.vue
index 5e7754e..1b82a82 100644
--- a/src/views/Kpi/Record/index.vue
+++ b/src/views/Kpi/Record/index.vue
@@ -56,7 +56,7 @@
       </el-table-column>
       <el-table-column prop="period" label="年月" min-width="90px" />
       <el-table-column prop="dept" label="组织" min-width="90px" />
-      <el-table-column label="考核总分" prop="" align="center" />
+      <el-table-column label="考核总分" prop="score" align="center" />
       <el-table-column label="操作" fixed="right" width="200">
         <template #default="{ row }">
           <el-button
diff --git a/src/views/Kpi/Score/index.vue b/src/views/Kpi/Score/index.vue
index b4b71c8..936bdbf 100644
--- a/src/views/Kpi/Score/index.vue
+++ b/src/views/Kpi/Score/index.vue
@@ -198,7 +198,8 @@ function getSummaries({ columns, data }) {
     const values = data.map((item) => Number(item[column.property]))
     if (!values.every((value) => Number.isNaN(value))) {
       if (column.property == 'weightSocre') {
-        sums[index] = 5.6
+        const employee = employeeOptions.value.find((it) => it.examinedUser == employeeId.value)
+        sums[index] = employee.scoreTotal
       } else {
         sums[index] = ''
       }