From a9173165ca9549b3169482db3e2885358ba5ece9 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 14:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 55df43c2..6b792b37 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,18 +1,13 @@
 <template>
     <div class="app-container">
-        <el-row :gutter="20">
-            <el-col :span="16" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+        <el-row>
+            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
                     <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
                         <el-link v-if="breadcrumb.id === currentBreadCrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
                         <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">编辑</el-link>
                     </el-breadcrumb-item>
-                    <el-button 
-                        type="primary" 
-                        size="mini" 
-                        style="margin-left:10px;margin-top:0px"
-                        @click="modifyOrgInfo">
-                        修改</el-button>
                 </el-breadcrumb>
             </el-col>
             
@@ -1511,6 +1506,12 @@ export default {
         },
 
         async refreshThisPage (index) {
+
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return
+            }
+
             const selectOrg = this.breadcrumbArr[index]
             this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
 
@@ -1540,7 +1541,11 @@ export default {
                 this.entry = true
                 this.getAgencyList()
                 this.assembleBreadcrumbArr(orgId, 'agency')
-            } else if (orgType === 'department') {
+            } 
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
                 this.agencyStaffTableListData = []
                 this.departmentStaffTableListData = []
                 this.gridStaffTableListData = []
@@ -1571,7 +1576,7 @@ export default {
                 this.gridStaffTableFlag = true
                 this.GridPeo()
                 this.assembleBreadcrumbArr(orgId, 'grid')
-            }
+            } */
         },
         // 获取当前用户信息
         async getUser(){
@@ -1657,7 +1662,7 @@ export default {
 
         // 修改面包屑
         modifyOrgInfo(){
-            orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            let orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
             console.log(orgInfo)
         },