Compare commits

...

12 Commits
dev-cl ... main

Author SHA1 Message Date
qsh e620cc5cd6 sc 1 week ago
qsh c4c4e49b39 sc 2 weeks ago
qsh f0020d5c82 sc 2 weeks ago
qsh 03467e1d6e sc 2 weeks ago
qsh 15f83f7193 sc 2 weeks ago
qsh e45cf7db0c sc 3 weeks ago
qsh 80d9e93e46 sc 3 weeks ago
qsh ec34235cc2 sc 3 weeks ago
qsh 0409e9ef11 sc 3 weeks ago
qsh f3293ef14d sc 3 weeks ago
qsh 26ff7cd434 sc 3 weeks ago
qsh b15e0d0f8f sc 4 weeks ago
  1. 4
      .env.base
  2. 45
      src/api/okr/meeting.js
  3. 9
      src/api/okr/okr.js
  4. 4
      src/permission.js
  5. 40
      src/router/modules/static.ts
  6. 9
      src/styles/index.scss
  7. 27
      src/utils/index.ts
  8. 80
      src/utils/tableObjectSpanMethod.js
  9. 95
      src/views/Home/Index.vue
  10. 439
      src/views/OKR/Analysis/index.vue
  11. 19
      src/views/OKR/Management/Components/DialogOkr.vue
  12. 67
      src/views/OKR/Management/Components/DialogOkrInfo.vue
  13. 305
      src/views/OKR/Meeting/MeetingInfo.vue
  14. 219
      src/views/OKR/Meeting/index.vue
  15. 20
      src/views/OKR/Wait/index.vue

@ -6,9 +6,9 @@ VITE_DEV=true
# 请求路径
# 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.215.207.150:48080'
# VITE_BASE_URL='http://114.215.207.150:48080'
# 上传路径
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

@ -0,0 +1,45 @@
import request from '@/config/axios'
export const createMeeting = (data) => {
return request.post({
url: '/admin-api/okr/meeting/add',
data,
isSubmitForm: true
// headers: { 'instance-id': 1016 }
})
}
// 修改
export const updateMeeting = (data) => {
return request.put({
url: '/admin-api/okr/meeting/update',
data
// headers: { 'instance-id': 1016 }
})
}
// 查询详情
export const getMeetingDetail = (params) => {
return request.get({
url: '/admin-api/okr/meeting/get',
params
// headers: { 'instance-id': 1016 }
})
}
// 取消会议
export const cancelMeeting = (data) => {
return request.put({
url: '/admin-api/okr/meeting/cancel',
data
// headers: { 'instance-id': 1016 }
})
}
// 分页查询
export const getMeetingPage = (params) => {
return request.get({
url: '/admin-api/okr/meeting/page',
params
// headers: { 'instance-id': 1016 }
})
}

@ -143,3 +143,12 @@ export const getChannelOptions = () => {
// headers: { 'instance-id': 1016 }
})
}
// 获取统计表中的合计信息
export const getOkrStatisticsTotal = (params) => {
return request.get({
url: '/admin-api/okr/node/data/count',
params
// headers: { 'instance-id': 1016 }
})
}

@ -64,7 +64,9 @@ router.beforeEach(async (to, from, next) => {
if (tenantId && appId) {
next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
} else {
next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
// next(`/login?redirect=${to.fullPath}`)
// 否则全部重定向到平台登陆页
window.location.href = 'https://cloud.ahduima.com/ss/login'
}
}
}

@ -35,6 +35,46 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
visible: true,
alwaysShow: true,
redirect: ''
},
{
icon: 'ep:data-line',
path: 'okr-analysis',
name: 'OKR统计',
componentName: 'OkrAnalysis',
component: 'OKR/Analysis/index',
meta: {
title: 'OKR统计'
},
visible: true,
alwaysShow: true,
redirect: ''
},
{
icon: 'ep:data-board',
path: 'okr-meeting',
name: '会议管理',
componentName: 'OkrMeeting',
component: 'OKR/Meeting/index',
meta: {
title: '会议管理'
},
visible: true,
alwaysShow: true,
redirect: ''
},
{
icon: 'ep:data-board',
path: 'okr-meeting-info/:id',
name: '会议详情',
componentName: 'MeetingInfo',
component: 'OKR/Meeting/MeetingInfo',
meta: {
title: '会议详情'
},
visible: false,
alwaysShow: true,
redirect: '',
keepAlive: true
}
],
meta: {

@ -97,4 +97,13 @@
/* 去除 Firefox 中的指示器 */
.el-input__inner[type='number'] {
-moz-appearance: textfield;
}
.el-drawer__header {
padding: 16px 16px 8px 16px !important;
margin: 0 !important;
line-height: 24px !important;
font-size: 18px !important;
color: #303133 !important;
box-sizing: border-box !important;
// border-bottom: 1px solid #e8e8e8 !important;
}

@ -220,3 +220,30 @@ export const removeNullField = (obj: Object) => {
}
return obj
}
import * as XLSX from 'xlsx'
import * as FileSaver from 'file-saver'
export const exportTableWithVue = (domId: any, fileName: String) => {
// const XLSX = require('xlsx')
// 使用 this.$nextTick 是在dom元素都渲染完成之后再执行
// this.$nextTick(function () {
// 设置导出的内容是否只做解析,不进行格式转换 false:要解析, true:不解析
const xlsxParam = { raw: true }
const wb = XLSX.utils.table_to_book(document.querySelector(domId), xlsxParam)
const wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: true,
type: 'array'
})
try {
// 下载保存文件
FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
} catch (e) {
if (typeof console !== 'undefined') {
console.log(e, wbout)
}
}
return wbout
// });
}

