From ff3f4d9e47b8e14566e27e948651e95bc5257430 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 22 Apr 2025 15:18:08 +0800
Subject: [PATCH] sc

---
 src/api/home/salary.js                        |  5 +++
 src/views/Basic/Dept/DeptForm.vue             |  2 +-
 src/views/Home/Salary/index.vue               | 31 ++++++++++++++++++-
 .../Management/Components/DialogOkrInfo.vue   |  1 +
 4 files changed, 37 insertions(+), 2 deletions(-)

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 @@
             <span v-if="row.status == 0">封存</span>
             <span v-else-if="row.status == 1">已封存</span>
           </el-button>
-          <el-button type="primary" v-if="row.grantId" text @click="handleDetail(row)">
+          <el-button
+            type="primary"
+            v-if="row.grantId"
+            style="padding: 0"
+            text
+            @click="handleDetail(row)"
+          >
             提成明细
           </el-button>
+          <el-button
+            type="primary"
+            text
+            v-hasPermi="['home:salary:send']"
+            style="padding: 0"
+            @click="handelSendNotic(row)"
+          >
+            发送工资条
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -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)
+    }
+  })
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 22cc15d..5a2e3c4 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -521,6 +521,7 @@ async function handleSave() {
   const valid = await formRef.value.validate()
   if (!valid) return
 
+  form.value.executor = form.value.executor || []
   if (form.value.executor.length > 1) {
     message
       .confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {