From b76f3280954a104fc4bd21501c3ab39c49b52fa8 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Thu, 9 Feb 2023 14:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=83=A8=E9=97=A8=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DepartList.vue     | 64 +++++++++++----------
 src/views/system/DepartUserList.vue | 86 ++++++++++++++---------------
 2 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 4dce41e..95597b0 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -1,32 +1,31 @@
 <template xmlns:background-color="http://www.w3.org/1999/xhtml">
-  <a-card :bordered="false">
   <a-row :gutter="10">
-      <a-col :md="12" :sm="24">
-        <a-card :bordered="false">
+    <a-col :md="12" :sm="24">
+      <a-card :bordered="false">
 
-          <!-- 按钮操作区域 -->
-          <a-row style="margin-left: 14px">
-            <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
-            <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-<!--            <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>-->
-<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--              <a-button type="primary" icon="import">导入</a-button>-->
-<!--            </a-upload>-->
-            <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
-            <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
-          </a-row>
-          <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-            <a-alert type="info" :showIcon="true">
-              <div slot="message">
-                当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
-                <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
-              </div>
-            </a-alert>
-            <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
-            <!-- 树-->
-            <a-col :md="10" :sm="24">
-              <template>
-                <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
+        <!-- 按钮操作区域 -->
+        <a-row style="margin-left: 14px">
+          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
+          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
+          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+            <a-button type="primary" icon="import">导入</a-button>
+          </a-upload>
+          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
+        </a-row>
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+          <a-alert type="info" :showIcon="true">
+            <div slot="message">
+              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
+              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
+            </div>
+          </a-alert>
+          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+          <!-- 树-->
+          <a-col :md="10" :sm="24">
+            <template>
+              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
                <span style="user-select: none">
             <a-tree
               checkable
@@ -156,15 +155,14 @@
             </a-empty>
           </a-card>
         </a-tab-pane>
-<!--        <a-tab-pane tab="部门权限" key="2" forceRender>-->
-<!--          <depart-auth-modal ref="departAuth"/>-->
-<!--        </a-tab-pane>-->
+        <a-tab-pane tab="部门权限" key="2" forceRender>
+          <depart-auth-modal ref="departAuth"/>
+        </a-tab-pane>
       </a-tabs>
 
-      </a-col>
-      <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
+    </a-col>
+    <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
   </a-row>
-  </a-card>
 </template>
 <script>
   import DepartModal from './modules/DepartModal'
@@ -586,7 +584,7 @@
         }
       }
       // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-
+      
     },
     created() {
       this.currFlowId = this.$route.params.id
diff --git a/src/views/system/DepartUserList.vue b/src/views/system/DepartUserList.vue
index a1bb88b..96352f8 100644
--- a/src/views/system/DepartUserList.vue
+++ b/src/views/system/DepartUserList.vue
@@ -1,52 +1,50 @@
 <template>
-  <a-card :bordered="false">
-    <a-row :gutter="10">
-      <a-col :md="8" :sm="24">
-        <a-card :bordered="false">
-          <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-            <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
-            <!-- 树-->
+  <a-row :gutter="10">
+    <a-col :md="8" :sm="24">
+      <a-card :bordered="false">
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+          <!-- 树-->
 
-            <template v-if="userIdentity === '2' && departTree.length>0">
+          <template v-if="userIdentity === '2' && departTree.length>0">
 
-              <!--组织机构-->
-              <a-tree
-                showLine
-                :selectedKeys="selectedKeys"
-                :checkStrictly="true"
-                @select="onSelect"
-                :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-                :treeData="departTree"
-                :autoExpandParent="autoExpandParent"
-                :expandedKeys="iExpandedKeys"
-                @expand="onExpand"
-              />
+            <!--组织机构-->
+            <a-tree
+              showLine
+              :selectedKeys="selectedKeys"
+              :checkStrictly="true"
+              @select="onSelect"
+              :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+              :treeData="departTree"
+              :autoExpandParent="autoExpandParent"
+              :expandedKeys="iExpandedKeys"
+              @expand="onExpand"
+            />
 
-            </template>
-            <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
-              <h3><span>您的部门下暂无有效部门信息</span></h3>
-            </div>
-            <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
+          </template>
+          <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
+            <h3><span>您的部门下暂无有效部门信息</span></h3>
           </div>
-        </a-card>
-      </a-col>
-      <a-col :md="16" :sm="24">
-        <a-card :bordered="false">
-          <a-tabs defaultActiveKey="2" @change="callback">
-            <a-tab-pane tab="基本信息" key="1" forceRender>
-              <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
-            </a-tab-pane>
-            <!--          <a-tab-pane tab="用户信息" key="2">-->
-            <!--            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>-->
-            <!--          </a-tab-pane>-->
-            <!--          <a-tab-pane tab="部门角色" key="3" forceRender>-->
-            <!--            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>-->
-            <!--          </a-tab-pane>-->
-          </a-tabs>
-        </a-card>
-      </a-col>
-    </a-row>
-  </a-card>
+          <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
+        </div>
+      </a-card>
+    </a-col>
+    <a-col :md="16" :sm="24">
+      <a-card :bordered="false">
+        <a-tabs defaultActiveKey="2" @change="callback">
+          <a-tab-pane tab="基本信息" key="1" forceRender>
+            <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
+          </a-tab-pane>
+          <a-tab-pane tab="用户信息" key="2">
+            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>
+          </a-tab-pane>
+          <a-tab-pane tab="部门角色" key="3" forceRender>
+            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>
+          </a-tab-pane>
+        </a-tabs>
+      </a-card>
+    </a-col>
+  </a-row>
 </template>
 <script>
   import DeptBaseInfo from './modules/DeptBaseInfo'