@ -1,80 +0,0 @@
/**
* @Author: River_qiu
* @Date: 2021/11/18
*/
// 表格单元格合并多列
let [spanObj, pos] = [{}, {}]
//spanObj 存储每个key 对应的合并值
//pos 存储的是 key合并值得索引 大概吧
export const dataMethod = (data, isH, allColumns = []) => {
//循环数据(行)
for (let i in data) {
let dataI = data[i]
//循环数据内对象,查看有多少key
if (allColumns.length > 0) {
let preProp = undefined
// dataI.historyValue =
// 循环列数据
for (let index = 0; index < allColumns.length; index++) {
let j = allColumns[index]
if (i == 0) {
// 第一行,每列至少展示1行
spanObj[j] = [1]
pos[j] = 0
} else {
if (index == 0) {
data[i].historyValue = ''
data[i - 1].historyValue = ''
} else {
data[i].historyValue += data[i][preProp]
data[i - 1].historyValue += data[i - 1][preProp]
}
// e: 当前行数据,k:上一行数据
let [e, k] = [dataI, data[i - 1]]
// 判断上一行数据是否存在
// 空数据不合并
// 前一列值相同并且不为空或者为第一列
// 存在当前的列的值与上一行是否一样
// 判断是否有数组规定只允许那几列需要合并单元格的
if (
k &&
e[j] &&
(!preProp || (e.historyValue && e.historyValue == k.historyValue)) &&
e[j] == k[j] &&
(!isH || isH.length == 0 || isH.includes(j))
) {
//如果上一级和当前一级相当,数组就加1 数组后面就添加一个0
spanObj[j][pos[j]] += 1
spanObj[j].push(0)
} else {
spanObj[j].push(1)
pos[j] = i
}
preProp = j
}
}
} else {
for (let j in dataI) {
//如果只有一条数据时默认为1即可,无需合并
if (i == 0) {
spanObj[j] = [1]
pos[j] = 0
} else {
let [e, k] = [dataI, data[i - 1]]
//判断上一级别是否存在 ,
//存在当前的key是否和上级别的key是否一样
//判断是否有数组规定只允许那几列需要合并单元格的
if (k && e[j] && k[j] && e[j] == k[j] && (!isH || isH.length == 0 || isH.includes(j))) {
//如果上一级和当前一级相当,数组就加1 数组后面就添加一个0
spanObj[j][pos[j]] += 1
spanObj[j].push(0)
} else {
spanObj[j].push(1)
pos[j] = i
}
}
}
}
}
return spanObj
}

