部门修改

src/api/modules/system/organization.js

@@ -1,6 +1,6 @@
-import {httpApi} from "../../request/httpApi";
-import {useAppStore} from "~src/store";
-const useAppState = useAppStore();
+import { httpApi } from '../../request/httpApi'
+import { useAppStore } from '~src/store'
+const useAppState = useAppStore()
 
 export default {
     //列表数据 tree
@@ -10,19 +10,21 @@ export default {
             method: 'get',
             params: {
                 tenantId: useAppState.tenantId,
-            }
-        }, false);
+            },
+        }, false)
     },
 
     //列表数据(用户部门)
-    async treeUserdept() {
+    //deptType==-1查询树
+    async treeUserdept(deptType) {
         return httpApi({
             url: '/api/blade-system/dept/tree-userdept-info',
             method: 'get',
             params: {
                 tenantId: useAppState.tenantId,
-            }
-        }, false);
+                deptType,
+            },
+        }, false)
     },
 
     //列表数据(用户部门通过 depttype)
@@ -32,9 +34,9 @@ export default {
             method: 'get',
             params: {
                 tenantId: useAppState.tenantId,
-                deptType: 2
-            }
-        }, false);
+                deptType: 2,
+            },
+        }, false)
     },
 
     //删除
@@ -44,24 +46,32 @@ export default {
             method: 'post',
             params: {
                 ids,
-            }
-        }, false);
+            },
+        }, false)
     },
     //提交
     async submit(form) {
         return httpApi({
             url: '/api/blade-system/dept/submit',
             method: 'post',
-            data: form
-        }, false);
+            data: form,
+        }, false)
     },
     //获取相关数据
     async getList(form) {
         return httpApi({
             url: '/api/blade-system/dept/list',
             method: 'get',
-            params: form
-        }, false);
+            params: form,
+        }, false)
+    },
+    //非树形结构，查询所有部门
+    async getlistAllByType(form) {
+        return httpApi({
+            url: '/api/blade-system/dept/listAllByType',
+            method: 'get',
+            params: form,
+        }, false)
     },
     //获取相关数据
     async getMenuKeys(id) {
@@ -69,9 +79,9 @@ export default {
             url: '/api/blade-system/menu/role-tree-keys',
             method: 'get',
             params: {
-                roleIds: id
-            }
-        }, false);
+                roleIds: id,
+            },
+        }, false)
     },
     //获取相关数据
     async setMenuGrant(id, ids = []) {
@@ -80,8 +90,8 @@ export default {
             method: 'post',
             data: {
                 roleIds: [id],
-                menuHacIds: ids
-            }
-        }, false);
+                menuHacIds: ids,
+            },
+        }, false)
     },
 }

src/views/system/organization.vue

@@ -39,9 +39,10 @@
                 </el-form-item>
                 <el-form-item label="组织节点类别:">
                     <el-select v-model="formModel.deptType" block>
-                        <el-option label="公司" :value="1" />
+                        <el-option v-for="item in deptTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                        <!-- <el-option label="公司" :value="1" />
                         <el-option label="部门" :value="2" />
-                        <el-option label="岗位" :value="3" />
+                        <el-option label="岗位" :value="3" /> -->
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -94,7 +95,7 @@ const getTreeData = async () => {
 //获取树数据
 const userDeptTreeData = ref({})
 const getUserDeptTreeData = async () => {
-    const { error, code, data } = await mainApi.treeUserdept()
+    const { error, code, data } = await mainApi.treeUserdept(-1)
     if (!error && code === 200) {
         const res = await setDeptTreeData(data)
         userDeptTreeData.value = res[0]
@@ -138,6 +139,11 @@ const formModel = ref({})
 const formRules = {
     deptName: { required: true, trigger: 'blur', message: '请输入组织节点名称' },
 }
+const deptTypeList = ref([
+    { label:'公司', value:1 },
+    { label:'部门', value:2 },
+    { label:'岗位', value:3 },
+])
 
 //树节点的菜单点击事件
 const treeInfo = ref({})
@@ -155,6 +161,8 @@ const treeMenuTap = ({ key, node, data }) => {
         const type = '未知'
         
         formModalTitle.value = '新增' + type + '信息'
+        console.log(data, 'data')
+
         formModal.value = true
     } else if (key === 'edit') {
         if (node.level > 1) {

src/views/system/user.vue

@@ -352,7 +352,7 @@ const rowEidtClick = (row) => {
 //部门下拉数据
 const sectionData = ref([])
 const getSectionData = async () => {
-    const { error, code, data } = await organizationApi.getList({ deptType: 2 })
+    const { error, code, data } = await organizationApi.getlistAllByType({ deptType: 2 })
     if (!error && code === 200) {
         sectionData.value = getArrValue(data)
     } else {
@@ -365,7 +365,7 @@ const postData = ref([])
 const getpostData = async (id)=>{
     if (id) {
         //获取岗位数据
-         const { error, code, data } = await organizationApi.getList({ parentId: id })
+         const { error, code, data } = await organizationApi.getlistAllByType({ parentId: id })
         if (!error && code === 200) {
             postData.value = getArrValue(data)
         } else {