Compare commits

..

No commits in common. 'main' and 'dev-zcx' have entirely different histories.

  1. 4
      .env.base
  2. 5
      src/api/home/salary.js
  3. 39
      src/api/okr/okr.js
  4. 4
      src/api/system/dept/index.ts
  5. 58
      src/router/modules/remaining.ts
  6. 37
      src/views/Basic/Dept/DeptForm.vue
  7. 3
      src/views/Basic/Dept/index.vue
  8. 13
      src/views/Basic/User/UserForm.vue
  9. 203
      src/views/Basic/User/index.vue
  10. 31
      src/views/Home/Salary/index.vue
  11. 2
      src/views/Kpi/Appraise/Components/DialogAppraise.vue
  12. 44
      src/views/OKR/Management/Components/AllTarget.vue
  13. 45
      src/views/OKR/Management/Components/DialogOkr.vue
  14. 42
      src/views/OKR/Management/Components/DialogOkrInfo.vue
  15. 7
      src/views/OKR/Management/Components/MyDuty.vue
  16. 120
      src/views/OKR/Management/Components/MySon.vue
  17. 48
      src/views/OKR/Management/Components/ObjectList.vue
  18. 4
      src/views/OKR/Management/Components/WaitTarget.vue
  19. 23
      src/views/OKR/Management/index.vue
  20. 14
      src/views/Pers/Employee/Comp/DialogEmployee.vue

@ -4,9 +4,9 @@ VITE_NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
# VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48080'
VITE_BASE_URL='http://47.98.161.246:48080' # VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.55.169.15:48080' # VITE_BASE_URL='http://114.55.169.15:48080'
# 上传路径 # 上传路径

@ -54,8 +54,3 @@ export const getLinkHistorySalary = async () => {
export const getCommissionDetail = async (params) => { export const getCommissionDetail = async (params) => {
return await request.get({ url: '/admin-api/oa/user-salary-grant/detail', 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 })
}

@ -20,10 +20,10 @@ export const updateOkrNode = (data) => {
} }
// 查询详情 // 查询详情
export const getOkrNodeDetail = (params) => { export const getOkrNodeDetail = (nodeId) => {
return request.get({ return request.get({
url: '/admin-api/okr/node/get', url: '/admin-api/okr/node/get',
params params: { nodeId }
// headers: { 'instance-id': 1016 } // headers: { 'instance-id': 1016 }
}) })
} }
@ -108,38 +108,3 @@ export const getOkrRelationTreeChildren = (params) => {
// headers: { 'instance-id': 1016 } // headers: { 'instance-id': 1016 }
}) })
} }
// 获取我的组员
export const getMyMemberList = (params) => {
return request.get({
url: '/admin-api/okr/node/my-members',
params
// headers: { 'instance-id': 1016 }
})
}
// 获取我的组员节点树
export const getMySonNodeTree = (params) => {
return request.get({
url: '/admin-api/okr/node/member/node/list',
params
// headers: { 'instance-id': 1016 }
})
}
// 获取我的组员OKR列表
export const getMySonOkrPage = (params) => {
return request.get({
url: '/admin-api/okr/node/member/objective/list',
params
// headers: { 'instance-id': 1016 }
})
}
// 获取渠道
export const getChannelOptions = () => {
return request.get({
url: '/admin-api/okr/node/source'
// headers: { 'instance-id': 1016 }
})
}

@ -13,8 +13,8 @@ export interface DeptVO {
} }
// 查询部门(精简)列表 // 查询部门(精简)列表
export const getSimpleDeptList = async (params: any): Promise<any[]> => { export const getSimpleDeptList = async (): Promise<DeptVO[]> => {
return await request.get({ url: '/admin-api/system/dept/list-all-simple', params }) return await request.get({ url: '/admin-api/system/dept/list-all-simple' })
} }
// 查询部门列表 // 查询部门列表

