ZaiZai 1 year ago
parent
commit
cf57e4a053

+ 8 - 0
src/api/modules/desk/wbs.js

@@ -29,6 +29,14 @@ export default {
             params: { ids },
         })
     },
+    //元素库树
+    async tabTypeLazyTreeAll(form) {
+        return HcApi({
+            url: '/api/blade-manager/wbsPrivate/tab-Type-lazy-tree-all',
+            method: 'get',
+            params: form,
+        })
+    },
     //元素库、独立库节点排序
     async wbsInfotabSort(primaryKeyIds) {
         return HcApi({

+ 18 - 18
src/views/desk/wbs/element-lib.vue

@@ -66,7 +66,7 @@ const getDataApi = () => {
 //树配置
 const treeRef = ref(null)
 const treeProps = {
-    label: 'name',
+    label: 'title',
     children: 'children',
     isLeaf: (item) => {
         return !item.hasChildren
@@ -74,21 +74,19 @@ const treeProps = {
 }
 
 //懒加载树的菜单
-const treeLazyMenu = ({ item, level }, resolve) => {
+const treeLazyMenu = ({ level }, resolve) => {
     let newMenu = []
-    if (item.fileType !== 3) {
-        newMenu.push({ icon: 'add-circle', label: '新增', key: 'add' })
+    if (level === 2) {
+        newMenu.push({ icon: 'arrow-up-down', label: '排序', key: 'rank' })
     }
-    if (level !== 1) {
-        newMenu.push({ icon: 'sort-asc', label: '排序', key: 'sort' })
-    }
-    newMenu.push({ icon: 'delete-bin', label: '删除', key: 'del' })
     resolve(newMenu)
 }
 
 //菜单被点击
 const treeMenuClick = ({ key, data, node }) => {
-
+    if (key === 'rank') {
+        console.log(data)
+    }
 }
 
 //伪刷新
@@ -102,12 +100,13 @@ const pseudoRefresh = () => {
 
 //懒加载树
 const treeLoadNode = async ({ item, level }, resolve) => {
-    const parentId = level === 0 ? 0 : item.id
-    /*const { data } = await mainApi.tabLazyTree({
+    const parentId = level === 0 ? '12345678910' : item.id
+    const { data } = await mainApi.tabTypeLazyTreeAll({
         parentId: parentId,
-        modeId: dataInfo.value.id,
-    })*/
-    resolve([])
+        current: 1,
+        size: 1000,
+    })
+    resolve(getArrValue(data?.records))
 }
 
 //树节点被点击
@@ -136,10 +135,11 @@ const pageChange = ({ current, size }) => {
 //表格数据
 const tableData = ref([])
 const tableColumn = ref([
-    { key: 'wbsName', name: '名称' },
-    { key: 'wbsType', name: '划分类型', width: 120, align: 'center' },
-    { key: 'status', name: '是否启用', width: 100, align: 'center' },
-    { key: 'createTime', name: '创建时间', width: 180, align: 'center' },
+    { key: 'title', name: '名称' },
+    { key: 'tabType', name: '类型' },
+    { key: 'elementTotal', name: '总量' },
+    { key: 'tabOwner', name: '所属方' },
+    { key: 'fillRate', name: '填报率' },
     { key: 'action', name: '操作', width: 180, align: 'center' },
 ])
 

+ 3 - 3
src/views/exctab/excel/template.vue

@@ -168,7 +168,7 @@ const treeLazyMenu = ({ item, level }, resolve) => {
         newMenu.push({ icon: 'draft', label: '编辑', key: 'edit' })
     }
     if (level !== 1) {
-        newMenu.push({ icon: 'sort-asc', label: '排序', key: 'sort' })
+        newMenu.push({ icon: 'arrow-up-down', label: '排序', key: 'rank' })
     }
     if (item.fileType !== 3) {
         newMenu.push({ icon: 'file-upload', label: '上传', key: 'upload' })
@@ -189,7 +189,7 @@ const treeDataMenu = ({ node, item, level }, resolve) => {
         newMenu.push({ icon: 'draft', label: '编辑', key: 'edit' })
     }
     if (isLeaf) {
-        newMenu.push({ icon: 'sort-asc', label: '排序', key: 'sort' })
+        newMenu.push({ icon: 'sort-asc', label: '排序', key: 'rank' })
     }
     if (level !== 1) {
         newMenu.push({ icon: 'file-upload', label: '上传', key: 'upload' })
@@ -209,7 +209,7 @@ const treeMenuClick = ({ key, data, node }) => {
         addExcelInfo.value = getObjValue(data)
         addExcelType.value = '编辑'
         addExcelShow.value = true
-    } else if (key === 'sort') {
+    } else if (key === 'rank') {
         treeSortData.value = {
             parentId: node?.parent?.data?.id ?? '',
             modeId: dataInfo.value.id,

+ 2 - 2
src/views/project/list/wbs-tree.vue

@@ -292,7 +292,7 @@ const treeMenus = [
     { icon: 'refresh', label: '同步新增元素表单', key: 'sync1' },
     { icon: 'loop-left', label: '同步元素表单排序到合同段', key: 'sync3' },
     { icon: 'loop-right', label: '同步节点基础信息及表单URL', key: 'sync2' },
-    { icon: 'sort-asc', label: '调整排序', key: 'sort' },
+    { icon: 'arrow-up-down', label: '调整排序', key: 'rank' },
     { icon: 'delete-bin', label: '删除节点', key: 'del' },
 ]
 //菜单被点击
@@ -357,7 +357,7 @@ const treeMenuClick = async ({ key, node, data }) => {
             window.$message.success('同步成功')
             getInfoTableData()
         })
-    } else if (key === 'sort') {
+    } else if (key === 'rank') {
         const { parentId } = data
         const { id } = projectInfo.value
         if (isNullES(id) || isNullES(wbsId.value)) {