@ -1,7 +1,96 @@
<template>
<div> 首页 </div>
<div>
<el-card shadow="never">
<el-skeleton :loading="loading" animated>
<el-row :gutter="20" justify="space-between">
<el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<div class="flex items-center">
<img :src="avatar" alt="" class="w-40px h-40px rounded-[50%] mr-20px" />
<div class="text-20px text-700">
{{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
</div>
</div>
</el-col>
<el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<div class="flex h-40px items-center justify-end <sm:mt-10px">
<div
class="px-8px text-right"
@click="router.push({ path: '/Okr/okr-wait', query: { type: 1 } })"
>
<div class="text-14px text-red-600 mb-20px">今日待办</div>
<CountTo
class="text-20px number-font"
:start-val="0"
:end-val="waitCount.dayEndAgentWorkNum"
:duration="2600"
/>
</div>
<el-divider direction="vertical" border-style="dashed" />
<div
class="px-8px text-right"
@click="router.push({ path: '/Okr/okr-wait', query: { type: 2 } })"
>
<div class="text-14px text-gray-400 mb-20px">我的待办</div>
<CountTo
class="text-20px number-font"
:start-val="0"
:end-val="waitCount.myAgentWorkNum"
:duration="2600"
/>
</div>
</div>
</el-col>
</el-row>
</el-skeleton>
</el-card>
</div>
</template>
<script setup lang="ts" name="Home">
import { useUserStore } from '@/store/modules/user'
import avatarImg from '@/assets/imgs/avatar.gif'
import { getWaitCount } from '@/api/okr/wait'
<script setup name="Home"></script>
const { t } = useI18n()
const userStore = useUserStore()
const router = useRouter() //
const loading = ref(false)
const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
const username = userStore.getUser.nickname
<style lang="scss" scoped></style>
function getWaitTargetCount() {
getWaitCount({}).then((res) => {
waitCount.value = res
})
}
const waitCount = ref({
dayEndAgentWorkNum: 0,
myAgentWorkNum: 0,
urgeAgentWorkNum: 0,
notifyNum: 0
})
const getAllApi = async () => {
await getWaitTargetCount()
loading.value = false
}
onMounted(() => {
getAllApi()
})
</script>
<style lang="scss" scoped>
@font-face {
font-family: numberFont;
src: url('@/assets/fonts/DISPLAY FREE TFB.ttf');
}
.number-font {
font-family: numberFont !important;
}
:deep(.el-card__header) {
padding: 10px;
}
</style>

@ -1,6 +1,6 @@
<template>
<div>
<el-row class="mb-10px">
<el-row class="mb-10px flex justify-between items-start">
<el-tree-select
v-model="searchForm.nodeId"
:data="peroidList"
@ -8,12 +8,48 @@
:render-after-expand="false"
:default-expand-all="false"
check-strictly
style="width: 400px"
style="width: 300px"
@change="nodeChange"
/>
<div class="flex justify-end flex-1">
<el-button type="info" @click="handleExport">导出</el-button>
<el-popover
ref="countRef"
placement="left"
:title="`${currentNode?.nodeName} 数据汇总`"
trigger="click"
width="500px"
v-model:visible="showCountPop"
>
<template #reference><el-button>数据汇总</el-button></template>
<el-table :data="countInfo" stripe>
<el-table-column prop="keyResultShowName" label="项目名称" />
<el-table-column prop="currentValue" label="当前值" width="90" />
<el-table-column prop="targetValue" label="预期值" width="90" />
<el-table-column label="完成度" width="150">
<template #default="{ row }">
<el-progress
:percentage="parseInt((row.currentValue / row.targetValue) * 100) || 0"
:color="customColors"
/>
</template>
</el-table-column>
</el-table>
</el-popover>
<el-button type="primary" @click="openDrawer(1, currentNode.nodeId, currentNode.nodeName)">
节点笔谈
</el-button>
</div>
</el-row>
<el-table :data="originList" border :span-method="objectSpanMethod">
<el-table
id="okrAnalysisTable"
:data="originList"
border
:span-method="objectSpanMethod"
:show-summary="!!tableKeywords"
@cell-click="handleClickCell"
>
<el-table-column prop="objectInfo.objectiveName" label="目标">
<template #default="{ row }">
{{ row.objectInfo.objectiveName }}
@ -22,7 +58,26 @@
<!-- <el-table-column prop="objectiveId" label="占比" width="100px">
<template #default> 0 </template>
</el-table-column> -->
<el-table-column prop="keyResultShowName" label="关键成果">
<el-table-column prop="keyResultShowName">
<template #header>
<div class="flex items-center justify-center">
<div class="flex-1 mr-10px">
<el-input
v-if="showTableSearch"
v-model="tableKeywords"
placeholder="请输入关键字"
size="small"
style="width: 100%"
clearable
@change="handleTableFilter"
/>
<div v-else>关键成果</div>
</div>
<el-button type="primary" size="small" @click="handleFilterTableClick">
{{ showTableSearch ? '取消' : '筛选' }}
</el-button>
</div>
</template>
<template #default="{ row }">
{{ row.sourceName ? `${row.sourceName}` : '' }} {{ row.keyResultShowName }}
</template>
@ -69,13 +124,179 @@
</template>
</el-table-column>
</el-table>
<el-drawer
v-if="showDrawer"
v-model="showDrawer"
:title="drawerTitle"
size="60vw"
direction="rtl"
append-to-body
destroy-on-close
>
<el-tabs v-model="currentType" @tab-click="searchCommentList()">
<el-tab-pane
v-for="item in commentTypeOptions"
:key="item.id"
:label="item.label"
:name="item.id"
>
<div v-if="item.id == currentType">
<div v-if="addNewComment">
<div class="flex justify-between items-center">
<div>
<el-button size="small" @click="addNewComment = false"> 取消 </el-button>
<el-button type="primary" size="small" @click="handleSaveComment">
发布
</el-button>
</div>
</div>
<div class="mt-10px" v-if="addNewComment">
<Editor
v-model:modelValue="form.commentValue"
height="300px"
:toolbarConfig="toolbarConfig"
/>
</div>
</div>
<el-button v-else type="primary" size="small" @click="handleInsertComment">
新增
</el-button>
<div
v-for="(it, index) in commentList"
:key="it.commentId"
class="border-b-1"
style="padding: 10px 5px"
>
<div
class="flex items-center justify-between overflow-hidden text-16px"
style="line-height: 30px"
>
<div class="flex items-center">
<el-avatar
shape="circle"
style="
background-color: var(--el-color-primary-light-3);
width: 30px;
height: 30px;
"
fit="fill"
>
<span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
</el-avatar>
<div class="ml-10px text-16px">{{ it.creatorName }}</div>
</div>
</div>
<div class="ml-10px" v-dompurify-html="it.content"></div>
<div
class="ml-10px mt-10px flex items-center justify-between text-12px"
style="line-height: 20px; color: #aaa"
>
<div class="flex items-center">
<div class="flex items-center mr-50px">
<el-button link @click="good(it)">
<Icon
icon="fa:thumbs-o-up"
:size="16"
:color="it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'"
/>
</el-button>
<span
class="ml-5px"
:style="{
color: it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'
}"
>{{ it.likeCount }}</span
>
</div>
<div class="flex items-center mr-50px">
<el-button link @click="showChildComment(index)">
<Icon icon="ep:chat-dot-square" :size="16" color="#333" />
</el-button>
<span class="ml-5px" style="color: #333">{{ it.commentCount }}</span>
</div>
</div>
<div class="ml-10px text-13px text-gray-400">
{{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
</div>
</div>
<!-- 评论 -->
<div
v-if="showCommentIndex == index"
class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
style="margin: 10px 10px 0 10px; border-radius: 4px"
label="笔谈"
>
<div
v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
:key="subComment.commentId"
class="text-14px"
style="line-height: 24px"
>
<span class="font-bold">{{ subComment.creatorName }}</span>
<span>
{{ subComment.content }}
</span>
</div>
<div class="mt-10px relative">
<!-- <el-input
v-model="form.commentValue"
placeholder="请输入评论"
type="textarea"
:autosize="{ minRows: 4 }"
clearable
size="small"
style="width: 100%"
/> -->
<el-mention
v-model="form.commentValue"
type="textarea"
:autosize="{ minRows: 4 }"
:options="employeeOptions"
style="width: 100%"
size="small"
whole
placeholder="请输入内容"
@select="handleMention"
>
<template #label="scope">
<div class="flex items-center justify-between h-full">
<span class="text-14px text-dark-700">{{ scope.item.name }}</span>
<span class="text-12px text-gray-400">{{ scope.item.dept }}</span>
</div>
</template>
</el-mention>
<el-button
type="primary"
size="small"
style="position: absolute; right: 2px; bottom: 2px"
@click="handleSendCommnet(index)"
>
发布
</el-button>
</div>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-drawer>
</div>
</template>
<script setup name="Analysis">
import { listToTree, findNode } from '@/utils/tree'
import { getAllNodeTree, getAllOkrPage } from '@/api/okr/okr'
import { formatDate } from '@/utils/formatTime'
import { getAllNodeTree, getAllOkrPage, getOkrStatisticsTotal } from '@/api/okr/okr'
import { getEmployeeSimpleList } from '@/api/pers/employee'
import { cloneDeep } from 'lodash-es'
import {
getCommentTypeOptions,
createComment,
getCommentPage,
likeComment
} from '@/api/okr/comment'
import { exportTableWithVue } from '@/utils'
const message = useMessage()
const defaultProps = {
@ -88,6 +309,8 @@ const searchForm = ref({
})
const currentNode = ref(undefined)
const showDrawer = ref(false)
const drawerTitle = ref('详情')
const customColors = [
{ color: 'rgb(196, 86.4, 86.4)', percentage: 20 },
@ -99,7 +322,11 @@ const customColors = [
const peroidList = ref([])
const showTableSearch = ref(false)
const tableKeywords = ref('')
handleSearchPeroid()
getOptions()
//
//
@ -120,11 +347,14 @@ function handleSearchPeroid() {
}
})
}
const showCountPop = ref(false)
function nodeChange(nodeId) {
if (nodeId) {
showTableSearch.value = false
tableKeywords.value = ''
searchForm.value.nodeId = nodeId
getOkrList()
getCountInfo()
currentNode.value = findNode(peroidList.value, (node) => {
return node.nodeId == nodeId
})
@ -138,6 +368,7 @@ function nodeChange(nodeId) {
}
const originList = ref([])
const defaultTableList = ref([])
const spanObj = ref([])
function getOkrList() {
getAllOkrPage(searchForm.value).then((resp) => {
@ -158,10 +389,20 @@ function getOkrList() {
originList.value = [...originList.value, ...arr]
}
})
defaultTableList.value = [...originList.value]
}
})
}
const countInfo = ref([])
function getCountInfo() {
getOkrStatisticsTotal({ nodeId: searchForm.value.nodeId }).then(async (resp) => {
countInfo.value = resp || []
// await nextTick(() =)
showCountPop.value = true
})
}
function objectSpanMethod({ column, rowIndex }) {
if (['目标', '目标完成度'].includes(column.label)) {
let _row = spanObj.value[rowIndex]
@ -172,6 +413,190 @@ function objectSpanMethod({ column, rowIndex }) {
}
}
}
function handleClickCell(row, column) {
if (column.property === 'keyResultShowName') {
openDrawer(2, row.keyResultId, `${row.sourceName} ${row.keyResultShowName}`)
} else if (column.property === 'objectInfo.objectiveName') {
openDrawer(3, row.objectInfo.objectiveId, row.objectInfo.objectiveName)
}
}
const commentTypeOptions = ref([])
const currentType = ref(1) // 1
function getOptions() {
getCommentTypeOptions().then((resp) => {
commentTypeOptions.value = (resp || []).sort((pre, cur) => pre.sort - cur.sort)
currentType.value = resp[0].id
})
getEmployeeSimpleList({ status: 0 }).then((resp) => {
employeeOptions.value = resp.map((item) => ({
...item,
label: item.name,
value: item.name
}))
})
}
const commentList = ref([])
const commentInfo = ref({
businessType: undefined,
businessId: undefined,
commentType: undefined,
pageSize: -1
})
function openDrawer(type, id, name) {
showDrawer.value = true
drawerTitle.value = `${name}】笔谈`
commentInfo.value = {
businessType: type,
businessId: id,
commentType: currentType.value,
pageSize: -1
}
searchCommentList()
}
function searchCommentList() {
commentInfo.value.commentType = currentType.value
getCommentPage(commentInfo.value).then((resp) => {
// commentList.value = resp.list
commentList.value = listToTree(resp.list, {
id: 'commentId',
pid: 'parentId',
children: 'children'
})
})
}
const showCommentIndex = ref(-1)
function showChildComment(index) {
showCommentIndex.value = showCommentIndex.value == index ? -1 : index
}
function good(item) {
likeComment(item.commentId).then(() => {
message.success('点赞成功')
searchCommentList()
})
}
const form = ref({
commentValue: '',
mentionedUserIdList: []
})
const employeeOptions = ref([])
function handleMention(item) {
form.value.mentionedUserIdList.push(item.id)
}
function handleSendCommnet(idx) {
try {
// mentionedUserIdList
const userList = [...form.value.mentionedUserIdList]
const arr = []
userList.map((item) => {
if (form.value.commentValue.indexOf(`@${item.name}`) != -1) {
arr.push(item.id)
//
form.value.commentValue = form.value.commentValue.replace(`@${item.name}`, '')
}
})
const data = {
businessType: commentInfo.value.businessType,
businessId: commentInfo.value.businessId,
commentType: currentType.value,
content: form.value.commentValue,
mentionedUserIdList: arr,
parentId: commentList.value[idx].commentId
}
createComment(data)
.then(() => {
message.success('创建成功')
searchCommentList()
})
.finally(() => {
form.value.commentValue = ''
})
} catch (error) {
console.log(error)
message.error('创建失败')
}
}
const addNewComment = ref(false)
function handleInsertComment() {
addNewComment.value = true
form.value.commentValue = commentTypeOptions.value.find(
(item) => item.id == currentType.value
).remark
}
const toolbarConfig = {
toolbarKeys: [
'bold', //
'underline', // 线
'italic', //
'color', //
'bgColor', //
'fontSize', //
'bulletedList', //
'numberedList', //
'insertTable', //
'insertLink', //
'undo' //
]
}
function handleSaveComment() {
addNewComment.value = false
try {
const data = {
businessType: commentInfo.value.businessType,
businessId: commentInfo.value.businessId,
commentType: currentType.value,
content: form.value.commentValue,
mentionedUserIdList: form.value.mentionedUserIdList
}
createComment(data)
.then(() => {
message.success('创建成功')
searchCommentList()
})
.finally(() => {
form.value.commentValue = ''
})
} catch (error) {
message.error('创建失败')
}
}
function handleExport() {
exportTableWithVue('#okrAnalysisTable', `OKR分析报表-${currentNode.value.nodeName}`)
}
function handleTableFilter() {
console.log('tableKeywords', tableKeywords.value)
if (tableKeywords.value) {
originList.value = defaultTableList.value.filter(
(item) =>
item.keyResultShowName.includes(tableKeywords.value) ||
item.sourceName.includes(tableKeywords.value)
)
} else {
originList.value = [...defaultTableList.value]
}
}
function handleFilterTableClick() {
showTableSearch.value = !showTableSearch.value
if (!showTableSearch.value) {
tableKeywords.value = ''
originList.value = [...defaultTableList.value]
}
}
</script>
<style scoped></style>
<style lang="scss" scoped></style>

@ -143,7 +143,7 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane label="评论" name="conclusion" key="conclusion">
<el-tab-pane label="笔谈" name="conclusion" key="conclusion">
<div class="relative overflow-y-auto" style="height: calc(100% - 50px)">
<div v-if="addNewComment">
<div class="flex justify-between items-center">
@ -178,7 +178,7 @@
</div>
</div>
<el-button v-else type="primary" size="small" @click="handleInsertComment">
新增评论
新增笔谈
</el-button>
<div
v-for="(it, index) in commentList"
@ -243,7 +243,7 @@
v-if="showCommentIndex == index"
class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
style="margin: 10px 10px 0 10px; border-radius: 4px"
label="评论"
label="笔谈"
>
<div
v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
@ -274,7 +274,7 @@
style="width: 100%"
size="small"
whole
placeholder="请输入评论"
placeholder="请输入笔谈"
@select="handleMention"
>
<template #label="{ item }">
@ -492,19 +492,20 @@ function handleSaveComment() {
businessType: 1,
businessId: nodeInfo.value.nodeId,
contentType: 1,
commentType: form.value.commentType,
content: form.value.commentValue,
mentionedUserIdList: form.value.mentionedUserIdList
}
createComment(data)
.then(() => {
message.success('评论成功')
message.success('笔谈成功')
searchCommentList()
})
.finally(() => {
form.value.commentValue = ''
})
} catch (error) {
message.error('评论失败')
message.error('笔谈失败')
}
}
const commentList = ref([])
@ -552,20 +553,22 @@ function handleSendCommnet(idx) {
businessType: 1,
businessId: nodeInfo.value.nodeId,
contentType: 1,
commentType: form.value.commentType,
content: form.value.commentValue,
mentionedUserIdList: arr,
parentId: commentList.value[idx].commentId
}
createComment(data)
.then(() => {
message.success('评论成功')
message.success('创建成功')
searchCommentList()
})
.finally(() => {
form.value.commentValue = ''
})
} catch (error) {
message.error('评论失败')
console.log(error)
message.error('创建失败')
}
}
</script>

