From 2714882212ec5aebe1002684d84b17d7914b4718 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 25 Nov 2023 15:10:26 +0800
Subject: [PATCH] 物业公司,物业公司小区,区域查询,用户,组织机构调整

---
 src/views/system/user.vue |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index d94daee..81f5034 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -505,23 +505,23 @@
                     trigger: "click"
                   }]
                 },
-                // {
-                //   label: "所属部门",
-                //   prop: "deptId",
-                //   type: "tree",
-                //   multiple: true,
-                //   dicData: [],
-                //   props: {
-                //     label: "title"
-                //   },
-                //   checkStrictly: true,
-                //   slot: true,
-                //   rules: [{
-                //     required: true,
-                //     message: "请选择所属部门",
-                //     trigger: "click"
-                //   }]
-                // },
+                {
+                  label: "所属部门",
+                  prop: "deptId",
+                  type: "tree",
+                  // multiple: true,
+                  dicData: [],
+                  props: {
+                    label: "title"
+                  },
+                  checkStrictly: true,
+                  slot: true,
+                  rules: [{
+                    required: true,
+                    message: "请选择所属部门",
+                    trigger: "click"
+                  }]
+                },
                 // {
                 //   label: "所属岗位",
                 //   prop: "postId",
@@ -727,10 +727,10 @@
           const column = this.findObject(this.option.group, "roleId");
           column.dicData = res.data.data;
         });
-        // getDeptTree(tenantId).then(res => {
-        //   const column = this.findObject(this.option.group, "deptId");
-        //   column.dicData = res.data.data;
-        // });
+        getDeptTree(tenantId).then(res => {
+          const column = this.findObject(this.option.group, "deptId");
+          column.dicData = res.data.data;
+        });
         // getPostList(tenantId).then(res => {
         //   const column = this.findObject(this.option.group, "postId");
         //   column.dicData = res.data.data;
@@ -750,8 +750,7 @@
       rowSave(row, done, loading) {
         row['tenantId'] = "000000"
         row['userType'] = 1
-        row['deptId'] = '1123598813738675201'
-        // row.deptId = func.join(row.deptId);
+        row.deptId = func.join(row.deptId);
         row.roleId = func.join(row.roleId);
         // row.postId = func.join(row.postId);
         add(row).then(() => {
@@ -769,9 +768,8 @@
       },
       rowUpdate(row, index, done, loading) {
         row['tenantId'] = "000000"
-        row['deptId'] = '1123598813738675201'
         row['userType'] = 1
-        // row.deptId = func.join(row.deptId);
+        row.deptId = func.join(row.deptId);
         row.roleId = func.join(row.roleId);
         // row.postId = func.join(row.postId);
         update(row).then(() => {

--
Gitblit v1.9.3