diff --git a/src/api/bpm/knows/knowledge/index.ts b/src/api/bpm/knows/knowledge/index.ts index 1161cfe..9188507 100644 --- a/src/api/bpm/knows/knowledge/index.ts +++ b/src/api/bpm/knows/knowledge/index.ts @@ -18,6 +18,9 @@ export const KnowledgeApi = { getKnowledgePage: async (params: any) => { return await request.get({ url: `/bpm/knowledge/page`, params }) }, + getKnowledgePageFlow: async (params: any) => { + return await request.get({ url: `/bpm/knowledge/page-user`, params }) + }, // 查询知识发布详情 getKnowledge: async (id: number) => { diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 727c4bb..cd3dd32 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -366,7 +366,19 @@ const remainingRouter: AppRouteRecordRaw[] = [ noCache: true, hidden: true, canTo: true, - title: '查看 OA 请假', + title: '查看知识流程', + activeMenu: '/bpm/knows/knowledge' + } + }, + { + path: 'knows/knowledge/index', + component: () => import('@/views/bpm/knows/knowledge/index.vue'), + name: 'Knowledgeindex', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '查看知识流程', activeMenu: '/bpm/knows/knowledge' } } diff --git a/src/views/bpm/knows/knowledge/KnowledgeCreate.vue b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue index 6ded2e2..e87baf3 100644 --- a/src/views/bpm/knows/knowledge/KnowledgeCreate.vue +++ b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue @@ -89,8 +89,6 @@ defineOptions({ name: 'KnowledgeCreate' }) const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { delView } = useTagsViewStore() // 视图操作 -// const dialogVisible = ref(true) // 弹窗的是否展示 -// const dialogTitle = ref('') // 弹窗的标题 const { push, currentRoute } = useRouter() // 路由 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const formType = ref('') // 表单的类型:create - 新增;update - 修改 @@ -133,25 +131,6 @@ const getUserInfo = async () => { } } -/** 打开弹窗 */ -// const open = async (type: string, id?: number) => { -// // dialogVisible.value = true -// dialogTitle.value = t('action.' + type) -// formType.value = type -// resetForm() -// // 修改时,设置数据 -// if (id) { -// formLoading.value = true -// try { -// formData.value = await KnowledgeApi.getKnowledge(id) -// } finally { -// formLoading.value = false -// } -// } -// await getUserInfo() -// await getKnowtypeTree() -// } -// defineExpose({ open }) // 提供 open 方法,用于打开弹窗 //flow begin++++++++++++++++++++ // 指定审批人 const processDefineKey = 'my-test-flow03' // 流程定义 Key @@ -187,19 +166,11 @@ const submitForm = async () => { if (startUserSelectTasks.value?.length > 0) { data.startUserSelectAssignees = startUserSelectAssignees.value } - // if (formType.value === 'create') { - await KnowledgeApi.createKnowledge(data) - message.success(t('common.createSuccess')) + await KnowledgeApi.createKnowledge(data) + message.success(t('发起成功!')) // 关闭当前 Tab delView(unref(currentRoute)) - await push({ name: 'BpmOALeave' }) - // } else { - // await KnowledgeApi.updateKnowledge(data) - // message.success(t('common.updateSuccess')) - // } - // dialogVisible.value = false - // 发送操作成功的事件 - // emit('success') + await push({ name: 'Knowledgeindex' }) } finally { formLoading.value = false } diff --git a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue index d66999c..e1c3585 100644 --- a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue +++ b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue @@ -10,19 +10,19 @@ - + - + {{ userInfo?.dept.name }} {{ deptInfo?.name }} - + @@ -53,29 +54,29 @@ - + - - + + - + - 确 定 - 取 消 + + 关 闭 diff --git a/src/views/bpm/knows/knowledge/components/CommentDetail.vue b/src/views/bpm/knows/knowledge/components/CommentDetail.vue new file mode 100644 index 0000000..5efc695 --- /dev/null +++ b/src/views/bpm/knows/knowledge/components/CommentDetail.vue @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + — + + + + + + + + + diff --git a/src/views/bpm/knows/knowledge/index-flow.vue b/src/views/bpm/knows/knowledge/index-flow.vue new file mode 100644 index 0000000..6ef840b --- /dev/null +++ b/src/views/bpm/knows/knowledge/index-flow.vue @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + 发起知识流程 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 详情 + + + 进度 + + + + + + + + + + + + + diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue index a204468..9a2cbb9 100644 --- a/src/views/bpm/knows/knowledge/index.vue +++ b/src/views/bpm/knows/knowledge/index.vue @@ -65,10 +65,10 @@ > 新增 - - - 发起知识流程 - + + + +