From ab2da33ebc729327e85cabb9f11473b7d17002d7 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 19 Jul 2024 11:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/salary.js                      | 5 ++++-
 src/views/Finance/Salary/Comp/DialogSalary.vue | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api/finance/salary.js b/src/api/finance/salary.js
index 84a1e7c..21e8e47 100644
--- a/src/api/finance/salary.js
+++ b/src/api/finance/salary.js
@@ -27,7 +27,10 @@ export const getSalarySimpleList = (params) => {
 
 // 详情
 export const getSalaryDetail = (id) => {
-  return request.get({ url: '/admin-api/oa/user-salary/get', params: { id } })
+  return request.get({
+    url: '/admin-api/oa/user-salary/getByEmployeeId',
+    params: { employeeId: id }
+  })
 }
 
 // 删除
diff --git a/src/views/Finance/Salary/Comp/DialogSalary.vue b/src/views/Finance/Salary/Comp/DialogSalary.vue
index 68f58c5..d1c1bf3 100644
--- a/src/views/Finance/Salary/Comp/DialogSalary.vue
+++ b/src/views/Finance/Salary/Comp/DialogSalary.vue
@@ -116,6 +116,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formData = ref({})
 
 const rules = {
+  validTime: { required: true, message: '生效日期不可为空', trigger: 'blur, change' },
   baseSalary: { required: true, message: '基本工资不可为空', trigger: 'blur' }
 }
 
@@ -123,11 +124,13 @@ const rules = {
 const open = async (row) => {
   dialogVisible.value = true
   dialogTitle.value = `工资条设置-【${row.name}】`
-  resetForm()
   getOptions()
   formLoading.value = true
   try {
-    formData.value = await SalaryApi.getSalaryDetail(id)
+    formData.value = await SalaryApi.getSalaryDetail(row.id)
+    if (!formData.value) {
+      resetForm()
+    }
   } finally {
     formLoading.value = false
   }