From 0663397b44975a069f5b2644808c90b58b1b01cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A2=E6=B5=A9=E4=B8=9C?= <975115611@qq.com>
Date: Mon, 30 Dec 2024 18:12:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(systemSetting):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在内部用户页面添加所属组织选择功能
- 在组织管理页面添加组织树展示和编辑功能
- 新增组织成员展示功能
- 优化组织数据请求接口
---
 src/pages/systemSetting/internalusers.vue | 24 +++++++++++++
 src/pages/systemSetting/management.vue    | 44 ++++++++++++++---------
 src/utils/request.js                      |  4 +++
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/pages/systemSetting/internalusers.vue b/src/pages/systemSetting/internalusers.vue
index e442407..188958c 100644
--- a/src/pages/systemSetting/internalusers.vue
+++ b/src/pages/systemSetting/internalusers.vue
@@ -96,6 +96,20 @@
                         <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <!-- 所属组织 -->
+                <el-form-item label="所属组织" prop="organid">
+                    <el-tree-select
+                        @change="val => handleUnitChange(val)"
+                        v-model="ruleForm.organid"
+                        node-key="organid"
+                        :data="zztree"
+                        :props="defaultProps"
+                        :default-expanded-keys="[zztree[0].organid]"
+                        check-strictly
+                        :render-after-expand="true"
+                        placeholder="请选择组织"
+                    />
+                </el-form-item>
             </el-form>
             <template #footer>
                 <span class="dialog-footer">
@@ -128,6 +142,8 @@ const formTemplate = {
     avatar: { filePath: '' },
 };
 let ruleForm = reactive({ ...formTemplate });
+const zztree = ref(null);
+const defaultProps = { children: 'children', label: 'organame', value: 'organid' };
 // 重置ruleForm数据函数
 const rules = {
     username: [{ required: true, message: '请输入账号', trigger: 'blur' }],
@@ -150,6 +166,7 @@ const rules = {
         },
     ],
     roleIds: [{ required: true, message: '请选择角色', trigger: 'change' }],
