From 1838fd7ab3bb28023d4a0c55331711fd5099597b Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Wed, 31 Jul 2024 16:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=AE=A1=E7=90=86=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/knows/comment/index.ts            |  41 +++
 src/api/bpm/knows/knowledge/index.ts          |   1 +
 src/api/infra/file/index.ts                   |   1 +
 src/components/UploadFile/src/UploadFile.vue  |   2 +
 src/router/modules/remaining.ts               |  24 ++
 src/views/bpm/knows/comment/CommentForm.vue   |  96 +++++++
 src/views/bpm/knows/comment/index.vue         | 189 +++++++++++++
 .../bpm/knows/knowledge/KnowledgeCreate.vue   | 252 ++++++++++++++++++
 .../bpm/knows/knowledge/KnowledgeDetail.vue   | 209 +++++++++++++++
 .../bpm/knows/knowledge/KnowledgeForm.vue     |  56 ++--
 .../bpm/knows/knowledge/KnowledgeForm11.vue   | 250 +++++++++++++++++
 .../bpm/knows/knowledge/KnowledgeFormbk.vue   | 205 ++++++++++++++
 .../knowledge/components/CommentForm.vue      |   6 +-
 src/views/bpm/knows/knowledge/index.vue       |  38 ++-
 src/views/bpm/oa/leave/create.vue             |   2 +
 src/views/infra/file/FileForm.vue             |   4 +-
 src/views/infra/file/index.vue                |   8 +
 17 files changed, 1356 insertions(+), 28 deletions(-)
 create mode 100644 src/api/bpm/knows/comment/index.ts
 create mode 100644 src/views/bpm/knows/comment/CommentForm.vue
 create mode 100644 src/views/bpm/knows/comment/index.vue
 create mode 100644 src/views/bpm/knows/knowledge/KnowledgeCreate.vue
 create mode 100644 src/views/bpm/knows/knowledge/KnowledgeDetail.vue
 create mode 100644 src/views/bpm/knows/knowledge/KnowledgeForm11.vue
 create mode 100644 src/views/bpm/knows/knowledge/KnowledgeFormbk.vue

diff --git a/src/api/bpm/knows/comment/index.ts b/src/api/bpm/knows/comment/index.ts
new file mode 100644
index 0000000..8e61fec
--- /dev/null
+++ b/src/api/bpm/knows/comment/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 评论 VO
+export interface CommentVO {
+  id: number // id
+  knowId: number // 类型id
+  content: string // 内容
+}
+
+// 评论 API
+export const CommentApi = {
+  // 查询评论分页
+  getCommentPage: async (params: any) => {
+    return await request.get({ url: `/bpm/comment/page`, params })
+  },
+
+  // 查询评论详情
+  getComment: async (id: number) => {
+    return await request.get({ url: `/bpm/comment/get?id=` + id })
+  },
+
+  // 新增评论
+  createComment: async (data: CommentVO) => {
+    return await request.post({ url: `/bpm/comment/create`, data })
+  },
+
+  // 修改评论
+  updateComment: async (data: CommentVO) => {
+    return await request.put({ url: `/bpm/comment/update`, data })
+  },
+
+  // 删除评论
+  deleteComment: async (id: number) => {
+    return await request.delete({ url: `/bpm/comment/delete?id=` + id })
+  },
+
+  // 导出评论 Excel
+  exportComment: async (params) => {
+    return await request.download({ url: `/bpm/comment/export-excel`, params })
+  }
+}
diff --git a/src/api/bpm/knows/knowledge/index.ts b/src/api/bpm/knows/knowledge/index.ts
index d36c695..1161cfe 100644
--- a/src/api/bpm/knows/knowledge/index.ts
+++ b/src/api/bpm/knows/knowledge/index.ts
@@ -6,6 +6,7 @@ export interface KnowledgeVO {
   typeId: number // 类型id
   deptId: number // 部门id
   knowTitle: string // 知识标题
+  processInstanceId: string
   content: String  // 内容
   status: string // 知识状态
   filePath: string // 文件路径
diff --git a/src/api/infra/file/index.ts b/src/api/infra/file/index.ts
index 0e1b2e7..e4b653f 100644
--- a/src/api/infra/file/index.ts
+++ b/src/api/infra/file/index.ts
@@ -18,6 +18,7 @@ export interface FilePresignedUrlRespVO {
 
 // 查询文件列表
 export const getFilePage = (params: FilePageReqVO) => {
+  alert("getFilePage")
   return request.get({ url: '/infra/file/page', params })
 }
 
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 4459e69..1d6ffd2 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -118,6 +118,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
   message.success('上传成功')
+
   // 删除自身
   const index = fileList.value.findIndex((item) => item.response?.data === res.data)
   fileList.value.splice(index, 1)
@@ -181,6 +182,7 @@ const emitUpdateModelValue = () => {
   if (props.limit === 1 || isString(props.modelValue)) {
     result = result.join(',')
   }
+
   emit('update:modelValue', result)
 }
 </script>
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index db23bb1..727c4bb 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -345,6 +345,30 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '查看 OA 请假',
           activeMenu: '/bpm/oa/leave'
         }
+      },
+      {
+        path: 'knows/knowledge/KnowledgeCreate',
+        component: () => import('@/views/bpm/knows/knowledge/KnowledgeCreate.vue'),
+        name: 'KnowledgeCreate',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '发起知识流程',
+          activeMenu: '/bpm/knows/knowledge'
+        }
+      },
+      {
+        path: 'knows/knowledge/KnowledgeDetail',
+        component: () => import('@/views/bpm/knows/knowledge/KnowledgeDetail.vue'),
+        name: 'KnowledgeDetail',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '查看 OA 请假',
+          activeMenu: '/bpm/knows/knowledge'
+        }
       }
     ]
   },
