Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/utils/util.js

@@ -25,7 +25,7 @@ export function handleScrollHeader(callback) {
     let timer = 0
 
     let beforeScrollTop = window.pageYOffset
-  callback = callback || function () { }
+    callback = callback || function() {}
     window.addEventListener(
         'scroll',
         event => {
@@ -70,7 +70,7 @@ export function removeLoadingAnimate(id = '', timeout = 1500) {
 export function listToTree(list, tree, parentId) {
     list.map(item => {
         const index = _.findIndex(list, ['id', item.pid])
-    if(index === -1){
+        if (index === -1) {
             item.pid = 0
         }
     })
@@ -101,14 +101,14 @@ export function dictToTree(list, tree, parentId) {
             item_.title = item.name;
             item_.value = item.value;
             item_.key = item.id;
-      const child = { ...item_, children: [] };
+            const child = {...item_, children: [] };
 
             dictToTree(list, child.children, item.value);
 
             if (child.children.length <= 0) {
                 delete child.children
             } else {
-        child.selectable = false;
+                // child.selectable = false;
             }
 
             tree.push(child)

src/views/project/form/ProjectCourseSelect.vue

@@ -8,7 +8,7 @@
             <a-menu-item key="self">自主课程</a-menu-item>
             <!-- :disabled="tabDis" -->
           </a-menu>
-          <!-- :defaultExpandedKeys="defaultExpandedKeys" -->
+          <!-- :defaultExpandedKeys="defaultExpandedKeys :replaceFields="replaceFields"" -->
           <a-tree :treeData="treeData" @select="onSelect" :defaultExpandAll="true" :replaceFields="replaceFields">
             <a-icon slot="switcherIcon" type="down" />
           </a-tree>
@@ -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: 'title', key: 'value', value: 'key' },
       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
       })
     },
   },

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>

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 => {