+    organid: [{ required: true, message: '请选择组织', trigger: 'change' }],
 };
 // 重置表单sF
 const resetForm = () => {
@@ -182,6 +199,12 @@ onMounted(() => {
     proxy.$api.getRolsList().then(res => {
         roleList.value = res.data;
     });
+    // 组织列表
+    proxy.$api.getOrganizationList().then(res => {
+        console.log(res.data, 'res.data');
+        zztree.value = res.data;
+        // ruleForm.organizationId = res.data[0].id;
+    });
 });
 onBeforeUnmount(() => {
     // proxy.$websocket.close();
@@ -260,6 +283,7 @@ const handleDelete = row => {
             proxy.$message.info('已取消');
         });
 };
+const handleUnitChange = val => {};
 // 禁用/解除禁用
 const handleRelieve = row => {
     let fromData = {
diff --git a/src/pages/systemSetting/management.vue b/src/pages/systemSetting/management.vue
index fe97af4..85de6c6 100644
--- a/src/pages/systemSetting/management.vue
+++ b/src/pages/systemSetting/management.vue
@@ -12,9 +12,9 @@
             >
         </div>
         <!-- 生成一个菜单树表格 -->
-        <el-table :data="treeData" style="width: 100%; margin-bottom: 20px" row-key="id" border default-expand-all>
+        <el-table :data="treeData" style="width: 100%; margin-bottom: 20px" row-key="organid" border default-expand-all>
             <el-table-column prop="organame" label="组织名" />
-            <el-table-column prop="organid" label="organid" />
+            <el-table-column prop="orgcode" label="组织编码" />
             <el-table-column label="操作" width="140" align="left">
                 <template #default="scope">
                     <el-button v-if="scope.row.organid" type="primary" link @click="handleEdit(scope.row.organid)">编辑</el-button>
@@ -27,7 +27,7 @@
             <el-form :model="form" :label-width="formLabelWidth" :rules="rules" ref="ruleFormRef">
                 <el-row>
                     <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                        <el-form-item label="组织名称" prop="name">
+                        <el-form-item label="组织名称" prop="organame">
                             <el-input v-model="form.organame" autocomplete="off" />
                         </el-form-item>
                     </el-col>
@@ -36,12 +36,12 @@
                             <el-tree-select
                                 @change="val => handleUnitChange(val)"
                                 v-model="form.parentId"
-                                node-key="id"
-                                :data="treeData"
-                                :props="treeProps"
-                                :default-expanded-keys="[0]"
+                                node-key="organid"
+                                :data="treeDatas"
+                                :props="defaultProps"
+                                :default-expanded-keys="[treeDatas[0].organid]"
                                 check-strictly
-                                :render-after-expand="false"
+                                :render-after-expand="true"
                                 placeholder="请选择上级组织"
                             />
                         </el-form-item>
@@ -58,6 +58,16 @@
                             <el-input v-model="form.orgcode" placeholder="请输入" clearable />
                         </el-form-item>
                     </el-col>
+                    <!-- 当前成员 -->
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="form.organid">
+                        <el-form-item prop="members" label="当前成员">
+                            <el-table :data="form.employees" style="width: 100%; margin-bottom: 20px" border>
+                                <el-table-column prop="username" label="账号" />
+                                <el-table-column prop="name" label="姓名" />
+                                <el-table-column prop="email" label="邮箱" />
+                            </el-table>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
             <template #footer>
@@ -81,10 +91,6 @@ const userInfoStore = useUserInfoStore();
 const { userInfo } = storeToRefs(userInfoStore); // 响应式
 const formLabelWidth = '100px';
 const ruleFormRef = ref();
-const treeProps = {
-    children: 'children',
-    label: 'name',
-};
 const rules = {
     organame: [{ required: true, message: '请输入组织名', trigger: 'blur' }],
     parentId: [{ required: false, message: '请选择上级菜单', trigger: 'change' }],
@@ -97,6 +103,8 @@ const form = reactive({
     orgcode: '',
 });
 const treeData = ref(null);
+const treeDatas = ref([]);
+const defaultProps = { children: 'children', label: 'organame', value: 'organid' };
 const handleClose = done => {
     done();
 };
@@ -113,7 +121,7 @@ const onSubmit = formEl => {
         }
         if (form.organid) {
             // 更新菜单
-            proxy.$api.updatemenu(form).then(res => {
+            proxy.$api.updateOrganization(form).then(res => {
                 if (res.code == 200) {
                     proxy.$message.success(res.message);
                     dialogVisible.value = false;
@@ -137,7 +145,6 @@ const onSubmit = formEl => {
 };
 // 删除
 const handleDelete = async row => {
-    console.log(row);
     proxy.$messageBox
         .confirm('确定要删除吗?', '提示', {
             type: '提示',
@@ -165,15 +172,18 @@ const handleEdit = async row => {
 const getOrganizationList = async () => {
     const res = await proxy.$api.getOrganizationList();
     console.log(res.data, '66');
-    // const treedata = getParentMenuTree(res.data);
+    const treedata = getParentMenuTree(res.data);
+    treeDatas.value = treedata;
     treeData.value = res.data;
+
+    console.log(treeDatas.value, '6699', treeData.value);
 };
 
 const getParentMenuTree = tableTreeDdata => {
     let parent = {
         parentId: '',
-        name: '顶级菜单',
-        id: 0,
+        organame: '顶级组织',
+        organid: 0,
         children: tableTreeDdata,
     };
     return [parent];
diff --git a/src/utils/request.js b/src/utils/request.js
index 1ce1458..ed48a49 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -235,6 +235,10 @@ export default {
     detailOrganization(params) {
         return oGet(baseUrl + '/orgManagement/detail', params);
     },
+    // 修改组织
+    updateOrganization(params) {
+        return oPost(baseUrl + '/orgManagement/update', params);
+    },
     // 删除组织
     deleteOrganization(params) {
         return oPost(baseUrl + '/orgManagement/delete', params);
-- 
Gitee