src/api/home/salary.js

@@ -54,8 +54,3 @@ 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 })
-}

src/views/Basic/Dept/DeptForm.vue

@@ -197,7 +197,7 @@ const resetForm = () => {
 /** 获得部门树 */
 const getTree = async () => {
   deptTree.value = []
-  const data = await DeptApi.getSimpleDeptList({ allFlag: true })
+  const data = await DeptApi.getSimpleDeptList({ allFlag: false })
   let dept: Tree = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)

src/views/Home/Salary/index.vue

@@ -308,24 +308,9 @@
             <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"
-            style="padding: 0"
-            text
-            @click="handleDetail(row)"
-          >
+          <el-button type="primary" v-if="row.grantId" 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>
@@ -483,20 +468,6 @@ 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>

src/views/OKR/Management/Components/AllTarget.vue

@@ -86,18 +86,16 @@ function handleSearchPeroid() {
 }
 
 function nodeChange(nodeId) {
-  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
-    }
+  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
   }
 }
 

src/views/OKR/Management/Components/DialogOkrInfo.vue

@@ -521,7 +521,6 @@ 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('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {

src/views/OKR/Management/Components/ObjectList.vue

@@ -30,11 +30,9 @@
     </div>
 
     <vue3-tree-org
-      ref="treeOrgRef"
       :data="dataList"
       center
       collapsable
-      :default-expand-keys="lastExpendKeys"
       :props="treeProps"
       @on-node-click="handleClickNode"
     >
@@ -76,7 +74,7 @@
       </template>
     </vue3-tree-org>
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
-    <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" @success="resetTreeData" />
+    <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" />
   </div>
 </template>
 
@@ -91,7 +89,6 @@ import { listToTree } from '@/utils/tree'
 
 const dataList = ref({})
 const helpDataList = ref([])
-const lastExpendKeys = ref([])
 const treeProps = {
   children: 'children',
   label: 'nodeName',
@@ -109,7 +106,6 @@ const peroidList = ref([])
 handleSearchPeroid()
 
 function handleSearchPeroid() {
-  lastExpendKeys.value = []
   getOkrRelationTree().then((resp) => {
     peroidList.value = resp
     if (resp && resp.length && !searchForm.value.nodeId) {
@@ -120,43 +116,6 @@ 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