@ -106,29 +106,41 @@ const remainingRouter: AppRouteRecordRaw[] = [
} }
] ]
}, },
// { {
// path: '/Basic', path: '/Basic',
// component: Layout, component: Layout,
// name: 'Basic', name: 'Basic',
// meta: { meta: {
// title: '菜单管理' title: '菜单管理'
// }, },
// redirect: '/Basic/menu', redirect: '/Basic/menu',
// children: [ children: [
// { {
// path: 'menu', path: 'menu',
// component: () => import('@/views/Basic/Menu/index.vue'), component: () => import('@/views/Basic/Menu/index.vue'),
// name: 'Menu', name: 'Menu',
// meta: { meta: {
// canTo: true, canTo: true,
// // hidden: true, // hidden: true,
// noTagsView: false, noTagsView: false,
// icon: 'ep:user', icon: 'ep:user',
// title: '菜单管理' title: '菜单管理'
// } }
// } },
// ] {
// }, path: 'okr',
component: () => import('@/views/OKR/Management/index.vue'),
name: 'OkrManagement',
meta: {
canTo: true,
// hidden: true,
noTagsView: false,
icon: 'ep:user',
title: 'Okr管理'
}
}
]
},
{ {
path: '/login', path: '/login',
component: () => import('@/views/Login/Login.vue'), component: () => import('@/views/Login/Login.vue'),

@ -30,12 +30,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="负责人" prop="leaderUserId"> <el-form-item label="负责人" prop="leaderUserId">
<el-select <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
v-model="formData.leaderUserId"
clearable
filterable
placeholder="请输入负责人"
>
<el-option <el-option
v-for="item in employeeOptions" v-for="item in employeeOptions"
:key="item.id" :key="item.id"
@ -62,15 +57,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="业务系统" prop="instanceId"> <el-form-item label="开通系统" prop="instanceIds">
<el-select <el-select
v-model="formData.instanceId" v-model="formData.instanceIds"
placeholder="选择主业务系统" placeholder="选择开通系统"
multiple
collapse-tags
clearable clearable
filterable filterable
> >
<el-option <el-option
v-for="item in instanceIdOptions" v-for="item in instanceIdsOptions"
:key="item.instanceId" :key="item.instanceId"
:label="item.instanceName" :label="item.instanceName"
:disabled="item.status == 1" :disabled="item.status == 1"
@ -108,7 +105,16 @@ const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // const dialogTitle = ref('') //
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const formData = ref<any>({}) const formData = ref({
id: undefined,
parentId: undefined,
name: undefined,
sort: 1,
leaderUserId: undefined,
status: CommonStatusEnum.ENABLE,
remark: undefined,
instanceIds: undefined
})
const formRules = reactive<any>({ const formRules = reactive<any>({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }], parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
@ -122,7 +128,7 @@ const formRules = reactive<any>({
const formRef = ref() // Ref const formRef = ref() // Ref
const deptTree = ref() // const deptTree = ref() //
const employeeOptions = ref<any>([]) // const employeeOptions = ref<any>([]) //
const instanceIdOptions = ref<any>([]) // ids const instanceIdsOptions = ref<any>([]) // ids
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
@ -135,7 +141,6 @@ const open = async (type: string, id?: number) => {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await DeptApi.getDept(id) formData.value = await DeptApi.getDept(id)
formData.value.remark = formData.value.remark || ''
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -146,7 +151,7 @@ const open = async (type: string, id?: number) => {
}) })
// //
getSimpleAppList().then((data) => { getSimpleAppList().then((data) => {
instanceIdOptions.value = data instanceIdsOptions.value = data
}) })
// //
await getTree() await getTree()
@ -189,7 +194,7 @@ const resetForm = () => {
leaderUserId: undefined, leaderUserId: undefined,
status: CommonStatusEnum.ENABLE, status: CommonStatusEnum.ENABLE,
remark: undefined, remark: undefined,
instanceId: undefined instanceIds: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
@ -197,7 +202,7 @@ const resetForm = () => {
/** 获得部门树 */ /** 获得部门树 */
const getTree = async () => { const getTree = async () => {
deptTree.value = [] deptTree.value = []
const data = await DeptApi.getSimpleDeptList({ allFlag: true }) const data = await DeptApi.getSimpleDeptList()
let dept: Tree = { id: 0, name: '顶级部门', children: [] } let dept: Tree = { id: 0, name: '顶级部门', children: [] }
dept.children = handleTree(data) dept.children = handleTree(data)
deptTree.value.push(dept) deptTree.value.push(dept)

@ -22,7 +22,7 @@
<el-table v-loading="loading" :data="list" row-key="id" default-expand-all border> <el-table v-loading="loading" :data="list" row-key="id" default-expand-all border>
<el-table-column prop="name" label="部门名称" /> <el-table-column prop="name" label="部门名称" />
<el-table-column prop="leaderUserName" label="负责人" width="120" /> <el-table-column prop="leaderUserName" label="负责人" width="120" />
<el-table-column prop="instanceName" label="业务系统" width="200" /> <el-table-column prop="instanceNames" label="业务系统" width="200" />
<el-table-column prop="sort" label="排序" width="80" /> <el-table-column prop="sort" label="排序" width="80" />
<el-table-column prop="status" label="状态" width="100"> <el-table-column prop="status" label="状态" width="100">
<template #default="scope"> <template #default="scope">
@ -68,7 +68,6 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // const loading = ref(true) //
const list = ref() // const list = ref() //
const queryParams = reactive({ const queryParams = reactive({
allFlag: true,
name: undefined name: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //

@ -13,7 +13,7 @@
<el-input v-model="formData.nickname" placeholder="请输入用户姓名" /> <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <el-col :span="12">
<el-form-item label="用户性别"> <el-form-item label="用户性别">
<el-radio-group v-model="formData.sex"> <el-radio-group v-model="formData.sex">
<el-radio :value="1"> </el-radio> <el-radio :value="1"> </el-radio>
@ -34,7 +34,7 @@
placeholder="请选择归属部门" placeholder="请选择归属部门"
/> />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色" prop="role"> <el-form-item label="角色" prop="role">
<el-select <el-select
@ -84,7 +84,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="入职日期" prop="hireDate"> <el-form-item label="入职日期" prop="hireDate">
<el-date-picker <el-date-picker
@ -96,7 +96,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
@ -113,8 +113,7 @@
</template> </template>
<script lang="ts" name="SystemUserForm" setup> <script lang="ts" name="SystemUserForm" setup>
import { CommonStatusEnum } from '@/utils/constants' import { CommonStatusEnum } from '@/utils/constants'
// import { defaultProps, handleTree } from '@/utils/tree' import { defaultProps, handleTree } from '@/utils/tree'
import { handleTree } from '@/utils/tree'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import * as RoleApi from '@/api/system/role' import * as RoleApi from '@/api/system/role'
@ -175,7 +174,7 @@ const open = async (type: string, id?: number) => {
} }
} }
// //
deptList.value = handleTree(await DeptApi.getSimpleDeptList({ allFlag: false })) deptList.value = handleTree(await DeptApi.getSimpleDeptList())
// //
roleOptions.value = await RoleApi.getSimpleRoleList() roleOptions.value = await RoleApi.getSimpleRoleList()
} }

@ -1,100 +1,105 @@
<template> <template>
<!-- <el-row :gutter="20"> --> <el-row :gutter="20">
<!-- 左侧部门树 --> <!-- 左侧部门树 -->
<!-- <el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<DeptTree @node-click="handleDeptNodeClick" /> <DeptTree @node-click="handleDeptNodeClick" />
</el-col> </el-col>
<el-col :span="20" :xs="24"> --> <el-col :span="20" :xs="24">
<!-- 搜索 --> <!-- 搜索 -->
<el-form :model="queryParams" ref="queryFormRef" inline label-width="0"> <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
<el-form-item prop="nickname"> <el-form-item label="姓名" prop="nickname">
<el-input <el-input
v-model="queryParams.nickname" v-model="queryParams.nickname"
placeholder="请输入姓名" placeholder="请输入姓名"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input <el-input
v-model="queryParams.mobile" v-model="queryParams.mobile"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button> <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
<el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button> <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
<el-button <el-button
type="primary" type="primary"
plain plain
@click="openForm('create')" @click="openForm('create')"
v-hasPermi="['basic:employee:add']" v-hasPermi="['basic:employee:add']"
> >
新增 新增
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="用户编号" key="id" prop="id" /> <el-table-column label="用户编号" key="id" prop="id" />
<el-table-column label="登录账号" prop="username" /> <el-table-column label="登录账号" prop="username" />
<el-table-column label="用户姓名" prop="nickname" /> <el-table-column label="用户姓名" prop="nickname" />
<!-- <el-table-column label="部门" key="deptName" prop="deptName" /> --> <el-table-column label="部门" key="deptName" prop="deptName" />
<el-table-column label="手机号码" prop="mobile" width="120" /> <el-table-column label="手机号码" prop="mobile" width="120" />
<el-table-column label="状态" key="status"> <el-table-column label="状态" key="status">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
:active-value="0" :active-value="0"
:inactive-value="1" :inactive-value="1"
active-text="在职" active-text="在职"
inactive-text="离职" inactive-text="离职"
v-hasPermi="['basic:employee:update']" v-hasPermi="['basic:employee:update']"
@change="handleStatusChange(scope.row)" @change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column
label="创建时间"
prop="createTime"
width="180"
:formatter="dateFormatter"
/> />
</template> <el-table-column label="操作" width="260">
</el-table-column> <template #default="scope">
<el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" /> <el-button
<el-table-column label="操作" width="260"> type="primary"
<template #default="scope"> link
<el-button @click="openForm('update', scope.row.id)"
type="primary" v-hasPermi="['basic:employee:update']"
link >
@click="openForm('update', scope.row.id)" 修改
v-hasPermi="['basic:employee:update']" </el-button>
> <el-button
修改 type="primary"
</el-button> link
<el-button @click="handleDelete(scope.row.id)"
type="primary" v-hasPermi="['basic:employee:delete']"
link >
@click="handleDelete(scope.row.id)" 删除
v-hasPermi="['basic:employee:delete']" </el-button>
> <el-button
删除 type="primary"
</el-button> link
<el-button @click="handleResetPwd(scope.row)"
type="primary" v-hasPermi="['basic:employee:password']"
link >
@click="handleResetPwd(scope.row)" 重置密码
v-hasPermi="['basic:employee:password']" </el-button>
> </template>
重置密码 </el-table-column>
</el-button> </el-table>
</template> <Pagination
</el-table-column> :total="total"
</el-table> v-model:page="queryParams.pageNo"
<Pagination v-model:limit="queryParams.pageSize"
:total="total" @pagination="getList"
v-model:page="queryParams.pageNo" />
v-model:limit="queryParams.pageSize" </el-col>
@pagination="getList" </el-row>
/>
<!-- </el-col> -->
<!-- </el-row> -->
<!-- 添加或修改用户对话框 --> <!-- 添加或修改用户对话框 -->
<UserForm ref="formRef" @success="getList" /> <UserForm ref="formRef" @success="getList" />
@ -104,7 +109,7 @@ import { CommonStatusEnum } from '@/utils/constants'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import * as UserApi from '@/api/system/user' import * as UserApi from '@/api/system/user'
import UserForm from './UserForm.vue' import UserForm from './UserForm.vue'
// import DeptTree from './DeptTree.vue' import DeptTree from './DeptTree.vue'
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
@ -145,11 +150,11 @@ const resetQuery = () => {
handleQuery() handleQuery()
} }
// /** */ /** 处理部门被点击 */
// const handleDeptNodeClick = async (row) => { const handleDeptNodeClick = async (row) => {
// queryParams.deptId = row.id queryParams.deptId = row.id
// await getList() await getList()
// } }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()

@ -308,24 +308,9 @@
<span v-if="row.status == 0">封存</span> <span v-if="row.status == 0">封存</span>
<span v-else-if="row.status == 1">已封存</span> <span v-else-if="row.status == 1">已封存</span>
</el-button> </el-button>
<el-button <el-button type="primary" v-if="row.grantId" text @click="handleDetail(row)">
type="primary"
v-if="row.grantId"
style="padding: 0"
text
@click="handleDetail(row)"
>
提成明细 提成明细
</el-button> </el-button>
<el-button
type="primary"
text
v-hasPermi="['home:salary:send']"
style="padding: 0"
@click="handelSendNotic(row)"
>
发送工资条
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -483,20 +468,6 @@ async function handleDetail(row) {
console.log(error) 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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -12,7 +12,7 @@
<el-date-picker <el-date-picker
v-model="form.effectiveDate" v-model="form.effectiveDate"
type="date" type="date"
:disabled="!!form.id" :disabled="form.id"
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="选择日期时间" placeholder="选择日期时间"

@ -72,32 +72,25 @@ const isCurrentLeafNode = ref(false)
function handleSearchPeroid() { function handleSearchPeroid() {
getAllNodeTree().then((resp) => { getAllNodeTree().then((resp) => {
if (resp.nodeId) { peroidList.value = listToTree(resp.tree, {
peroidList.value = listToTree(resp.tree, { id: 'nodeId',
id: 'nodeId', pid: 'parentId',
pid: 'parentId', children: 'children'
children: 'children' })
}) nodeChange(resp.nodeId)
nodeChange(resp.nodeId)
} else {
message.warning('请先创建节点数据')
}
}) })
} }
function nodeChange(nodeId) { function nodeChange(nodeId) {
if (nodeId) { searchForm.value.nodeId = nodeId
searchForm.value.nodeId = nodeId getOkrList()
getOkrList() const currentNode = findNode(peroidList.value, (node) => {
const currentNode = findNode(peroidList.value, (node) => { return node.nodeId == nodeId
return node.nodeId == nodeId })
}) if (!currentNode.children || currentNode.children.length == 0) {
searchForm.value.creatorId = currentNode.creatorId isCurrentLeafNode.value = true
if (!currentNode.children || currentNode.children.length == 0) { } else {
isCurrentLeafNode.value = true isCurrentLeafNode.value = false
} else {
isCurrentLeafNode.value = false
}
} }
} }
@ -115,9 +108,9 @@ function handleAddNode() {
dialogOkrInfo.value.open('create', null) dialogOkrInfo.value.open('create', null)
} }
function handleEditOkr(nodeId = undefined) { function handleEditOkr() {
dialogOkr.value.close() dialogOkr.value.close()
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2) dialogOkrInfo.value.open('update', searchForm.value.nodeId)
} }
function handleUpdateProcess() { function handleUpdateProcess() {
@ -131,8 +124,7 @@ const dialogOkr = ref(null)
function handleShowOkr(id) { function handleShowOkr(id) {
dialogOkr.value.open({ dialogOkr.value.open({
nodeId: id, nodeId: id,
canEdit: isCurrentLeafNode.value, canEdit: isCurrentLeafNode.value
queryType: 2
}) })
} }
</script> </script>

@ -18,31 +18,11 @@
<span class="text-14px ml-0.25">ork落地</span> <span class="text-14px ml-0.25">ork落地</span>
<div class="ml-20px text-14px"> <div class="ml-20px text-14px">
<span>节点</span> <span>节点</span>
<span <span>{{ nodeInfo.allNodeName }}</span>
v-for="(item, index) in nodeInfo.parentNodes"
:key="item.nodeId"
@click="handleChildItem(item)"
>
<span
class="cursor-pointer"
:style="{
color: index < nodeInfo.parentNodes.length - 1 ? '#409eff' : '#333',
borderBottom:
index < nodeInfo.parentNodes.length - 1 ? '1px solid #409eff' : 'none'
}"
>
{{ item.nodeName }}
</span>
<span v-if="index != nodeInfo.parentNodes.length - 1"> -> </span>
</span>
</div> </div>
</div> </div>
<div class="flex items-center"> <div class="flex items-center">
<el-button <el-button v-if="nodeInfo.creatorId == currentUserId" link @click="emit('edit')">
v-if="nodeInfo.creatorId == currentUserId"
link
@click="emit('edit', nodeInfo.nodeId)"
>
<el-tooltip content="编辑" placement="top" effect="dark"> <el-tooltip content="编辑" placement="top" effect="dark">
<Icon icon="ep:edit" :size="16" /> <Icon icon="ep:edit" :size="16" />
</el-tooltip> </el-tooltip>
@ -339,19 +319,9 @@ import { useUserStore } from '@/store/modules/user'
const message = useMessage() const message = useMessage()
const userStore = useUserStore() const userStore = useUserStore()
const currentUserId = userStore.getUser.id const currentUserId = userStore.getUser.id
const emit = defineEmits(['edit', 'close']) const emit = defineEmits(['edit'])
const show = ref(false) const show = ref(false)
watch(
() => show.value,
(newValue, oldValue) => {
if (oldValue && !newValue) {
emit('close', nodeInfo.value)
}
}
)
const canEdit = ref(false) const canEdit = ref(false)
const toolbarConfig = { const toolbarConfig = {
@ -381,11 +351,9 @@ const nodeInfo = ref({})
const nodeRecords = ref([]) const nodeRecords = ref([])
const commentTypeOptions = ref([]) const commentTypeOptions = ref([])
const queryType = ref(1)
function open(curNode) { function open(curNode) {
canEdit.value = curNode.canEdit canEdit.value = curNode.canEdit
nodeInfo.value.nodeId = curNode.nodeId nodeInfo.value.nodeId = curNode.nodeId
queryType.value = curNode.queryType
// //
searchInfo(curNode) searchInfo(curNode)
show.value = true show.value = true
@ -395,12 +363,13 @@ const employeeOptions = ref([])
function searchInfo(curNode) { function searchInfo(curNode) {
try { try {
getOkrNodeDetail({ nodeId: curNode.nodeId, queryType: queryType.value }).then((resp) => { getOkrNodeDetail(curNode.nodeId).then((resp) => {
nodeInfo.value = { nodeInfo.value = {
...resp, ...resp,
executor: resp.executor || [] executor: resp.executor || []
} }
canEdit.value = canEdit.value && nodeInfo.value.executor.includes(currentUserId + '') canEdit.value =
canEdit.value && currentUserId == nodeInfo.value.executor.includes(currentUserId)
if (resp.objectives) { if (resp.objectives) {
okrList.value = resp.objectives.map((item) => ({ okrList.value = resp.objectives.map((item) => ({
...item, ...item,
@ -445,7 +414,7 @@ function handleMention(item) {
function handleSaveProcess() { function handleSaveProcess() {
okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => { okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => {
message.success('更新成功') message.success('更新成功')
searchInfo({ nodeId: nodeInfo.value.nodeId }) searchInfo()
}) })
} }

@ -332,8 +332,7 @@ import {
createOkrNode, createOkrNode,
updateOkrNode, updateOkrNode,
getAllOkrPage, getAllOkrPage,
getDefaultOkrOptions, getDefaultOkrOptions
getChannelOptions
} from '@/api/okr/okr' } from '@/api/okr/okr'
import { listToTree } from '@/utils/tree' import { listToTree } from '@/utils/tree'
import { getEmployeeSimpleList } from '@/api/pers/employee' import { getEmployeeSimpleList } from '@/api/pers/employee'
@ -379,7 +378,7 @@ const defaultProps = {
} }
const sourceOptions = ref([]) const sourceOptions = ref([])
const objectList = ref([]) const objectList = ref([])
function open(type, val, queryType) { function open(type, val) {
show.value = true show.value = true
title.value = type == 'update' ? '修改Okr' : '新增Okr' title.value = type == 'update' ? '修改Okr' : '新增Okr'
formType.value = type formType.value = type
@ -397,20 +396,10 @@ function open(type, val, queryType) {
getDefaultOkrOptions().then((resp) => { getDefaultOkrOptions().then((resp) => {
krOptions.value = resp krOptions.value = resp
}) })
getChannelOptions().then((resp) => {
sourceOptions.value = listToTree(resp, {
id: 'sourceId',
pid: 'parentId',
children: 'children'
})
})
if (val) { if (val) {
formLoading.value = true formLoading.value = true
try { try {
getOkrNodeDetail({ getOkrNodeDetail(val).then((resp) => {
nodeId: val,
queryType
}).then((resp) => {
form.value = resp form.value = resp
if (resp.objectives) { if (resp.objectives) {
objectList.value = resp.objectives.map((item) => ({ objectList.value = resp.objectives.map((item) => ({
@ -479,7 +468,7 @@ function removeKR(oIdx, krIdx) {
} }
function addChildNode() { function addChildNode() {
childNodeList.value.push({ dataScope: 1 }) childNodeList.value.push({})
} }
function removeChildNode(idx) { function removeChildNode(idx) {
@ -520,32 +509,9 @@ async function handleSave() {
if (!formRef.value) return if (!formRef.value) return
const valid = await formRef.value.validate() const valid = await formRef.value.validate()
if (!valid) return if (!valid) return
form.value.executor = form.value.executor || []
if (form.value.executor.length > 1) {
message
.confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点?', {
type: 'warning',
showCancelButton: true,
cancelButtonText: '取消',
confirmButtonText: '确定'
})
.then(() => {
saveOkrData(true)
})
.catch(() => {
saveOkrData(false)
})
} else {
saveOkrData(false)
}
}
async function saveOkrData(isAutoAddChild = false) {
// //
formLoading.value = true formLoading.value = true
try { try {
form.value.isAutoAddChild = isAutoAddChild
form.value.objectives = objectList.value form.value.objectives = objectList.value
form.value.children = childNodeList.value form.value.children = childNodeList.value
if (formType.value === 'create') { if (formType.value === 'create') {

@ -77,9 +77,9 @@ const dialogOkrInfo = ref(null)
// dialogOkrInfo.value.open('create', null) // dialogOkrInfo.value.open('create', null)
// } // }
function handleEditOkr(nodeId = undefined) { function handleEditOkr() {
dialogOkr.value.close() dialogOkr.value.close()
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 1) dialogOkrInfo.value.open('update', 1)
} }
function handleUpdateProcess() { function handleUpdateProcess() {
@ -93,8 +93,7 @@ const dialogOkr = ref(null)
function handleShowOkr(id) { function handleShowOkr(id) {
dialogOkr.value.open({ dialogOkr.value.open({
nodeId: id, nodeId: id,
canEdit: true, canEdit: true
queryType: 1
}) })
} }
</script> </script>

@ -1,120 +0,0 @@
<template>
<div>
<div class="flex items-center justify-between">
<el-row>
<el-tree-select
v-model="searchForm.nodeId"
:data="peroidList"
:props="defaultProps"
:render-after-expand="false"
:default-expand-all="false"
style="width: 400px"
@change="nodeChange"
/>
</el-row>
<el-row>
<el-button type="info" @click="handleShowOkr(searchForm.nodeId)"> 节点详情 </el-button>
<el-button
type="warning"
v-if="currentUserId == searchForm.creatorId"
@click="handleEditOkr(searchForm.nodeId)"
>
修改当前节点
</el-button>
</el-row>
</div>
<OkrTable ref="okrTableRef" canEdit />
<DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
<DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
</div>
</template>
<script setup name="MySon">
import OkrTable from './OkrTable.vue'
import DialogOkr from './DialogOkr.vue'
import DialogOkrInfo from './DialogOkrInfo.vue'
import { listToTree, findNode } from '@/utils/tree'
import { useUserStore } from '@/store/modules/user'
import { getMySonNodeTree, getMySonOkrPage } from '@/api/okr/okr'
const props = defineProps({
userId: {
type: Number,
default: undefined
}
})
const defaultProps = {
value: 'nodeId',
label: 'nodeName',
children: 'children'
}
const userStore = useUserStore()
const currentUserId = userStore.getUser.id
const okrTableRef = ref(null)
const searchForm = ref({
nodeId: undefined
})
const peroidList = ref([])
handleSearchPeroid()
function handleSearchPeroid() {
getMySonNodeTree({ userId: props.userId }).then((resp) => {
peroidList.value = listToTree(resp.tree, {
id: 'nodeId',
pid: 'parentId',
children: 'children'
})
nodeChange(resp.nodeId)
})
}
function getOkrList() {
getMySonOkrPage({
...searchForm.value,
userId: props.userId
}).then((resp) => {
nextTick(() => {
okrTableRef.value.prepareData(resp)
})
})
}
function nodeChange(nodeId) {
searchForm.value.nodeId = nodeId
getOkrList()
const currentNode = findNode(peroidList.value, (node) => {
return node.nodeId == nodeId
})
searchForm.value.creatorId = currentNode.creatorId
}
const dialogOkr = ref(null)
function handleShowOkr(id) {
dialogOkr.value.open({
nodeId: id,
canEdit: true,
queryType: 2
})
}
const dialogOkrInfo = ref(null)
function handleEditOkr(nodeId = undefined) {
dialogOkr.value.close()
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
}
</script>
<style lang="scss" scoped>
:deep(.el-overlay-dialog) {
display: flex;
justify-content: center;
align-items: center;
}
</style>

@ -30,11 +30,9 @@
</div> </div>
<vue3-tree-org <vue3-tree-org
ref="treeOrgRef"
:data="dataList" :data="dataList"
center center
collapsable collapsable
:default-expand-keys="lastExpendKeys"
:props="treeProps" :props="treeProps"
@on-node-click="handleClickNode" @on-node-click="handleClickNode"
> >
@ -76,7 +74,7 @@
</template> </template>
</vue3-tree-org> </vue3-tree-org>
<DialogOkr ref="dialogOkr" @edit="handleEditOkr" /> <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
<DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" @success="resetTreeData" /> <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" />
</div> </div>
</template> </template>
@ -91,7 +89,6 @@ import { listToTree } from '@/utils/tree'
const dataList = ref({}) const dataList = ref({})
const helpDataList = ref([]) const helpDataList = ref([])
const lastExpendKeys = ref([])
const treeProps = { const treeProps = {
children: 'children', children: 'children',
label: 'nodeName', label: 'nodeName',
@ -109,7 +106,6 @@ const peroidList = ref([])
handleSearchPeroid() handleSearchPeroid()
function handleSearchPeroid() { function handleSearchPeroid() {
lastExpendKeys.value = []
getOkrRelationTree().then((resp) => { getOkrRelationTree().then((resp) => {
peroidList.value = resp peroidList.value = resp
if (resp && resp.length && !searchForm.value.nodeId) { 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() { function getOkrList() {
getOkrRelationTreeChildren({ getOkrRelationTreeChildren({
nodeId: searchForm.value.nodeId nodeId: searchForm.value.nodeId
@ -219,7 +178,6 @@ function openOkr() {
clickNode.value && clickNode.value &&
dialogOkr.value.open({ dialogOkr.value.open({
nodeId: clickNode.value.nodeId, nodeId: clickNode.value.nodeId,
queryType: 2,
canEdit: !clickNode.value.children || clickNode.value.children.length == 0 canEdit: !clickNode.value.children || clickNode.value.children.length == 0
}) })
} }
@ -230,9 +188,9 @@ function handleAddNode() {
dialogOkrInfo.value.open('create', null) dialogOkrInfo.value.open('create', null)
} }
function handleEditOkr(nodeId = undefined) { function handleEditOkr() {
dialogOkr.value.close() dialogOkr.value.close()
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2) dialogOkrInfo.value.open('update', 1)
} }
</script> </script>

@ -275,8 +275,10 @@ function handleDelete(row) {
} }
function handleNotice(row) { function handleNotice(row) {
console.log(row)
message.confirm('即将发送微信通知提醒执行人,是否继续?').then(() => { message.confirm('即将发送微信通知提醒执行人,是否继续?').then(() => {
urgeWait(row.workId).then(() => { urgeWait({ workId: row.workId }).then(() => {
message.success('发送成功') message.success('发送成功')
}) })
}) })

@ -20,7 +20,7 @@
<el-tab-pane label="目标关系树" name="3"> <el-tab-pane label="目标关系树" name="3">
<ObjectList v-if="tabIndex == 3" /> <ObjectList v-if="tabIndex == 3" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane disabled v-if="employeeList.length > 0"> <el-tab-pane disabled>
<template #label> <template #label>
<div class="w-full"> <div class="w-full">
<el-divider <el-divider
@ -31,14 +31,9 @@
</div> </div>
</template> </template>
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane label="张三">张三</el-tab-pane>
v-for="item in employeeList" <el-tab-pane label="李四">李四</el-tab-pane>
:key="item.userId" <el-tab-pane label="王二">王二</el-tab-pane>
:label="item.userName"
:name="item.userId"
>
<MySon v-if="tabIndex == item.userId" :userId="item.userId" />
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
@ -46,21 +41,11 @@
<script setup name="OkrManagement"> <script setup name="OkrManagement">
import AllTarget from './Components/AllTarget.vue' import AllTarget from './Components/AllTarget.vue'
import MyDuty from './Components/MyDuty.vue' import MyDuty from './Components/MyDuty.vue'
import MySon from './Components/MySon.vue'
import ObjectList from './Components/ObjectList.vue' import ObjectList from './Components/ObjectList.vue'
import WaitTarget from './Components/WaitTarget.vue' import WaitTarget from './Components/WaitTarget.vue'
import { getMyMemberList } from '@/api/okr/okr'
const tabIndex = ref('0') const tabIndex = ref('0')
const height = ref(innerHeight - 115) const height = ref(innerHeight - 115)
const employeeList = ref([])
onMounted(() => {
getMyMemberList().then((res) => {
employeeList.value = res
})
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -25,14 +25,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组织部门" prop="dept"> <el-form-item label="组织部门" prop="dept">
<el-tree-select <el-input v-model="formData.dept" placeholder="请输入部门" />
v-model="formData.deptId"
:data="deptList"
:props="defaultProps"
check-strictly
node-key="id"
placeholder="请选择部门"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -196,10 +189,8 @@
<script name="DialogEmployee" setup> <script name="DialogEmployee" setup>
import { CommonStatusEnum } from '@/utils/constants' import { CommonStatusEnum } from '@/utils/constants'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { defaultProps, handleTree } from '@/utils/tree'
import { getPlanSimpleList } from '@/api/pers/attendancePlan' import { getPlanSimpleList } from '@/api/pers/attendancePlan'
import { getSimpleAppList } from '@/api/system/app' import { getSimpleAppList } from '@/api/system/app'
import * as DeptApi from '@/api/system/dept'
import * as EmployeeApi from '@/api/pers/employee' import * as EmployeeApi from '@/api/pers/employee'
@ -228,8 +219,6 @@ const attendanceSettingIdOptions = ref([])
const instanceIdsOptions = ref([]) const instanceIdsOptions = ref([])
const employeeOptions = ref([]) const employeeOptions = ref([])
const deptList = ref([])
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type, id) => { const open = async (type, id) => {
dialogVisible.value = true dialogVisible.value = true
@ -245,7 +234,6 @@ const open = async (type, id) => {
formLoading.value = false formLoading.value = false
} }
} }
deptList.value = handleTree(await DeptApi.getSimpleDeptList({ allFlag: true }))
getOptions() getOptions()
} }
defineExpose({ open }) // open defineExpose({ open }) // open

Loading…
Cancel
Save