From 43dcb2ae4cfb2fc902bdb1e8ff7a2574d9313475 Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Fri, 2 Aug 2024 20:10:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=A8=8B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts               |  18 +-
 ...wledgeDetail.vue => KnowledgeDetailbk.vue} |   4 +-
 .../bpm/knows/knowledge/KnowledgeForm.vue     |   4 +-
 src/views/bpm/knows/knowledge/index-flow.vue  |  16 +-
 .../bpm/knows/knowledge/index-flowbk.vue      | 284 ++++++++++++++++++
 5 files changed, 315 insertions(+), 11 deletions(-)
 rename src/views/bpm/knows/knowledge/{KnowledgeDetail.vue => KnowledgeDetailbk.vue} (98%)
 create mode 100644 src/views/bpm/knows/knowledge/index-flowbk.vue

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index cd3dd32..dd77d92 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -355,19 +355,31 @@ const remainingRouter: AppRouteRecordRaw[] = [
           hidden: true,
           canTo: true,
           title: '发起知识流程',
-          activeMenu: '/bpm/knows/knowledge'
+          activeMenu: '/bpm/knows/knowledgeflow'
         }
       },
       {
         path: 'knows/knowledge/KnowledgeDetail',
-        component: () => import('@/views/bpm/knows/knowledge/KnowledgeDetail.vue'),
+        component: () => import('@/views/bpm/knows/knowledge/KnowledgeDetailbk.vue'),
         name: 'KnowledgeDetail',
         meta: {
           noCache: true,
           hidden: true,
           canTo: true,
           title: '查看知识流程',
-          activeMenu: '/bpm/knows/knowledge'
+          activeMenu: '/bpm/knows/knowledgeflow'
+        }
+      },
+      {
+        path: 'knows/knowledge/KnowledgeDetail1',
+        component: () => import('@/views/bpm/knows/knowledge/KnowledgeDetail.vue'),
+        name: 'KnowledgeDetail1',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '查看知识流程',
+          activeMenu: '/bpm/knows/knowledgeflow'
         }
       },
       {
diff --git a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue b/src/views/bpm/knows/knowledge/KnowledgeDetailbk.vue
similarity index 98%
rename from src/views/bpm/knows/knowledge/KnowledgeDetail.vue
rename to src/views/bpm/knows/knowledge/KnowledgeDetailbk.vue
index e1c3585..74f21d1 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeDetailbk.vue
@@ -83,11 +83,11 @@ import {defaultProps, handleTree} from "@/utils/tree";
 import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
 
 /** 知识发布 表单 */
-defineOptions({ name: 'KnowledgeForm' })
+defineOptions({ name: 'KnowledgeDetail' })
 const isReadOnly = ref(true); // 设置为 true 则组件为只读状态
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogVisible = ref(true) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 0d6efe8..9737479 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -106,7 +106,7 @@ const formData = ref({
   deptId: '',
   knowTitle: undefined,
   userName:'',
-  content: undefined,
+  content: '',
   status: undefined,
   filePath: undefined
 })
@@ -231,7 +231,7 @@ const resetForm = () => {
     deptId: '',
     knowTitle: undefined,
     userName:'',
-    content: undefined,
+    content: '',
     status: '0',
     filePath: undefined
   }
diff --git a/src/views/bpm/knows/knowledge/index-flow.vue b/src/views/bpm/knows/knowledge/index-flow.vue
index 6ef840b..adfd574 100644
--- a/src/views/bpm/knows/knowledge/index-flow.vue
+++ b/src/views/bpm/knows/knowledge/index-flow.vue
@@ -105,11 +105,19 @@
       <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
               v-hasPermi="['bpm:oa-leave:query']"
               link
               type="primary"
-          @click="openForm('detail', scope.row.id)"
+              @click="handleDetail(scope.row)"
           >
             详情
           </el-button>
@@ -134,7 +142,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <KnowledgeForm ref="formRef" :width="formWidth"   @success="getList" />
+<!--  <KnowledgeForm ref="formRef" :width="formWidth"   @success="getList" />-->
 </template>
 
 <script setup lang="ts">
@@ -142,7 +150,7 @@ 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 KnowledgeForm from './KnowledgeDetailbk.vue'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from "@/api/system/dept";
 
@@ -229,7 +237,7 @@ const handleCreate = () => {
 /** 详情操作 */
 const handleDetail = (row: LeaveApi.LeaveVO) => {
   router.push({
-    name: 'KnowledgeDetail',
+    name: 'KnowledgeDetail1',
     query: {
       id: row.id
     }
diff --git a/src/views/bpm/knows/knowledge/index-flowbk.vue b/src/views/bpm/knows/knowledge/index-flowbk.vue
new file mode 100644
index 0000000..02e0ab2
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/index-flowbk.vue
@@ -0,0 +1,284 @@
+<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
+              v-hasPermi="['bpm:oa-leave:query']"
+              link
+              type="primary"
+              @click="handleDetail(scope.row)"
+          >
+            详情
+          </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 './KnowledgeDetailbk.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: 'KnowledgeDetail1',
+    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>

From 61d25a40e86aff5c648447344c9d1bd976b54709 Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Fri, 2 Aug 2024 20:23:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=A8=8B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/knows/knowledge/KnowledgeDetail.vue   | 195 ++++++++++++++++++
 src/views/bpm/model/KnowledgeDetail1.vue      | 175 ++++++++++++++++
 2 files changed, 370 insertions(+)
 create mode 100644 src/views/bpm/knows/knowledge/KnowledgeDetail.vue
 create mode 100644 src/views/bpm/model/KnowledgeDetail1.vue

diff --git a/src/views/bpm/knows/knowledge/KnowledgeDetail.vue b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue
new file mode 100644
index 0000000..72f2843
--- /dev/null
+++ b/src/views/bpm/knows/knowledge/KnowledgeDetail.vue
@@ -0,0 +1,195 @@
+<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="请输入知识标题"  readonly />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="部门" prop="deptId">
+            <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="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"  :disabled="isReadOnly" >
+              <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="请选择上级分类"
+                  :disabled="isReadOnly"
+              />
+          </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"  readonly />
+      </el-form-item>
+
+      <el-form-item label="文件路径" prop="filePath"  readonly >
+        <UploadFile v-model="formData.filePath"  :disabled="isReadOnly" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="评论" name="comment">
+        <CommentForm ref="commentFormRef" :know-id="formData.id"  readonly />
+      </el-tab-pane>
+    </el-tabs>
+<!--    <template #footer>-->
+<!--      <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/CommentDetail.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 {propTypes} from "@/utils/propTypes";
+
+/** 知识发布 表单 */
+defineOptions({ name: 'KnowledgeDetail1' })
+const { query } = useRoute() // 查询参数
+const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
+const props = defineProps({
+  id: propTypes.number.def(undefined)
+})
+const isReadOnly = ref(true); // 设置为 true 则组件为只读状态
+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 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 id = props.id || queryId
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await KnowledgeApi.getKnowledge(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  await getUserInfo()
+  await getKnowtypeTree()
+})
+</script>
diff --git a/src/views/bpm/model/KnowledgeDetail1.vue b/src/views/bpm/model/KnowledgeDetail1.vue
new file mode 100644
index 0000000..20f747a
--- /dev/null
+++ b/src/views/bpm/model/KnowledgeDetail1.vue
@@ -0,0 +1,175 @@
+<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 {propTypes} from "@/utils/propTypes";
+
+/** 知识发布 表单 */
+defineOptions({ name: 'KnowledgeForm' })
+const { query } = useRoute() // 查询参数
+
+const props = defineProps({
+  id: propTypes.number.def(undefined)
+})
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+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 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)
+}
+const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
+onMounted(() => {
+  const  id = props.id || queryId;
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value =  KnowledgeApi.getKnowledge(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+   getUserInfo()
+   getKnowtypeTree()
+})
+</script>