From 27bb2d1859137d299a41a25103c2e789b7902248 Mon Sep 17 00:00:00 2001
From: xinghaodong <975115611@qq.com>
Date: Sat, 28 Dec 2024 17:40:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(systemSetting):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E7=94=A8=E6=88=B7=E5=92=8C=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=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

- 在内部用户页面中，使用可选链操作符改进了对 avatar 属性的访问
- 在组织管理页面中，修复了编辑和删除操作的逻辑错误
- 新增了组织详情和删除组织的 API 接口
---
 src/pages/systemSetting/internalusers.vue | 4 ++--
 src/pages/systemSetting/management.vue    | 9 +++++----
 src/utils/request.js                      | 8 ++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/pages/systemSetting/internalusers.vue b/src/pages/systemSetting/internalusers.vue
index f7a70e9..e442407 100644
--- a/src/pages/systemSetting/internalusers.vue
+++ b/src/pages/systemSetting/internalusers.vue
@@ -29,14 +29,14 @@
                     <!-- <div class="demo-image__preview"> -->
                     <el-image
                         style="width: 30px; height: 30px"
-                        :src="`${proxy.$api.img_url}${scope.row.avatar.filePath}`"
+                        :src="`${proxy.$api.img_url}${scope.row?.avatar?.filePath}`"
                         :zoom-rate="1.2"
                         :max-scale="7"
                         :min-scale="0.2"
                         :initial-index="0"
                         :z-index="999"
                         fit="cover"
-                        :preview-src-list="[`${proxy.$api.img_url}${scope.row.avatar.filePath}`]"
+                        :preview-src-list="[`${proxy.$api.img_url}${scope.row?.avatar?.filePath}`]"
                     />
                     <!-- </div> -->
                     <!-- <img :src="`${proxy.$api.img_url}${scope.row.avatar_url}`" alt="" style="width: 50px; height: 50px" /> -->
diff --git a/src/pages/systemSetting/management.vue b/src/pages/systemSetting/management.vue
index 6814209..fe97af4 100644
--- a/src/pages/systemSetting/management.vue
+++ b/src/pages/systemSetting/management.vue
@@ -17,8 +17,8 @@
             <el-table-column prop="organid" label="organid" />
             <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)">编辑</el-button>
-                    <el-button v-if="scope.row.organid" type="primary" link @click="handleDelete(scope.row.id)">删除</el-button>
+                    <el-button v-if="scope.row.organid" type="primary" link @click="handleEdit(scope.row.organid)">编辑</el-button>
+                    <el-button v-if="scope.row.organid" type="primary" link @click="handleDelete(scope.row.organid)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -137,12 +137,13 @@ const onSubmit = formEl => {
 };
 // 删除
 const handleDelete = async row => {
+    console.log(row);
     proxy.$messageBox
         .confirm('确定要删除吗?', '提示', {
             type: '提示',
         })
         .then(async () => {
-            const data = await proxy.$api.deletemenu({ id: row });
+            const data = await proxy.$api.deleteOrganization({ id: row });
             if (data.code == 200) {
                 proxy.$message.success(data.message);
                 getOrganizationList();
@@ -153,7 +154,7 @@ const handleDelete = async row => {
 const handleEdit = async row => {
     dialogVisible.value = true;
     // 调用详情接口
-    const data = await proxy.$api.detail({ id: row.id });
+    const data = await proxy.$api.detailOrganization({ id: row });
     Object.assign(form, data.data);
     if (!data.data.parentId) {
         form.parentId = 0;
diff --git a/src/utils/request.js b/src/utils/request.js
index ff01dc6..1ce1458 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -231,6 +231,14 @@ export default {
     addOrganization(params) {
         return oPost(baseUrl + '/orgManagement/add', params);
     },
+    // 组织详情
+    detailOrganization(params) {
+        return oGet(baseUrl + '/orgManagement/detail', params);
+    },
+    // 删除组织
+    deleteOrganization(params) {
+        return oPost(baseUrl + '/orgManagement/delete', params);
+    },
 };
 
 //封装post/get请求
-- 
Gitee