From 4794f6147f985a9211b2b4456cbc17f147ab22e4 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 2 Aug 2024 11:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                          |  1 +
 src/views/administrative/appointment.vue |  3 ++
 src/views/administrative/deptFilter.vue  | 41 ++++++++++++++++++++----
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 913a90b..cfd1309 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -3,6 +3,7 @@ import { _get, _post,_form,_delete } from "../http/index";
 //查询用户列表
 export const queryUsers = (params, success, error) => _get("/app/listApp",params,success,error)
 export const queryAUsers = (params, success, error) => _get("/app/listAApp",params,success,error)
+export const queryUsersNoPermission = (params, success, error) => _get("/app/listUsersNoPermission",params,success,error)
 
 //查询部门列表
 export const queryDepts = (params, success, error) => _get("/app/listDeptAppNoPermission",params,success,error)
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index e2d31b9..7394673 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -144,6 +144,9 @@
                         readonly
                         @click="data.deptChecked=true"
                 />
+                  <div>
+
+                  </div>
 
                 </van-cell-group>
 
diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
index 0a3d535..fbceb12 100644
--- a/src/views/administrative/deptFilter.vue
+++ b/src/views/administrative/deptFilter.vue
@@ -30,14 +30,32 @@
 <!--                </van-checkbox-group>-->
                 <van-checkbox-group v-model="checked">
                     <van-cell-group inset>
-                        <van-cell v-for="(item, index) in dataList" :key="item" clickable>
+                        <van-cell v-for="(item, index) in dataList" :key="item"  @click="toDrill(item.deptId, item.parentId)">
+                            <div style="display: flex; justify-content: space-between;">
+<!--                                <div style="width: 70%;" @click="toggle(item.deptId)">-->
+<!--                                    <van-checkbox :name="item.deptId+';-;'+item.deptName" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>-->
+<!--                                        {{item.deptName}}-->
+<!--                                    </van-checkbox>-->
+<!--                                </div>-->
+<!--                                <div style="width: 30%;" @click="toDrill(item.deptId, item.parentId)"><van-icon name="arrow" size="0.5rem" /></div>-->
+
+                                <div style="width: 70%; text-align: left;">
+                                    {{item.deptName}}
+                                </div>
+                                <div style="width: 30%;"><van-icon name="arrow" size="0.5rem" /></div>
+
+                            </div>
+                        </van-cell>
+                    </van-cell-group>
+
+                    <van-cell-group inset>
+                        <van-cell v-for="(item, index) in userList" :key="item" clickable>
                             <div style="display: flex; justify-content: space-between;">
                                 <div style="width: 70%;" @click="toggle(item.deptId)">
-                                    <van-checkbox :name="item.deptId+';-;'+item.deptName" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>
-                                        {{item.deptName}}
+                                    <van-checkbox :name="item.userId+';-;'+item.userName" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>
+                                        {{item.userName}}
                                     </van-checkbox>
                                 </div>
-                                <div style="width: 30%;" @click="toDrill(item.deptId, item.parentId)"><van-icon name="arrow" size="0.5rem" /></div>
                             </div>
                         </van-cell>
                     </van-cell-group>
@@ -50,7 +68,7 @@
 
 <script>
     import {ref} from 'vue'
-    import {queryDepts, nextDeptByparentId} from '../../api/user'
+    import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '../../api/user'
     import {Icon} from 'vant';
 
     const {useCommon} = $globalStore
@@ -78,6 +96,7 @@
                 checked: ref([]),
                 checkboxRefs: ref([]),
                 nextParentId: '0',
+                userList: [],
             }
         },
         created() {
@@ -107,7 +126,17 @@
             },
             queryList() {
                 queryDepts(this.searchParam, success => {
-                    this.dataList = success.data
+                    if (null != success.data && success.data.length > 0) {
+                        this.userList = [];
+                        this.dataList = success.data
+                    } else {
+                        // 没有底层数据说明到叶子节点了 . 根据部门id去查询相关用户信息
+                        queryUsersNoPermission({"deptId": this.searchParam.parentId}, success => {
+                            this.dataList = [];
+                            this.userList = success.data;
+                        }, error => {
+                        });
+                    }
                 }, error => {
                 })
             },