From 5098a5cf0162f60752abd7495f7a3eb31a3f29d1 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 21 Apr 2025 10:23:34 +0800
Subject: [PATCH 1/2] sc
---
.../OKR/Management/Components/AllTarget.vue | 22 +++++-----
.../OKR/Management/Components/ObjectList.vue | 43 ++++++++++++++++++-
2 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/src/views/OKR/Management/Components/AllTarget.vue b/src/views/OKR/Management/Components/AllTarget.vue
index eddc3d3..bbaf08e 100644
--- a/src/views/OKR/Management/Components/AllTarget.vue
+++ b/src/views/OKR/Management/Components/AllTarget.vue
@@ -86,16 +86,18 @@ function handleSearchPeroid() {
}
function nodeChange(nodeId) {
- searchForm.value.nodeId = nodeId
- getOkrList()
- const currentNode = findNode(peroidList.value, (node) => {
- return node.nodeId == nodeId
- })
- searchForm.value.creatorId = currentNode.creatorId
- if (!currentNode.children || currentNode.children.length == 0) {
- isCurrentLeafNode.value = true
- } else {
- isCurrentLeafNode.value = false
+ if (nodeId) {
+ searchForm.value.nodeId = nodeId
+ getOkrList()
+ const currentNode = findNode(peroidList.value, (node) => {
+ return node.nodeId == nodeId
+ })
+ searchForm.value.creatorId = currentNode.creatorId
+ if (!currentNode.children || currentNode.children.length == 0) {
+ isCurrentLeafNode.value = true
+ } else {
+ isCurrentLeafNode.value = false
+ }
}
}
diff --git a/src/views/OKR/Management/Components/ObjectList.vue b/src/views/OKR/Management/Components/ObjectList.vue
index 61e1c9a..be3508d 100644
--- a/src/views/OKR/Management/Components/ObjectList.vue
+++ b/src/views/OKR/Management/Components/ObjectList.vue
@@ -30,9 +30,11 @@
@@ -74,7 +76,7 @@
-
+
@@ -89,6 +91,7 @@ import { listToTree } from '@/utils/tree'
const dataList = ref({})
const helpDataList = ref([])
+const lastExpendKeys = ref([])
const treeProps = {
children: 'children',
label: 'nodeName',
@@ -106,6 +109,7 @@ const peroidList = ref([])
handleSearchPeroid()
function handleSearchPeroid() {
+ lastExpendKeys.value = []
getOkrRelationTree().then((resp) => {
peroidList.value = resp
if (resp && resp.length && !searchForm.value.nodeId) {
@@ -116,6 +120,43 @@ function handleSearchPeroid() {
})
}
+const treeOrgRef = ref(null)
+function resetTreeData() {
+ if (treeOrgRef.value) {
+ lastExpendKeys.value = treeOrgRef.value.getExpandKeys()
+ }
+
+ // 重新获取tree数据
+ getOkrRelationTree().then((resp) => {
+ peroidList.value = resp
+ if (resp && resp.length) {
+ if (!searchForm.value.nodeId) {
+ searchForm.value.nodeId = resp[0].nodeId
+ searchForm.value.nodeName = resp[0].nodeName
+ }
+ getOkrRelationTreeChildren({
+ nodeId: searchForm.value.nodeId
+ }).then((resp) => {
+ const tree = listToTree(resp, {
+ id: 'nodeId',
+ pid: 'parentId',
+ children: 'children'
+ })
+ // // 设置展开的keys
+ // if (treeOrgRef.value) {
+ // treeOrgRef.value.setExpandKeys(lastExpendKeys.value)
+ // }
+ helpDataList.value = resp
+ if (tree && tree.length) {
+ dataList.value = tree[0]
+ } else {
+ dataList.value = {}
+ }
+ })
+ }
+ })
+}
+
function getOkrList() {
getOkrRelationTreeChildren({
nodeId: searchForm.value.nodeId
From ff3f4d9e47b8e14566e27e948651e95bc5257430 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 22 Apr 2025 15:18:08 +0800
Subject: [PATCH 2/2] 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 @@
封存
已封存
-
+
提成明细
+
+ 发送工资条
+
@@ -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)
+ }
+ })
+}