From c4e67a8942e514b65ab41bb19781d50576c15725 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 19:56:52 +0800
Subject: [PATCH] 用户

---
 src/views/system/user.vue |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index df4243e..eda8308 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row class="user">
-    <el-col :span="5">
+    <el-col :span="sizes[0]">
       <div class="box">
         <el-scrollbar>
           <basic-container>
@@ -13,7 +13,7 @@
         </el-scrollbar>
       </div>
     </el-col>
-    <el-col :span="19">
+    <el-col :span="sizes[1]">
       <basic-container>
         <avue-crud
           :option="option"
@@ -50,7 +50,7 @@
               type="info"
               size="small"
               plain
-              v-if="permission.user_role"
+              v-if="permission.user_role && isguanli"
               icon="el-icon-user"
               @click="handleGrant"
               >角色配置
@@ -221,6 +221,11 @@
       }
     };
     return {
+      isguanli: true,
+
+      sizes: [5, 19],
+      deptids: null,
+
       form: {},
       search: {},
       roleBox: false,
@@ -303,18 +308,21 @@
             label: "所属组织机构",
             prop: "deptName",
             slot: true,
+            overHidden: true,
             display: false,
           },
           {
             label: "用户姓名",
             prop: "realName",
             search: true,
+            width: 90,
             display: false,
           },
           {
             label: "所属角色",
             prop: "roleName",
             slot: true,
+            width: 130,
             display: false,
           },
           // {
@@ -494,12 +502,19 @@
                     label: "女",
                     value: 2,
                   },
-                  {
-                    label: "未知",
-                    value: 3,
-                  },
+                  // {
+                  //   label: "未知",
+                  //   value: 3,
+                  // },
                 ],
                 hide: true,
+                rules: [
+                  {
+                    required: true,
+                    message: "请选择性别",
+                    trigger: "blur",
+                  },
+                ],
               },
               {
                 label: "用户生日",
@@ -753,6 +768,18 @@
       return ids.join(",");
     },
   },
+  created() {
+    console.log(this.userInfo.role_name);
+    if (this.userInfo.role_name == "保安公司管理员") {
+      this.deptids = this.userInfo.dept_id;
+      this.sizes = [0, 24];
+      this.isguanli = false;
+      // this.option.group[2].value = this.userInfo.Id;
+    } else {
+      this.deptids = null;
+      this.sizes = [5, 19];
+    }
+  },
   mounted() {
     // 非保安单位模式默认加载管理组数据
     if (!website.tenantMode) {
@@ -801,7 +828,7 @@
       getJurisdiction(params).then((res) => {
         // console.log(res.data.data);
         // return;
-        if (res.msg != "暂无承载数据") {
+        if (res.data.msg != "暂无承载数据") {
           row.jurisdiction = res.data.data;
         } else {
           row.jurisdiction = "";
@@ -999,12 +1026,12 @@
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      params["status"] = 1;
+      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
       getList(
         page.currentPage,
         page.pageSize,
         Object.assign(params, this.query),
-        this.treeDeptId
+        deptid
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -1065,11 +1092,12 @@
     },
     platformOnLoad(page, params = {}) {
       this.platformLoading = true;
+      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
       getList(
         page.currentPage,
         page.pageSize,
         Object.assign(params, this.query),
-        this.treeDeptId
+        deptid
       ).then((res) => {
         const data = res.data.data;
         this.platformPage.total = data.total;

--
Gitblit v1.9.3