From 6ada0ac0c284fb092f18ddaa8bfa831a1eaf1e76 Mon Sep 17 00:00:00 2001
From: Yjhon <hbzgyjh@126.com>
Date: Tue, 29 Mar 2022 16:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=80=89=E6=8B=A9=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=88=AB=E8=B0=83=E6=95=B4=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/form/ProjectCourseSelect.vue      | 44 +++++++++++--------
 .../sys/dictionaryItem/DictionaryItemForm.vue |  2 +-
 .../sys/dictionaryItem/DictionaryItemList.vue |  4 +-
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/views/project/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index 655de97..57c0bda 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -8,8 +8,8 @@
             <a-menu-item key="self">自主课程</a-menu-item>
             <!-- :disabled="tabDis" -->
           </a-menu>
-          <!-- :defaultExpandedKeys="defaultExpandedKeys" -->
-          <a-tree :treeData="treeData" @select="onSelect" :defaultExpandAll="true" :replaceFields="replaceFields">
+          <!-- :defaultExpandedKeys="defaultExpandedKeys :replaceFields="replaceFields"" -->
+          <a-tree :treeData="treeData" @select="onSelect" :defaultExpandAll="true" >
             <a-icon slot="switcherIcon" type="down" />
           </a-tree>
         </a-col>
@@ -62,6 +62,7 @@
 import { coursewareClassList } from '@/api/course/courseware'
 import { listByClass } from '@/api/course/course'
 import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
+import { dictToTree } from '@/utils/util'
 import { STable } from '@/components'
 const rootParentId = 0
 
@@ -87,7 +88,7 @@ export default {
       menuKey: ['sys'], //默认系统课程
       // 查询参数
       queryParam: { name: '', classType: 1, type: 1, tags: [] },
-      replaceFields: { children: 'children', title: 'name', key: 'value', value: 'id' },
+      // replaceFields: { children: 'children', title: 'name', key: 'value', value: 'id' },
       expandedKeys: [],
       autoExpandParent: true,
       dictCourseTag: [], //课程标签
@@ -256,21 +257,28 @@ export default {
     },
 
     //获取课程分类数据，转换成树结构
-    getCourseTreeData(type) {
-      coursewareClassList({ type: type }).then((res) => {
-        //list转🌲
-        const list2tree1 = (list, parentId) => {
-          return list.filter((item) => {
-            // 默认选中第一个节点
-            if (!this.treeDataOne) this.treeDataOne.push(item.value)
-            if (item.parentId === parentId) {
-              item.children = list2tree1(list, item.id)
-              return true
-            }
-            return false
-          })
-        }
-        this.treeData = list2tree1(res.data, 0)
+    // getCourseTreeData(type) {
+    //   coursewareClassList({ type: type }).then((res) => {
+    //     //list转🌲
+    //     const list2tree1 = (list, parentId) => {
+    //       return list.filter((item) => {
+    //         // 默认选中第一个节点
+    //         if (!this.treeDataOne) this.treeDataOne.push(item.value)
+    //         if (item.parentId === parentId) {
+    //           item.children = list2tree1(list, item.id)
+    //           return true
+    //         }
+    //         return false
+    //       })
+    //     }
+    //     this.treeData = list2tree1(res.data, 0)
+    //   })
+    // },
+    getCourseTreeData () {
+      dictionaryDropDown({ dictionaryCode: '0006' }).then((res) => {
+        const result = dictToTree(res.data, [], 0)
+        console.log('result',result)
+        this.treeData = result
       })
     },
   },
diff --git a/src/views/sys/dictionaryItem/DictionaryItemForm.vue b/src/views/sys/dictionaryItem/DictionaryItemForm.vue
index d9ea871..55c747c 100644
--- a/src/views/sys/dictionaryItem/DictionaryItemForm.vue
+++ b/src/views/sys/dictionaryItem/DictionaryItemForm.vue
@@ -17,7 +17,7 @@
       </a-row>
       <a-row>
         <a-col :span="12">
-          <a-form-model-item ref="parentid" label="上级编号" prop="parentid">
+          <a-form-model-item ref="parentid" label="所属上级" prop="parentid">
             <a-input-number v-if="operable" v-model="form.parentid" :min="0"/>
             <span v-else>{{ form.parentid }}</span>
           </a-form-model-item>
diff --git a/src/views/sys/dictionaryItem/DictionaryItemList.vue b/src/views/sys/dictionaryItem/DictionaryItemList.vue
index e1e1c8b..0d14faa 100644
--- a/src/views/sys/dictionaryItem/DictionaryItemList.vue
+++ b/src/views/sys/dictionaryItem/DictionaryItemList.vue
@@ -66,11 +66,11 @@ export default {
       selectedRowKeys: [], // 选中行的key 出选择框时需要配置
       selectedRows: [], // 选中行的数据
       columns: [
-        { title: '编号', width: 30, dataIndex: 'id', key: 'id' },
+        // { title: '编号', width: 30, dataIndex: 'id', key: 'id' },
         { title: '词典项名称', width: 30, dataIndex: 'name', key: 'name' },
         { title: '词典项值', width: 30, dataIndex: 'value', key: 'value' },
         { title: '词典标识', width: 30, dataIndex: 'dictionaryCode', key: 'dictionaryCode' },
-        { title: '上级编号', width: 30, dataIndex: 'parentid', key: 'parentid' },
+        { title: '上级', width: 30, dataIndex: 'parentid', key: 'parentid' },
         { title: '排序', width: 30, dataIndex: 'sortid', key: 'sortid' }
       ],
       loadData: parameter => {