diff --git a/src/views/bpm/knows/comment/CommentForm.vue b/src/views/bpm/knows/comment/CommentForm.vue
new file mode 100644
index 0000000..88a1539
--- /dev/null
+++ b/src/views/bpm/knows/comment/CommentForm.vue
@@ -0,0 +1,96 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="类型id" prop="knowId">
+        <el-input v-model="formData.knowId" placeholder="请输入类型id" />
+      </el-form-item>
+      <el-form-item label="内容" prop="content">
+        <el-input v-model="formData.content" type="textarea" placeholder="请输入内容" />
+      </el-form-item>
+    </el-form>
+    <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 { CommentApi, CommentVO } from '@/api/bpm/knows/comment'
+
+/** 评论 表单 */
+defineOptions({ name: 'CommentForm' })
+
+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,
+  knowId: undefined,
+  content: undefined
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+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 CommentApi.getComment(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as CommentVO
+    if (formType.value === 'create') {
+      await CommentApi.createComment(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CommentApi.updateComment(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    knowId: undefined,
+    content: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/knows/comment/index.vue b/src/views/bpm/knows/comment/index.vue
new file mode 100644
index 0000000..604f90f
--- /dev/null
+++ b/src/views/bpm/knows/comment/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <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 label="类型id" prop="knowId">
+        <el-input
+          v-model="queryParams.knowId"
+          placeholder="请输入类型id"
+          clearable
+          @keyup.enter="handleQuery"
+          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:comment:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['bpm:comment: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="id" align="center" prop="id" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="类型id" align="center" prop="knowId" />
+      <el-table-column label="内容" align="center" prop="content" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['bpm:comment:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['bpm:comment: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CommentForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CommentApi, CommentVO } from '@/api/bpm/knows/comment'
+import CommentForm from './CommentForm.vue'
+
+/** 评论 列表 */
+defineOptions({ name: 'Comment' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<CommentVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  createTime: [],
+  knowId: undefined,
+  content: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CommentApi.getCommentPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CommentApi.deleteComment(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CommentApi.exportComment(queryParams)
+    download.excel(data, '评论.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/knows/knowledge/KnowledgeCreate.vue b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue
new file mode 100644
index 0000000..e756fc7
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/KnowledgeCreate.vue
@@ -0,0 +1,252 @@
+<template>
+    <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>
+  <el-form>
+    <el-form-item>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+    </el-form-item>
+  </el-form>
+</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: 'KnowledgeCreate' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+// const dialogVisible = ref(true) // 弹窗的是否展示
+// const dialogTitle = ref('') // 弹窗的标题
+const { push, currentRoute } = useRouter() // 路由
+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: '0',
+  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 () => {
+  await getUserInfo()
+  await getKnowtypeTree()
+  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>
diff --git a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue
new file mode 100644
index 0000000..d66999c
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue
@@ -0,0 +1,209 @@
+<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";
+
+/** 知识发布 表单 */
+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 方法，用于打开弹窗
+
+/** 提交表单 */
+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 = () => {
+  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)
+}
+
+</script>
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 590b5d7..00df83f 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -1,11 +1,11 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
     >
       <el-row>
         <el-col :span="24">
@@ -35,21 +35,21 @@
         </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-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-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">
@@ -80,6 +80,7 @@ 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";
+
 /** 知识发布 表单 */
 defineOptions({ name: 'KnowledgeForm' })
 
@@ -122,10 +123,10 @@ const getUserInfo = async () => {
     deptInfo.value = dept
     userInfo.value = {} as ProfileVO
   }
-   if (formData.value.userName == ''){
-       const users = await getUserProfile()
-       formData.value.userName= users.nickname
-   }
+  if (formData.value.userName == ''){
+    const users = await getUserProfile()
+    formData.value.userName= users.nickname
+  }
 
 }
 /** 打开弹窗 */
@@ -147,6 +148,14 @@ const open = async (type: string, id?: number) => {
   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 事件，用于操作成功后的回调
@@ -160,12 +169,17 @@ const submitForm = async () => {
     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 (formType.value === 'create') {
       await KnowledgeApi.createKnowledge(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm11.vue b/src/views/bpm/knows/knowledge/KnowledgeForm11.vue
new file mode 100644
index 0000000..27ac9a1
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm11.vue
@@ -0,0 +1,250 @@
+<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>
diff --git a/src/views/bpm/knows/knowledge/KnowledgeFormbk.vue b/src/views/bpm/knows/knowledge/KnowledgeFormbk.vue
new file mode 100644
index 0000000..590b5d7
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/KnowledgeFormbk.vue
@@ -0,0 +1,205 @@
+<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";
+/** 知识发布 表单 */
+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 方法，用于打开弹窗
+
+/** 提交表单 */
+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 = () => {
+  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)
+}
+</script>
diff --git a/src/views/bpm/knows/knowledge/components/CommentForm.vue b/src/views/bpm/knows/knowledge/components/CommentForm.vue
index fa2945c..28e95f4 100644
--- a/src/views/bpm/knows/knowledge/components/CommentForm.vue
+++ b/src/views/bpm/knows/knowledge/components/CommentForm.vue
@@ -9,10 +9,10 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
-       <el-table-column label="内容" min-width="400">
+       <el-table-column label="内容" min-width="200">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.content`" :rules="formRules.content" class="mb-0px!">
-            <Editor v-model="row.content" height="150px" />
+            <el-input v-model="row.content" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -36,8 +36,6 @@ const props = defineProps<{
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
-  knowId: [{ required: true, message: '类型id不能为空', trigger: 'blur' }],
-  content: [{ required: true, message: '内容不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue
index 64cf8a4..a204468 100644
--- a/src/views/bpm/knows/knowledge/index.vue
+++ b/src/views/bpm/knows/knowledge/index.vue
@@ -65,6 +65,10 @@
         >
           <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
@@ -142,7 +146,7 @@ import * as DeptApi from "@/api/system/dept";
 
 /** 知识发布 列表 */
 defineOptions({ name: 'Knowledge' })
-
+const router = useRouter() // 路由
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -213,7 +217,39 @@ const handleDelete = async (id: number) => {
     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 {
diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index c940c13..8e24013 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -148,6 +148,7 @@ onMounted(async () => {
     return
   }
   startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
+  console.log(startUserSelectTasks.value?.length ,"length")
   // 设置指定审批人
   if (startUserSelectTasks.value?.length > 0) {
     // 设置校验规则
@@ -157,6 +158,7 @@ onMounted(async () => {
         { required: true, message: '请选择审批人', trigger: 'blur' }
       ]
     }
+
     // 加载用户列表
     userList.value = await UserApi.getSimpleUserList()
   }
diff --git a/src/views/infra/file/FileForm.vue b/src/views/infra/file/FileForm.vue
index 1de1e25..d7d347b 100644
--- a/src/views/infra/file/FileForm.vue
+++ b/src/views/infra/file/FileForm.vue
@@ -13,13 +13,13 @@
       :on-exceed="handleExceed"
       :on-success="submitFormSuccess"
       :http-request="httpRequest"
-      accept=".jpg, .png, .gif"
+      accept=".jpg, .png, .gif, .doc, .pdf, .els, .xls, .xlsx, .ppt, .pptx, .txt, .docx, .md, .zip, .rar, .7z, .tar, .gz, .bz2, .tgz, .tar.gz, .tar.bz2, .tar.xz, .tar.7z,.tar.gz, .tar.bz2, .tar.x"
       drag
     >
       <i class="el-icon-upload"></i>
       <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
       <template #tip>
-        <div class="el-upload__tip" style="color: red">
+        <div class="el-upload__tip" style="color: red">git push origin your-branch-name
           提示：仅允许导入 jpg、png、gif 格式文件！
         </div>
       </template>
diff --git a/src/views/infra/file/index.vue b/src/views/infra/file/index.vue
index 2ff3364..6df1124 100644
--- a/src/views/infra/file/index.vue
+++ b/src/views/infra/file/index.vue
@@ -92,6 +92,14 @@
       />
       <el-table-column label="操作" align="center">
         <template #default="scope">
+          <el-button
+              v-hasPermi="['infra:file:delete']"
+              link
+              type="primary"
+              @click="openForm(scope.row.id)"
+          >
+            编辑
+          </el-button>
           <el-button
             link
             type="danger"