Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bb83c07f91
@ -18,6 +18,9 @@ export const KnowledgeApi = {
|
|||||||
getKnowledgePage: async (params: any) => {
|
getKnowledgePage: async (params: any) => {
|
||||||
return await request.get({ url: `/bpm/knowledge/page`, params })
|
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) => {
|
getKnowledge: async (id: number) => {
|
||||||
|
@ -366,7 +366,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
|
|||||||
noCache: true,
|
noCache: true,
|
||||||
hidden: true,
|
hidden: true,
|
||||||
canTo: 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'
|
activeMenu: '/bpm/knows/knowledge'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,8 +89,6 @@ defineOptions({ name: 'KnowledgeCreate' })
|
|||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
const { delView } = useTagsViewStore() // 视图操作
|
const { delView } = useTagsViewStore() // 视图操作
|
||||||
// const dialogVisible = ref(true) // 弹窗的是否展示
|
|
||||||
// const dialogTitle = ref('') // 弹窗的标题
|
|
||||||
const { push, currentRoute } = useRouter() // 路由
|
const { push, currentRoute } = useRouter() // 路由
|
||||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
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++++++++++++++++++++
|
//flow begin++++++++++++++++++++
|
||||||
// 指定审批人
|
// 指定审批人
|
||||||
const processDefineKey = 'my-test-flow03' // 流程定义 Key
|
const processDefineKey = 'my-test-flow03' // 流程定义 Key
|
||||||
@ -187,19 +166,11 @@ const submitForm = async () => {
|
|||||||
if (startUserSelectTasks.value?.length > 0) {
|
if (startUserSelectTasks.value?.length > 0) {
|
||||||
data.startUserSelectAssignees = startUserSelectAssignees.value
|
data.startUserSelectAssignees = startUserSelectAssignees.value
|
||||||
}
|
}
|
||||||
// if (formType.value === 'create') {
|
await KnowledgeApi.createKnowledge(data)
|
||||||
await KnowledgeApi.createKnowledge(data)
|
message.success(t('发起成功!'))
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
// 关闭当前 Tab
|
// 关闭当前 Tab
|
||||||
delView(unref(currentRoute))
|
delView(unref(currentRoute))
|
||||||
await push({ name: 'BpmOALeave' })
|
await push({ name: 'Knowledgeindex' })
|
||||||
// } else {
|
|
||||||
// await KnowledgeApi.updateKnowledge(data)
|
|
||||||
// message.success(t('common.updateSuccess'))
|
|
||||||
// }
|
|
||||||
// dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
// emit('success')
|
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
|
@ -10,19 +10,19 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="知识标题" prop="knowTitle">
|
<el-form-item label="知识标题" prop="knowTitle">
|
||||||
<el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
|
<el-input v-model="formData.knowTitle" placeholder="请输入知识标题" readonly />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="部门" prop="deptId">
|
<el-form-item label="部门" prop="deptId">
|
||||||
<el-input v-model="formData.deptId" v-show="false" />
|
<el-input v-model="formData.deptId" v-show="false" readonly />
|
||||||
<div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>
|
<div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>
|
||||||
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
|
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="知识状态" prop="status">
|
<el-form-item label="知识状态" prop="status">
|
||||||
<el-radio-group v-model="formData.status">
|
<el-radio-group v-model="formData.status" :disabled="isReadOnly" >
|
||||||
<el-radio
|
<el-radio
|
||||||
v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
|
v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
@ -43,6 +43,7 @@
|
|||||||
check-strictly
|
check-strictly
|
||||||
default-expand-all
|
default-expand-all
|
||||||
placeholder="请选择上级分类"
|
placeholder="请选择上级分类"
|
||||||
|
:disabled="isReadOnly"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -53,29 +54,29 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item label="内容" prop="content">
|
<el-form-item label="内容" prop="content">
|
||||||
<Editor v-model="formData.content" height="150px" />
|
<Editor v-model="formData.content" height="150px" readonly />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item label="文件路径" prop="filePath">
|
<el-form-item label="文件路径" prop="filePath" readonly >
|
||||||
<UploadFile v-model="formData.filePath" />
|
<UploadFile v-model="formData.filePath" :disabled="isReadOnly" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 子表的表单 -->
|
<!-- 子表的表单 -->
|
||||||
<el-tabs v-model="subTabsName">
|
<el-tabs v-model="subTabsName">
|
||||||
<el-tab-pane label="评论" name="comment">
|
<el-tab-pane label="评论" name="comment">
|
||||||
<CommentForm ref="commentFormRef" :know-id="formData.id" />
|
<CommentForm ref="commentFormRef" :know-id="formData.id" readonly />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>-->
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||||
</template>
|
</template>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge'
|
import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge'
|
||||||
import CommentForm from './components/CommentForm.vue'
|
import CommentForm from './components/CommentDetail.vue'
|
||||||
import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
|
import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
|
||||||
import {DeptVO, getDept} from "@/api/system/dept";
|
import {DeptVO, getDept} from "@/api/system/dept";
|
||||||
import {defaultProps, handleTree} from "@/utils/tree";
|
import {defaultProps, handleTree} from "@/utils/tree";
|
||||||
@ -83,7 +84,7 @@ import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
|
|||||||
|
|
||||||
/** 知识发布 表单 */
|
/** 知识发布 表单 */
|
||||||
defineOptions({ name: 'KnowledgeForm' })
|
defineOptions({ name: 'KnowledgeForm' })
|
||||||
|
const isReadOnly = ref(true); // 设置为 true 则组件为只读状态
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||||
@ -151,38 +152,6 @@ defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
|||||||
|
|
||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
||||||
const submitForm = async () => {
|
|
||||||
// 校验表单
|
|
||||||
await formRef.value.validate()
|
|
||||||
// 校验子表单
|
|
||||||
try {
|
|
||||||
await commentFormRef.value.validate()
|
|
||||||
} catch (e) {
|
|
||||||
subTabsName.value = 'comment'
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 提交请求
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as unknown as KnowledgeVO
|
|
||||||
// 拼接子表的数据
|
|
||||||
data.comments = commentFormRef.value.getData()
|
|
||||||
|
|
||||||
if (formType.value === 'create') {
|
|
||||||
await KnowledgeApi.createKnowledge(data)
|
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
} else {
|
|
||||||
await KnowledgeApi.updateKnowledge(data)
|
|
||||||
message.success(t('common.updateSuccess'))
|
|
||||||
}
|
|
||||||
dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
/** 重置表单 */
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
|
@ -1,250 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
|
||||||
<el-form
|
|
||||||
ref="formRef"
|
|
||||||
:model="formData"
|
|
||||||
:rules="formRules"
|
|
||||||
label-width="100px"
|
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="知识标题" prop="knowTitle">
|
|
||||||
<el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="部门" prop="deptId">
|
|
||||||
<el-input v-model="formData.deptId" v-show="false" />
|
|
||||||
<div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>
|
|
||||||
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="知识状态" prop="status">
|
|
||||||
<el-radio-group v-model="formData.status">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.value"
|
|
||||||
>
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="知识分类" prop="typeId">
|
|
||||||
<!-- <el-input v-model="formData.typeId" placeholder="请选择知识分类" />-->
|
|
||||||
<el-tree-select
|
|
||||||
v-model="formData.typeId"
|
|
||||||
:data="knowtypeTree"
|
|
||||||
:props="{...defaultProps, lable: 'name'}"
|
|
||||||
check-strictly
|
|
||||||
default-expand-all
|
|
||||||
placeholder="请选择上级分类"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="作者" prop="content">
|
|
||||||
<el-input v-model="formData.userName" readonly />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-form-item label="内容" prop="content">
|
|
||||||
<Editor v-model="formData.content" height="150px" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="文件路径" prop="filePath">
|
|
||||||
<UploadFile v-model="formData.filePath" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<!-- 子表的表单 -->
|
|
||||||
<el-tabs v-model="subTabsName">
|
|
||||||
<el-tab-pane label="评论" name="comment">
|
|
||||||
<CommentForm ref="commentFormRef" :know-id="formData.id" />
|
|
||||||
</el-tab-pane>
|
|
||||||
</el-tabs>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
|
||||||
import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge'
|
|
||||||
import CommentForm from './components/CommentForm.vue'
|
|
||||||
import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
|
|
||||||
import {DeptVO, getDept} from "@/api/system/dept";
|
|
||||||
import {defaultProps, handleTree} from "@/utils/tree";
|
|
||||||
import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
|
|
||||||
|
|
||||||
import * as DefinitionApi from '@/api/bpm/definition'
|
|
||||||
import * as UserApi from '@/api/system/user'
|
|
||||||
/** 知识发布 表单 */
|
|
||||||
defineOptions({ name: 'KnowledgeForm' })
|
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
|
||||||
const message = useMessage() // 消息弹窗
|
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
||||||
const dialogTitle = ref('') // 弹窗的标题
|
|
||||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
|
||||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
|
||||||
const formData = ref({
|
|
||||||
id: undefined,
|
|
||||||
typeId: undefined,
|
|
||||||
deptId: '',
|
|
||||||
knowTitle: undefined,
|
|
||||||
userName:'',
|
|
||||||
content: undefined,
|
|
||||||
status: undefined,
|
|
||||||
filePath: undefined
|
|
||||||
})
|
|
||||||
const formRules = reactive({
|
|
||||||
typeId: [{ required: true, message: '类型id不能为空', trigger: 'blur' }],
|
|
||||||
knowTitle: [{ required: true, message: '知识标题不能为空', trigger: 'blur' }]
|
|
||||||
})
|
|
||||||
const formRef = ref() // 表单 Ref
|
|
||||||
const knowtypeTree = ref() // 树形结构
|
|
||||||
const userInfo = ref({} as ProfileVO )
|
|
||||||
const deptInfo = ref({} as DeptVO )
|
|
||||||
/** 子表的表单 */
|
|
||||||
const subTabsName = ref('comment')
|
|
||||||
const commentFormRef = ref()
|
|
||||||
const getUserInfo = async () => {
|
|
||||||
if ( formData.value.deptId == '' ){
|
|
||||||
const users = await getUserProfile()
|
|
||||||
userInfo.value = users
|
|
||||||
formData.value.deptId= users.dept.id
|
|
||||||
|
|
||||||
deptInfo.value = {} as DeptVO
|
|
||||||
}else{
|
|
||||||
const dept = await getDept(formData.value.deptId)
|
|
||||||
deptInfo.value = dept
|
|
||||||
userInfo.value = {} as ProfileVO
|
|
||||||
}
|
|
||||||
if (formData.value.userName == ''){
|
|
||||||
const users = await getUserProfile()
|
|
||||||
formData.value.userName= users.nickname
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
/** 打开弹窗 */
|
|
||||||
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
|
|
||||||
const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
|
|
||||||
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
|
|
||||||
const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
|
|
||||||
const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
|
|
||||||
const userList = ref<any[]>([]) // 用户列表
|
|
||||||
|
|
||||||
/** 提交表单 */
|
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
|
||||||
const submitForm = async () => {
|
|
||||||
// 校验表单
|
|
||||||
await formRef.value.validate()
|
|
||||||
// 校验子表单
|
|
||||||
try {
|
|
||||||
await commentFormRef.value.validate()
|
|
||||||
} catch (e) {
|
|
||||||
subTabsName.value = 'comment'
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// 校验指定审批人++
|
|
||||||
if (startUserSelectTasks.value?.length > 0) {
|
|
||||||
await startUserSelectAssigneesFormRef.value.validate()
|
|
||||||
}
|
|
||||||
// 提交请求
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as unknown as KnowledgeVO
|
|
||||||
// 拼接子表的数据
|
|
||||||
data.comments = commentFormRef.value.getData()
|
|
||||||
// 设置指定审批人++
|
|
||||||
if (startUserSelectTasks.value?.length > 0) {
|
|
||||||
data.startUserSelectAssignees = startUserSelectAssignees.value
|
|
||||||
}
|
|
||||||
if (formType.value === 'create') {
|
|
||||||
await KnowledgeApi.createKnowledge(data)
|
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
} else {
|
|
||||||
await KnowledgeApi.updateKnowledge(data)
|
|
||||||
message.success(t('common.updateSuccess'))
|
|
||||||
}
|
|
||||||
dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
|
||||||
const resetForm = () => {
|
|
||||||
formData.value = {
|
|
||||||
id: undefined,
|
|
||||||
typeId: undefined,
|
|
||||||
deptId: '',
|
|
||||||
knowTitle: undefined,
|
|
||||||
userName:'',
|
|
||||||
content: undefined,
|
|
||||||
status: '0',
|
|
||||||
filePath: undefined
|
|
||||||
}
|
|
||||||
formRef.value?.resetFields()
|
|
||||||
}
|
|
||||||
const getKnowtypeTree = async () => {
|
|
||||||
knowtypeTree.value = []
|
|
||||||
const data = await KnowtypeApi.getKnowtypeList()
|
|
||||||
const root: Tree = { id: 0, name: 'ESG', children: [] }
|
|
||||||
root.children = handleTree(data, 'id', 'parentId')
|
|
||||||
knowtypeTree.value.push(root)
|
|
||||||
}
|
|
||||||
/** 初始化 */
|
|
||||||
onMounted(async () => {
|
|
||||||
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
|
|
||||||
undefined,
|
|
||||||
processDefineKey
|
|
||||||
)
|
|
||||||
if (!processDefinitionDetail) {
|
|
||||||
message.error('OA 请假的流程模型未配置,请检查!')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
|
|
||||||
console.log(startUserSelectTasks.value?.length ,"length")
|
|
||||||
// 设置指定审批人
|
|
||||||
if (startUserSelectTasks.value?.length > 0) {
|
|
||||||
// 设置校验规则
|
|
||||||
for (const userTask of startUserSelectTasks.value) {
|
|
||||||
startUserSelectAssignees.value[userTask.id] = []
|
|
||||||
startUserSelectAssigneesFormRules.value[userTask.id] = [
|
|
||||||
{ required: true, message: '请选择审批人', trigger: 'blur' }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
// 加载用户列表
|
|
||||||
userList.value = await UserApi.getSimpleUserList()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
89
src/views/bpm/knows/knowledge/components/CommentDetail.vue
Normal file
89
src/views/bpm/knows/knowledge/components/CommentDetail.vue
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
<template>
|
||||||
|
<el-form
|
||||||
|
ref="formRef"
|
||||||
|
:model="formData"
|
||||||
|
:rules="formRules"
|
||||||
|
v-loading="formLoading"
|
||||||
|
label-width="0px"
|
||||||
|
:inline-message="true"
|
||||||
|
>
|
||||||
|
<el-table :data="formData" class="-mt-10px">
|
||||||
|
<el-table-column label="序号" type="index" width="100" />
|
||||||
|
<el-table-column label="内容" min-width="200">
|
||||||
|
<template #default="{ row, $index }">
|
||||||
|
<el-form-item :prop="`${$index}.content`" :rules="formRules.content" class="mb-0px!">
|
||||||
|
<el-input v-model="row.content" type="textarea" placeholder="请输入内容" readonly />
|
||||||
|
</el-form-item>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column align="center" fixed="right" label="操作" width="60">
|
||||||
|
<template #default="{ $index }">
|
||||||
|
<el-button @click="handleDelete($index)" link>—</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-form>
|
||||||
|
<!-- <el-row justify="center" class="mt-3">-->
|
||||||
|
<!-- <el-button @click="handleAdd" round>+ 添加评论</el-button>-->
|
||||||
|
<!-- </el-row>-->
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { KnowledgeApi } from '@/api/bpm/knows/knowledge'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
knowId: undefined // 类型id(主表的关联字段)
|
||||||
|
}>()
|
||||||
|
const formLoading = ref(false) // 表单的加载中
|
||||||
|
const formData = ref([])
|
||||||
|
const formRules = reactive({
|
||||||
|
})
|
||||||
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
|
/** 监听主表的关联字段的变化,加载对应的子表数据 */
|
||||||
|
watch(
|
||||||
|
() => props.knowId,
|
||||||
|
async (val) => {
|
||||||
|
// 1. 重置表单
|
||||||
|
formData.value = []
|
||||||
|
// 2. val 非空,则加载数据
|
||||||
|
if (!val) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
formLoading.value = true
|
||||||
|
formData.value = await KnowledgeApi.getCommentListByKnowId(val)
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
const handleAdd = () => {
|
||||||
|
const row = {
|
||||||
|
id: undefined,
|
||||||
|
knowId: undefined,
|
||||||
|
content: undefined
|
||||||
|
}
|
||||||
|
row.knowId = props.knowId
|
||||||
|
formData.value.push(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
const handleDelete = (index) => {
|
||||||
|
//formData.value.splice(index, 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 表单校验 */
|
||||||
|
const validate = () => {
|
||||||
|
return formRef.value.validate()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 表单值 */
|
||||||
|
const getData = () => {
|
||||||
|
return formData.value
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({ validate, getData })
|
||||||
|
</script>
|
276
src/views/bpm/knows/knowledge/index-flow.vue
Normal file
276
src/views/bpm/knows/knowledge/index-flow.vue
Normal file
@ -0,0 +1,276 @@
|
|||||||
|
<template>
|
||||||
|
<ContentWrap>
|
||||||
|
<!-- 搜索工作栏 -->
|
||||||
|
<el-form
|
||||||
|
class="-mb-15px"
|
||||||
|
:model="queryParams"
|
||||||
|
ref="queryFormRef"
|
||||||
|
:inline="true"
|
||||||
|
label-width="68px"
|
||||||
|
>
|
||||||
|
<el-form-item label="归属部门" prop="deptId">
|
||||||
|
<el-tree-select
|
||||||
|
v-model="queryParams.deptId"
|
||||||
|
:data="deptList"
|
||||||
|
:props="defaultProps"
|
||||||
|
check-strictly
|
||||||
|
node-key="id"
|
||||||
|
class="!w-240px"
|
||||||
|
placeholder="请选择归属部门"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="知识标题" prop="knowTitle">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.knowTitle"
|
||||||
|
placeholder="请输入知识标题"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
class="!w-240px"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="知识状态" prop="status">
|
||||||
|
<el-select
|
||||||
|
v-model="queryParams.status"
|
||||||
|
placeholder="请选择知识状态"
|
||||||
|
clearable
|
||||||
|
class="!w-240px"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="创建时间" prop="createTime">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="queryParams.createTime"
|
||||||
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
|
type="daterange"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
||||||
|
class="!w-240px"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||||
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- type="primary"-->
|
||||||
|
<!-- plain-->
|
||||||
|
<!-- @click="openForm('create')"-->
|
||||||
|
<!-- v-hasPermi="['bpm:knowledge:create']"-->
|
||||||
|
<!-- >-->
|
||||||
|
<!-- <Icon icon="ep:plus" class="mr-5px" /> 新增-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
<el-button plain type="primary" @click="handleCreate()">
|
||||||
|
<Icon class="mr-5px" icon="ep:plus" />
|
||||||
|
发起知识流程
|
||||||
|
</el-button>
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- type="success"-->
|
||||||
|
<!-- plain-->
|
||||||
|
<!-- @click="handleExport"-->
|
||||||
|
<!-- :loading="exportLoading"-->
|
||||||
|
<!-- v-hasPermi="['bpm:knowledge:export']"-->
|
||||||
|
<!-- >-->
|
||||||
|
<!-- <Icon icon="ep:download" class="mr-5px" /> 导出-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</ContentWrap>
|
||||||
|
|
||||||
|
<!-- 列表 -->
|
||||||
|
<ContentWrap>
|
||||||
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||||
|
<el-table-column label="知识分类" align="center" prop="typeName" />
|
||||||
|
<el-table-column label="知识标题" align="center" prop="knowTitle" />
|
||||||
|
<el-table-column label="作者" align="center" prop="userName" />
|
||||||
|
<el-table-column label="归属部门" align="center" prop="deptName" />
|
||||||
|
<el-table-column label="流程状态" align="center" prop="flowStatus">
|
||||||
|
<template #default="scope">
|
||||||
|
<!-- <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />-->
|
||||||
|
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.flowStatus" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="创建时间"
|
||||||
|
align="center"
|
||||||
|
prop="createTime"
|
||||||
|
:formatter="dateFormatter"
|
||||||
|
width="180px"
|
||||||
|
/>
|
||||||
|
<el-table-column label="操作" align="center">
|
||||||
|
<template #default="scope">
|
||||||
|
|
||||||
|
<el-button
|
||||||
|
v-hasPermi="['bpm:oa-leave:query']"
|
||||||
|
link
|
||||||
|
type="primary"
|
||||||
|
@click="openForm('detail', scope.row.id)"
|
||||||
|
>
|
||||||
|
详情
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
type="danger"
|
||||||
|
@click="handleProcessDetail(scope.row)"
|
||||||
|
v-hasPermi="['bpm:knowledge:delete']"
|
||||||
|
>
|
||||||
|
进度
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!-- 分页 -->
|
||||||
|
<Pagination
|
||||||
|
:total="total"
|
||||||
|
v-model:page="queryParams.pageNo"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
</ContentWrap>
|
||||||
|
|
||||||
|
<!-- 表单弹窗:添加/修改 -->
|
||||||
|
<KnowledgeForm ref="formRef" :width="formWidth" @success="getList" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
|
import { dateFormatter } from '@/utils/formatTime'
|
||||||
|
import download from '@/utils/download'
|
||||||
|
import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge'
|
||||||
|
import KnowledgeForm from './KnowledgeDetail.vue'
|
||||||
|
import { defaultProps, handleTree } from '@/utils/tree'
|
||||||
|
import * as DeptApi from "@/api/system/dept";
|
||||||
|
|
||||||
|
/** 知识发布 列表 */
|
||||||
|
defineOptions({ name: 'Knowledgeindexflow' })
|
||||||
|
const router = useRouter() // 路由
|
||||||
|
const message = useMessage() // 消息弹窗
|
||||||
|
const { t } = useI18n() // 国际化
|
||||||
|
|
||||||
|
const ys = ref(false)//收藏图标切换
|
||||||
|
const loading = ref(true) // 列表的加载中
|
||||||
|
const list = ref<KnowledgeVO[]>([]) // 列表的数据
|
||||||
|
const total = ref(0) // 列表的总页数
|
||||||
|
|
||||||
|
const queryParams = reactive({
|
||||||
|
pageNo: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
typeId: undefined,
|
||||||
|
deptId: undefined,
|
||||||
|
knowTitle: undefined,
|
||||||
|
content: undefined,
|
||||||
|
status: undefined,
|
||||||
|
filePath: undefined,
|
||||||
|
createTime: []
|
||||||
|
})
|
||||||
|
const queryFormRef = ref() // 搜索的表单
|
||||||
|
const deptList = ref<Tree[]>([]) // 树形结构
|
||||||
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
|
|
||||||
|
const dialogVisible = ref(false);
|
||||||
|
|
||||||
|
/** 查询列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
const data = await KnowledgeApi.getKnowledgePageFlow(queryParams)
|
||||||
|
list.value = data.list
|
||||||
|
total.value = data.total
|
||||||
|
// 加载部门树
|
||||||
|
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
queryParams.pageNo = 1
|
||||||
|
getList()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
const resetQuery = () => {
|
||||||
|
queryFormRef.value.resetFields()
|
||||||
|
handleQuery()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 添加/修改操作 */
|
||||||
|
const formRef = ref()
|
||||||
|
const formWidth = ref('80%'); // 你想要的宽度
|
||||||
|
const openForm = (type: string, id?: number) => {
|
||||||
|
formRef.value.width = formWidth.value; // 设置宽度
|
||||||
|
formRef.value.open(type, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
try {
|
||||||
|
// 删除的二次确认
|
||||||
|
await message.delConfirm()
|
||||||
|
// 发起删除
|
||||||
|
await KnowledgeApi.deleteKnowledge(id)
|
||||||
|
message.success(t('common.delSuccess'))
|
||||||
|
// 刷新列表
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
// flowBegin++++++++++++++++++
|
||||||
|
/** 添加操作 */
|
||||||
|
const handleCreate = () => {
|
||||||
|
router.push({ name: 'KnowledgeCreate' })
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 详情操作 */
|
||||||
|
const handleDetail = (row: LeaveApi.LeaveVO) => {
|
||||||
|
router.push({
|
||||||
|
name: 'KnowledgeDetail',
|
||||||
|
query: {
|
||||||
|
id: row.id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/** 审批进度 */
|
||||||
|
const handleProcessDetail = (row) => {
|
||||||
|
router.push({
|
||||||
|
name: 'BpmProcessInstanceDetail',
|
||||||
|
query: {
|
||||||
|
id: row.processInstanceId
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// fix: 列表不刷新的问题。
|
||||||
|
watch(
|
||||||
|
() => router.currentRoute.value,
|
||||||
|
() => {
|
||||||
|
getList()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
// flowOver++++++++++++++++++
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
const handleExport = async () => {
|
||||||
|
try {
|
||||||
|
// 导出的二次确认
|
||||||
|
await message.exportConfirm()
|
||||||
|
// 发起导出
|
||||||
|
exportLoading.value = true
|
||||||
|
const data = await KnowledgeApi.exportKnowledge(queryParams)
|
||||||
|
download.excel(data, '知识发布.xls')
|
||||||
|
} catch {
|
||||||
|
} finally {
|
||||||
|
exportLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 初始化 **/
|
||||||
|
onMounted(() => {
|
||||||
|
getList()
|
||||||
|
|
||||||
|
})
|
||||||
|
</script>
|
@ -65,10 +65,10 @@
|
|||||||
>
|
>
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button plain type="primary" @click="handleCreate()">
|
<!-- <el-button plain type="primary" @click="handleCreate()">-->
|
||||||
<Icon class="mr-5px" icon="ep:plus" />
|
<!-- <Icon class="mr-5px" icon="ep:plus" />-->
|
||||||
发起知识流程
|
<!-- 发起知识流程-->
|
||||||
</el-button>
|
<!-- </el-button>-->
|
||||||
<el-button
|
<el-button
|
||||||
type="success"
|
type="success"
|
||||||
plain
|
plain
|
||||||
@ -145,7 +145,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
|
|||||||
import * as DeptApi from "@/api/system/dept";
|
import * as DeptApi from "@/api/system/dept";
|
||||||
|
|
||||||
/** 知识发布 列表 */
|
/** 知识发布 列表 */
|
||||||
defineOptions({ name: 'Knowledge' })
|
defineOptions({ name: 'Knowledgeindex' })
|
||||||
const router = useRouter() // 路由
|
const router = useRouter() // 路由
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
|
Loading…
Reference in New Issue
Block a user