@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="show"
width="900px"
width="88vw"
class="dialog-okr"
:show-close="false"
:close-on-click-modal="false"
@ -255,6 +255,10 @@
<el-option label="公开" :value="1" />
<el-option label="仅上级可见" :value="2" />
</el-select>
<el-radio-group v-model="kr.isCount" class="ml-10px">
<el-radio :label="true" :value="true">参与统计</el-radio>
<el-radio :label="false" :value="false">不参与统计</el-radio>
</el-radio-group>
</div>
</div>
</div>
@ -445,7 +449,7 @@ function resetForm() {
startTime: undefined,
endTime: undefined,
executor: [],
dataScope: 1
dataScope: 2
}
}
@ -458,9 +462,9 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件,用于
function addObjective() {
objectList.value.push({
objectiveName: '',
executor: [],
executor: form.value.executor || [],
keyResults: [],
dataScope: 1
dataScope: form.value.dataScope || 2
})
}
@ -477,7 +481,8 @@ function AddKR(idx) {
process: undefined,
currentValue: undefined,
executor: obj.executor,
dataScope: obj.dataScope
dataScope: obj.dataScope,
isCount: false
})
}
@ -490,7 +495,7 @@ function removeKR(oIdx, krIdx) {
}
function addChildNode() {
childNodeList.value.push({ dataScope: 1 })
childNodeList.value.push({ dataScope: 2 })
}
function removeChildNode(idx) {
@ -538,8 +543,8 @@ async function handleSave() {
.confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点?', {
type: 'warning',
showCancelButton: true,
cancelButtonText: '取消',
confirmButtonText: '确定'
cancelButtonText: '不新增员工节点',
confirmButtonText: '新增员工节点'
})
.then(() => {
saveOkrData(true)
@ -572,24 +577,34 @@ async function saveOkrData(isAutoAddChild = false) {
2,
'0'
)}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
children: [
{
nodeName: `${month + 1}月第1周`,
children: []
},
{
nodeName: `${month + 1}月第2周`,
children: []
},
{
nodeName: `${month + 1}月第3周`,
children: []
},
{
nodeName: `${month + 1}月第4周`,
children: []
}
]
dataScope: form.value.dataScope,
executor: form.value.executor
// children: [
// {
// nodeName: `${month + 1}1`,
// dataScope: form.value.dataScope,
// executor: form.value.executor,
// children: []
// },
// {
// nodeName: `${month + 1}2`,
// dataScope: form.value.dataScope,
// executor: form.value.executor,
// children: []
// },
// {
// nodeName: `${month + 1}3`,
// dataScope: form.value.dataScope,
// executor: form.value.executor,
// children: []
// },
// {
// nodeName: `${month + 1}4`,
// dataScope: form.value.dataScope,
// executor: form.value.executor,
// children: []
// }
// ]
})
}
}

