diff --git a/src/api/home/salary.js b/src/api/home/salary.js
index 7516502..76711f5 100644
--- a/src/api/home/salary.js
+++ b/src/api/home/salary.js
@@ -54,3 +54,8 @@ export const getLinkHistorySalary = async () => {
export const getCommissionDetail = async (params) => {
return await request.get({ url: '/admin-api/oa/user-salary-grant/detail', params })
}
+
+// 发送工资条通知
+export const sendSalaryNotice = (data) => {
+ return request.post({ url: '/admin-api/oa/user-salary-grant/pushUserSalaryGrantDetail', data })
+}
diff --git a/src/views/Basic/Dept/DeptForm.vue b/src/views/Basic/Dept/DeptForm.vue
index d135ccf..d3c9931 100644
--- a/src/views/Basic/Dept/DeptForm.vue
+++ b/src/views/Basic/Dept/DeptForm.vue
@@ -197,7 +197,7 @@ const resetForm = () => {
/** 获得部门树 */
const getTree = async () => {
deptTree.value = []
- const data = await DeptApi.getSimpleDeptList({ allFlag: false })
+ const data = await DeptApi.getSimpleDeptList({ allFlag: true })
let dept: Tree = { id: 0, name: '顶级部门', children: [] }
dept.children = handleTree(data)
deptTree.value.push(dept)
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index bd43f76..a8d4cd3 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -308,9 +308,24 @@
封存
已封存
-
+
提成明细
+
+ 发送工资条
+
@@ -468,6 +483,20 @@ async function handleDetail(row) {
console.log(error)
}
}
+
+function handelSendNotic(row) {
+ const name = row.grantId ? row.name : row.period
+ const params = row.grantId ? { grantId: row.grantId } : { period: row.period }
+ message.confirm('确认要发送"' + name + '"工资条吗?').then(async () => {
+ try {
+ await SalaryApi.sendSalaryNotice(params)
+ message.success('发送成功!')
+ } catch (error) {
+ message.error(error)
+ console.log(error)
+ }
+ })
+}