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 @@
-
+
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] = ''
}