@ -0,0 +1,305 @@
<template>
<div>
<!-- <el-affix postion="top" :offset="95" v-if="!isDetail"> -->
<div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
<b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
<el-button type="success" @click="submit()">保存</el-button>
</div>
<!-- </el-affix> -->
<el-form
:model="form"
ref="formRef"
:rules="rules"
label-width="120px"
v-loading="loading"
:disabled="!!isDetail"
>
<el-row :gutter="20">
<el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="会议主题" prop="meetingSubject">
<el-input v-model="form.meetingSubject" placeholder="请输入会议主题" clearable />
</el-form-item>
</el-col>
<el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="okr节点" prop="nodeId">
<el-tree-select
v-model="form.nodeId"
:data="peroidList"
:props="defaultProps"
:render-after-expand="false"
:default-expand-all="false"
check-strictly
clearable
placeholder="选择OKR节点"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
<el-form-item label="会议时间" prop="startTime">
<el-date-picker
v-model="form.startTime"
type="datetime"
format="YYYY-MM-DD HH:mm"
value-format="YYYY-MM-DD HH:mm"
placeholder="请选择会议开始时间"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
<el-form-item label="预计结束时间" prop="expectEndTime">
<el-date-picker
v-model="form.expectEndTime"
type="datetime"
format="YYYY-MM-DD HH:mm"
value-format="YYYY-MM-DD HH:mm"
placeholder="请选择预计结束时间"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
<el-form-item label="会议地点" prop="meetingRoom">
<el-input v-model="form.meetingRoom" placeholder="请输入会议地点" clearable />
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
<el-form-item label="会议状态" prop="status">
<el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
<el-option label="未开始" value="1" />
<el-option label="已结束" value="2" />
<el-option label="已取消" value="3" disabled />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="预约参会人员" prop="expectUsers">
<el-select
v-model="form.expectUsers"
placeholder="选择参会人员"
clearable
filterable
style="width: 100%"
multiple
@change="handleUserChange"
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.name"
:value="item.id"
:disabled="item.status == 1"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0" v-if="form.meetingId">
<el-form-item label="实际参会人员" prop="actualUsers">
<el-checkbox-group v-model="form.actualUsers">
<el-checkbox
v-for="item in expectUserOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0" v-if="!isAllActived">
<el-form-item label="缺席原因" prop="absentReason">
<el-input v-model="form.absentReason" placeholder="请输入缺席原因" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
<el-form-item label="会议内容" prop="meetingContent">
<div v-if="!!isDetail" v-dompurify-html="form.meetingContent" class="w-full"></div>
<Editor v-else v-model="form.meetingContent" height="500px" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
<el-form-item label="会议纪要" prop="meetingSummary" label-width="80px">
<!-- <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
<Editor v-else v-model="form.meetingSummary" height="500px" /> -->
<div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
<el-input
v-else
v-model="form.meetingSummary"
type="textarea"
placeholder="请输入会议纪要"
:maxlength="-1"
:show-word-limit="false"
:autosize="{ minRows: 20 }"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script setup name="MeetingInfo">
import { listToTree } from '@/utils/tree'
import { getAllNodeTree } from '@/api/okr/okr'
import * as MeetingApi from '@/api/okr/meeting'
import { formatDate } from '@/utils/formatTime'
import { getEmployeeSimpleList } from '@/api/pers/employee'
import { useTagsViewStore } from '@/store/modules/tagsView'
const route = useRoute()
const message = useMessage()
const tagsViewStore = useTagsViewStore()
const defaultProps = {
value: 'nodeId',
label: 'nodeName',
children: 'children'
}
const isDetail = route.query.isDetail
onMounted(async () => {
await getOptions()
if (route.params.id && route.params.id != 0) {
// API
getMeetingInfo(route.params.id)
} else {
console.error('会议不存在')
}
})
const peroidList = ref([])
function getOptions() {
return Promise.all([getAllNodeTree(), getEmployeeSimpleList()])
.then(([okrResp, employeeResp]) => {
peroidList.value = listToTree(okrResp?.tree || [], {
id: 'nodeId',
pid: 'parentId',
children: 'children'
})
userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
// handleUserChange()
})
.catch((error) => {
console.error('获取数据失败:', error)
})
// // OKR
// getAllNodeTree().then((resp) => {
// peroidList.value = listToTree(resp?.tree || [], {
// id: 'nodeId',
// pid: 'parentId',
// children: 'children'
// })
// })
// //
// getEmployeeSimpleList().then((data) => {
// userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
// })
}
const form = ref({
meetingId: undefined,
meetingSubject: '',
startTime: '',
meetingRoom: '',
expectEndTime: '',
expectUsers: [],
actualUsers: [],
okrNodeName: '',
status: '1',
meetingContent: '',
meetingSummary: '',
absentReason: ''
})
const rules = {
meetingSubject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
startTime: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
expectEndTime: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
meetingRoom: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
expectUsers: [{ required: true, message: '请选择参会人员', trigger: 'change' }]
}
const formRef = ref(null)
const userOptions = ref([])
const expectUserOptions = ref([])
const isAllActived = computed(() => {
//
return form.value.expectUsers.every((item) => form.value.actualUsers.includes(item))
})
const loading = ref(false)
//
const getMeetingInfo = async (meetingId) => {
try {
loading.value = true
// API
const resp = await MeetingApi.getMeetingDetail({ meetingId })
loading.value = false
if (resp) {
form.value = {
...form.value,
...resp,
startTime: formatDate(resp.startTime, 'YYYY-MM-DD HH:mm'),
expectEndTime: formatDate(resp.expectEndTime, 'YYYY-MM-DD HH:mm'),
expectUsers: resp.expectUsers || [],
actualUsers: resp.actualUsers || []
}
handleUserChange()
}
} catch (error) {
loading.value = false
console.error('获取会议详情失败:', error)
}
}
function handleUserChange() {
//
expectUserOptions.value = userOptions.value.filter((user) =>
form.value.expectUsers.some((it) => it == user.id)
)
if (!isDetail) {
form.value.actualUsers = [...form.value.expectUsers]
}
}
const router = useRouter()
async function submit() {
//
if (!formRef.value) return
const valid = await formRef.value.validate()
if (!valid) return
try {
//
if (form.value.meetingId) {
if (form.value.status == 2 && !form.value.meetingSummary) {
message.error('会议结束时,会议纪要不能为空')
return
}
//
await MeetingApi.updateMeeting(form.value)
message.success('会议更新成功')
} else {
if (form.value.status == 1 && !form.value.meetingContent) {
message.error('预约会议时,会议内容不能为空')
return
}
form.value.actualUsers = []
//
await MeetingApi.createMeeting(form.value)
message.success('会议创建成功')
}
tagsViewStore.delView(route)
const visitedViews = tagsViewStore.getVisitedViews
const latestView = visitedViews.slice(-1)[0]
router.push(latestView)
} catch (error) {
console.error('保存会议数据失败:', error)
}
}
</script>
<style lang="scss" scoped></style>

