From 21c7375b7b38ebf2c8a2ca8fbf6fe9fb4f28250f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 12 Jan 2022 10:59:40 +0800
Subject: [PATCH] 新增公司注册机公司注册审核

---
 src/views/system/user.vue |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 094ba87..3ed7870 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -772,12 +772,26 @@
         if (d == "保安公司管理员") {
           // console.log(k);
           for (var n in k) {
-            if (k[n].title == "保安" || k[n].title == "保安公司管理员") {
+            if (k[n].title == "保安" || k[n].title == "保安公司管理员" || k[n].title == "分公司管理员") {
               b.push(k[n]);
             }
           }
           column.dicData = b;
-        } else if (d == "公安管理员") {
+        } else if (d == "分公司管理员") {
+          for (var j in k) {
+            if (k[j].title == "分公司管理员" || k[j].title == "保安") {
+              b.push(k[j]);
+            }
+            if(k[j].children){
+              for (var h in k[j].children) {
+                if (k[j].children[h].title == "分公司管理员" || k[j].children[h].title == "保安") {
+                  b.push(k[j].children[h]);
+                }
+              }
+            }
+          }
+          column.dicData = b;
+        }else if (d == "公安管理员") {
           for (var i in k) {
             if (k[i].title == "公安管理员") {
               b.push(k[i]);
@@ -792,7 +806,6 @@
       //公安局进入
       if (
         this.userInfo.role_name == "公安管理员"
-        
       ) {
         var parentId = this.userInfo.dept_id;
         var userId = this.userInfo.Id;
@@ -800,11 +813,12 @@
           const column = this.findObject(this.option.group, "deptId");
           column.dicData = res.data.data;
         });
-      } else {
-        // getDeptLazyTree(0).then((res) => {
-        //   const column = this.findObject(this.option.group, "deptId");
-        //   column.dicData = res.data.data;
-        // });
+      } else if( this.userInfo.role_name == "administrator"){
+        getDeptLazyTree(0).then((res) => {
+          const column = this.findObject(this.option.group, "deptId");
+          column.dicData = res.data.data;
+        });
+      }else {
         getSecurityDeptTree(null,null,this.userInfo.dept_id).then((res) => {
             const column = this.findObject(this.option.group, "deptId");
             column.dicData = res.data.data;

--
Gitblit v1.9.3