Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】机构用户树组件 #3



See merge request !1024

@@ -13,7 +13,6 @@
         :render-after-expand="false"
         :render-after-expand="false"
 >
 >
     <template #default="{ node, data }">
     <template #default="{ node, data }">
-<!--        //lsq 菜单类型，1：监控菜单，2：巡检菜单，3：个人工作台，4：系统菜单，5：跳转菜单，6：报表菜单 可以删除和编辑 2022-08-26-->
         <el-tag v-if="isTag" style="height: 18px;margin-right:6px;">
         <el-tag v-if="isTag" style="height: 18px;margin-right:6px;">
             {{getTypeName(data.type)}}</el-tag>
             {{getTypeName(data.type)}}</el-tag>
         <span>{{ node.label }}</span>
         <span>{{ node.label }}</span>

@@ -55,6 +55,7 @@ export default {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
         let data=Vue.ref([]);
         let data=Vue.ref([]);
         let change=(val)=>{
         let change=(val)=>{
+            //change事件传个父组件的值
             emit("changeSelect",val)
             emit("changeSelect",val)
         }
         }
         //获取菜单类型
         //获取菜单类型
@@ -83,34 +84,33 @@ export default {
 
 
         const load = (node, resolve) => {
         const load = (node, resolve) => {
             if (node.isLeaf) return resolve([])
             if (node.isLeaf) return resolve([])
-
-            setTimeout(() => {
-
-                proxy.$http.get(`/api-user/users/getAll`, {}, function (res) {
-                    let arr=[];
-                    if(res && res.data){
-                        arr= res.data;
+            if(node.data.type && node.data.type=='org'){
+                // setTimeout(() => {
+                    if(node.data.type && node.data.type=='org') {
+                        let param = {
+                            page: 1,
+                            limit: 99999,
+                            orgId: node.data.value
+                        }
+                        proxy.$http.get(`/api-user/users`, param, function (res) {
+                            let arr = [];
+                            if (res && res.data) {
+                                arr = res.data;
                             }
                             }
-                    if(arr.length>0){
-                        arr.map(item=>{
-                            item.name=item.nickName;
-                            item.type='user'
+                            if (arr.length > 0) {
+                                arr.map(item => {
+                                    item.name = item.nickname;
+                                    item.type = 'user';
+                                    item.value=item.username;
                                 })
                                 })
                             }
                             }
                             resolve(arr)
                             resolve(arr)
                         })
                         })
-                /*resolve([
-                    {
-                        value: ++id,
-                        label: `lazy load node${id}`,
-                    },
-                    {
-                        value: ++id,
-                        label: `lazy load node${id}`,
-                        isLeaf: true,
-                    },
-                ])*/
-            }, 400)
+                    }
+                // }, 100)
+            }else{
+                resolve([])
+            }
         }
         }
         // 监听编辑状态
         // 监听编辑状态
         Vue.watch(() => props.value, (newValue, oldVlaue) => {
         Vue.watch(() => props.value, (newValue, oldVlaue) => {