From 79c5d6a424c52ec50e856cdab5d98474cfd02be8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 07 Mar 2023 17:01:40 +0800
Subject: [PATCH] 火灾管理火灾补录

---
 src/views/system/user.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 5ae2fb7..c4a6914 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -303,7 +303,8 @@
                 required: true,
                 message: "请选择所属角色",
                 trigger: "click"
-              }]
+              }],
+              display: false
             },
             {
               label: "用户名",
@@ -374,7 +375,19 @@
                 required: true,
                 message: "请选择所属单位",
                 trigger: "click"
-              }]
+              }],
+              display: false
+            },
+            {
+              label: "启用状态",
+              prop: "status",
+              type: "select",
+              dicUrl: '/api/blade-system/dict-biz/dictionary?code=user_status',
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              display: false
             },
           ],
           group: [
@@ -719,14 +732,6 @@
       if (!website.tenantMode) {
         this.initData(website.tenantId);
       }
-      getRoleTree(this.userInfo.tenant_id).then(res => {
-        const column = this.findObject(this.option.column, "roleId");
-        column.dicData = res.data.data;
-      });
-      getDeptTree(this.userInfo.tenant_id).then(res => {
-        const column = this.findObject(this.option.column, "deptId");
-        column.dicData = res.data.data;
-      });
     },
     methods: {
       nodeClick(data) {
@@ -738,10 +743,14 @@
         getRoleTree(tenantId).then(res => {
           const column = this.findObject(this.option.group, "roleId");
           column.dicData = res.data.data;
+          const columnRole = this.findObject(this.option.column, "roleId");
+          columnRole.dicData = res.data.data;
         });
         getDeptTree(tenantId).then(res => {
           const column = this.findObject(this.option.group, "deptId");
           column.dicData = res.data.data;
+          const columnDept = this.findObject(this.option.column, "deptId");
+          columnDept.dicData = res.data.data;
         });
         // getPostList(tenantId).then(res => {
         //   const column = this.findObject(this.option.group, "postId");
@@ -974,10 +983,15 @@
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
+          this.data.forEach(e=>{
+            e.status = e.status + ""
+          })
           this.loading = false;
           this.selectionClear();
         });
       },
+
+      //下面的方法业务都不需要
       platformRowUpdate(row, index, done, loading) {
         updatePlatform(row.id, row.userType, row.userExt).then(() => {
           this.platformOnLoad(this.platformPage);

--
Gitblit v1.9.3