From 78c10a09ae345c04bbfa713848219b0df9e40864 Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Thu, 25 Jul 2024 19:30:33 +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

---
 .../bpm/knows/knowledge/KnowledgeForm.vue     | 41 ++++++++++++-------
 src/views/bpm/knows/knowledge/index.vue       |  3 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 14c4442..590b5d7 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -33,20 +33,25 @@
             </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="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-form-item label="内容" prop="content">
         <Editor v-model="formData.content" height="150px" />
       </el-form-item>
@@ -72,7 +77,7 @@ 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 { getDept } from "@/api/system/dept";
+import {DeptVO, getDept} from "@/api/system/dept";
 import {defaultProps, handleTree} from "@/utils/tree";
 import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
 /** 知识发布 表单 */
@@ -89,6 +94,7 @@ const formData = ref({
   typeId: undefined,
   deptId: '',
   knowTitle: undefined,
+  userName:'',
   content: undefined,
   status: undefined,
   filePath: undefined
@@ -109,12 +115,18 @@ const getUserInfo = async () => {
     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) => {
@@ -176,6 +188,7 @@ const resetForm = () => {
     typeId: undefined,
     deptId: '',
     knowTitle: undefined,
+    userName:'',
     content: undefined,
     status: '0',
     filePath: undefined
diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue
index 6adb172..64cf8a4 100644
--- a/src/views/bpm/knows/knowledge/index.vue
+++ b/src/views/bpm/knows/knowledge/index.vue
@@ -81,8 +81,9 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="知识分类" align="center" prop="typeId" />
+      <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="status">
         <template #default="scope">