@ -0,0 +1,219 @@
<template>
<div>
<!-- 搜索条件主题会议状态会议时间时间段选择OKR节点 -->
<el-form :model="searchForm" inline label-width="0">
<el-form-item>
<el-input
v-model="searchForm.meetingSubject"
placeholder="会议主题"
style="width: 200px"
clearable
@keyup.enter="handleSearch"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.status"
placeholder="会议状态"
style="width: 150px"
@change="handleSearch"
>
<el-option label="未开始" value="1" />
<el-option label="已结束" value="2" />
<el-option label="已取消" value="3" />
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="searchForm.dateRange"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
start-placeholder="会议时间"
end-placeholder="会议时间"
@change="handleSearch"
/>
</el-form-item>
<el-form-item>
<el-tree-select
v-model="searchForm.nodeId"
:data="peroidList"
:props="defaultProps"
:render-after-expand="false"
:default-expand-all="false"
check-strictly
placeholder="选择OKR节点"
style="width: 300px"
clearable
@change="handleSearch"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleAdd">预约会议</el-button>
</el-form-item>
</el-form>
<el-table :data="tableList" v-loading="loading" border stripe>
<el-table-column prop="meetingSubject" label="会议主题" />
<el-table-column prop="startTime" label="会议时间" width="170px" />
<el-table-column prop="meetingRoom" label="会议地点" width="140px" />
<el-table-column prop="expectEndTime" label="预计结束时间" width="170px" />
<el-table-column prop="expectUserName" label="预约参会人员" />
<el-table-column prop="actualUserName" label="实际参会人员" />
<el-table-column prop="nodeName" label="关联OKR节点" width="150px" />
<el-table-column prop="status" label="会议状态" width="100px">
<template #default="{ row }">
<el-tag :type="['', 'info', 'success', 'warning'][row.status]" size="small">
{{ ['', '未开始', '已结束', '已取消'][row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="140">
<template #default="{ row }">
<template v-if="row.status == 1 && row.creator == currentUserId">
<el-button type="primary" style="padding: 0" text @click="handleEdit(row.meetingId)">
修改
</el-button>
<el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
取消
</el-button>
</template>
<el-button
v-else
type="primary"
style="padding: 0"
text
@click="handleDetail(row.meetingId)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
v-model:limit="searchForm.pageSize"
v-model:page="searchForm.pageNo"
:total="total"
@pagination="getList"
/>
</div>
</template>
<script setup name="Meeting">
import { listToTree } from '@/utils/tree'
import { useUserStore } from '@/store/modules/user'
import { getAllNodeTree } from '@/api/okr/okr'
import * as MeetingApi from '@/api/okr/meeting'
const currentUserId = useUserStore().getUser.id
const defaultProps = {
value: 'nodeId',
label: 'nodeName',
children: 'children'
}
const message = useMessage()
const searchForm = ref({
meetingSubject: undefined,
status: '1',
dateRange: [],
nodeId: undefined,
pageNo: 1,
pageSize: 50
})
const total = ref(0)
onMounted(() => {
getOptions()
handleSearch()
})
const peroidList = ref([])
function getOptions() {
// OKR
getAllNodeTree().then((resp) => {
peroidList.value = listToTree(resp?.tree || [], {
id: 'nodeId',
pid: 'parentId',
children: 'children'
})
})
}
const loading = ref(false)
const tableList = ref([])
const handleSearch = () => {
searchForm.value.pageNo = 1
getList()
}
function getList() {
loading.value = true
//
try {
const params = { ...searchForm.value }
if (params.dateRange && params.dateRange.length) {
params.startTime = params.dateRange[0] + ' 00:00:00'
params.endTime = params.dateRange[1] + ' 23:59:59'
delete params.dateRange
} else {
delete params.startTime
delete params.endTime
}
MeetingApi.getMeetingPage(params)
.then((resp) => {
tableList.value = resp.list || []
total.value = resp.total || 0
})
.finally(() => {
loading.value = false
})
} catch (error) {
console.error('获取会议列表失败:', error)
loading.value = false
}
}
const router = useRouter()
const handleAdd = () => {
router.push({ name: 'MeetingInfo', params: { id: 0 } })
}
const handleEdit = (id) => {
router.push({
name: `MeetingInfo`,
params: {
id
}
})
}
const handleDetail = (id) => {
router.push({
name: `MeetingInfo`,
params: {
id
},
query: {
isDetail: 1
}
})
}
const handleCancel = async (row) => {
try {
await message.confirm('是否确认取消该会议?')
//
await MeetingApi.cancelMeeting({ meetingId: row.meetingId })
message.success('会议取消成功')
getList() //
} catch (error) {
console.log('取消操作被用户拒绝', error)
}
}
</script>
<style lang="scss" scoped></style>

@ -63,7 +63,7 @@
</el-badge>
</template>
</el-tab-pane>
<el-tab-pane :name="4">
<!-- <el-tab-pane :name="4">
<template #label>
<el-badge :value="tabCount.notifyNum" :max="99" :show-zero="false">
<el-tooltip content="特指OKR中@我的消息" placement="top" effect="dark">
@ -85,7 +85,7 @@
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<el-table v-if="tabIndex != 4" :data="tableList">
@ -169,6 +169,7 @@ import DialogWait from './Components/DialogWait.vue'
import { getWaitPage, deleteWait, getWaitCount, urgeWait } from '@/api/okr/wait'
const route = useRoute()
const userStore = useUserStore()
const currentUserId = userStore.getUser.id
@ -212,6 +213,11 @@ const priorityNameFilter = (priority) => {
const tabIndex = ref(1)
onMounted(() => {
if (route?.query?.type) {
tabIndex.value = Number(route.query.type)
} else {
tabIndex.value = 1
}
searchList()
})
@ -237,7 +243,7 @@ function getTabCount() {
const loading = ref(false)
const tableList = ref([])
const mentionedList = ref([])
// const mentionedList = ref([])
const total = ref(0)
function getList() {
loading.value = true
@ -282,10 +288,10 @@ function handleNotice(row) {
})
}
function handleShow(row) {
console.log(row)
message.success('打开okr详情页')
}
// function handleShow(row) {
// console.log(row)
// message.success('okr')
// }
</script>
<style lang="scss" scoped></style>

Loading…
Cancel
Save