上传

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 }
+  })
 }
 
 // 删除

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
   }