qiushanhe/ss-oa-manage-web
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

sc

Browse Source
This commit is contained in:
qsh
2025-04-15 12:45:33 +08:00
parent f93e1f7187
commit f2f14789f0
10 changed files with 205 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/router/modules/remaining.ts
View File

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

9
src/views/Basic/Dept/DeptForm.vue
View File

@@ -30,7 +30,12 @@
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="负责人" prop="leaderUserId">
<el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
<el-select
v-model="formData.leaderUserId"
clearable
filterable
placeholder="请输入负责人"
>
<el-option
v-for="item in employeeOptions"
:key="item.id"
@@ -192,7 +197,7 @@ const resetForm = () => {
/** 获得部门树 */
const getTree = async () => {
deptTree.value = []
const data = await DeptApi.getSimpleDeptList()
const data = await DeptApi.getSimpleDeptList({ allFlag: false })
let dept: Tree = { id: 0, name: '顶级部门', children: [] }
dept.children = handleTree(data)
deptTree.value.push(dept)

13
src/views/Basic/User/UserForm.vue
View File

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

203
src/views/Basic/User/index.vue
View File

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

5
src/views/OKR/Management/Components/AllTarget.vue
View File

@@ -87,6 +87,7 @@ function nodeChange(nodeId) {
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 {
@@ -108,9 +109,9 @@ function handleAddNode() {
dialogOkrInfo.value.open('create', null)
}
function handleEditOkr() {
function handleEditOkr(nodeId = undefined) {
dialogOkr.value.close()
dialogOkrInfo.value.open('update', searchForm.value.nodeId, 2)
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
}
function handleUpdateProcess() {

6
src/views/OKR/Management/Components/DialogOkr.vue
View File

@@ -38,7 +38,11 @@
</div>
</div>
<div class="flex items-center">
<el-button v-if="nodeInfo.creatorId == currentUserId" link @click="emit('edit')">
<el-button
v-if="nodeInfo.creatorId == currentUserId"
link
@click="emit('edit', nodeInfo.nodeId)"
>
<el-tooltip content="编辑" placement="top" effect="dark">
<Icon icon="ep:edit" :size="16" />
</el-tooltip>

24
src/views/OKR/Management/Components/DialogOkrInfo.vue
View File

@@ -471,7 +471,7 @@ function removeKR(oIdx, krIdx) {
}
function addChildNode() {
childNodeList.value.push({})
childNodeList.value.push({ dataScope: 1 })
}
function removeChildNode(idx) {
@@ -512,9 +512,31 @@ async function handleSave() {
if (!formRef.value) return
const valid = await formRef.value.validate()
if (!valid) return
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
try {
form.value.isAutoAddChild = isAutoAddChild
form.value.objectives = objectList.value
form.value.children = childNodeList.value
if (formType.value === 'create') {

4
src/views/OKR/Management/Components/MyDuty.vue
View File

@@ -77,9 +77,9 @@ const dialogOkrInfo = ref(null)
// dialogOkrInfo.value.open('create', null)
// }
function handleEditOkr() {
function handleEditOkr(nodeId = undefined) {
dialogOkr.value.close()
dialogOkrInfo.value.open('update', 1, 1)
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 1)
}
function handleUpdateProcess() {

42
src/views/OKR/Management/Components/MySon.vue
View File

@@ -9,23 +9,33 @@
:render-after-expand="false"
:default-expand-all="false"
style="width: 400px"
@change="getOkrList"
@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="MyDuty">
<script setup name="MySon">
import OkrTable from './OkrTable.vue'
import DialogOkr from './DialogOkr.vue'
import { listToTree } from '@/utils/tree'
import DialogOkrInfo from './DialogOkrInfo.vue'
import { listToTree, findNode } from '@/utils/tree'
import { useUserStore } from '@/store/modules/user'
import { getMySonNodeTree, getMySonOkrPage } from '@/api/okr/okr'
@@ -42,6 +52,9 @@ const defaultProps = {
children: 'children'
}
const userStore = useUserStore()
const currentUserId = userStore.getUser.id
const okrTableRef = ref(null)
const searchForm = ref({
nodeId: undefined
@@ -58,8 +71,7 @@ function handleSearchPeroid() {
pid: 'parentId',
children: 'children'
})
searchForm.value.nodeId = resp.nodeId
getOkrList()
nodeChange(resp.nodeId)
})
}
@@ -68,21 +80,35 @@ function getOkrList() {
...searchForm.value,
userId: props.userId
}).then((resp) => {
const list = resp
nextTick(() => {
okrTableRef.value.prepareData(list)
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: 1
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>

4
src/views/OKR/Management/Components/ObjectList.vue
View File

@@ -189,9 +189,9 @@ function handleAddNode() {
dialogOkrInfo.value.open('create', null)
}
function handleEditOkr() {
function handleEditOkr(nodeId = undefined) {
dialogOkr.value.close()
dialogOkrInfo.value.open('update', 1)
dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
}
</script>