From 085fa2fb257e9f11f8f6d34bf12e2dc281c36b4d Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 09 二月 2023 11:28:21 +0800
Subject: [PATCH] 2023/2/9 肖辉 修改部门管理

---
 src/views/systemSetting/baseSetting/department/updateUser/index.vue |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 05735a8..c5ab3b6 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -129,13 +129,14 @@
     this.checkedList.forEach((e) => {
       this.checkedUser.push(e.userId);
     });
+    console.log(this.checkedUser)
     this.$axios({
       method: "get",
       url: "sccg/depart/tree",
     }).then((res) => {
       that.departList = res.data;
     });
-    this.getUserList();
+    this.getUserList(this.user.id);
     // 鑾峰彇閮ㄩ棬绫诲瀷
     this.getDepartType();
   },
@@ -148,12 +149,12 @@
           checkedList.forEach((item) => {
             arr.push({ leader: item.leader, userId: item.id ? item.id : item.userId });
           });
-          if (arr.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '璇烽�夋嫨閮ㄩ棬浜哄憳',
-            })
-          } else {
+          // if (arr.length === 0) {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '璇烽�夋嫨閮ㄩ棬浜哄憳',
+          //   })
+          // } else {
             this.$axios
               .post("sccg/depart/update", {
                 id: user.id,
@@ -161,6 +162,7 @@
                 parentId: user.parentId === '鏆傛棤涓婄骇閮ㄩ棬' ? 0 : user.parentId,
                 departDes: user.departDes,
                 departManagerList: arr,
+                departType: user.departType
               })
               .then((res) => {
                 this.$message({
@@ -170,7 +172,7 @@
                 this.$emit("changeDialog", { flag: false });
                 this.getDepartList();
               });
-          }
+          // }
         } else {
           return false;
         }
@@ -191,11 +193,11 @@
     },
 
     // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
-    getUserList() {
+    getUserList(id) {
       // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
-      this.$axios.get(`sccg/admin/list`).then((res) => {
+      this.$axios.get(`/sccg/depart/query_surplus_exist_user?id=`+id).then((res) => {
         if (res.code === 200) {
-          this.userList = res.data.records;
+          this.userList = res.data;
         }
       });
     },
@@ -223,13 +225,13 @@
 <style lang="scss" scoped>
 .updateUser {
   border-radius: 1px;
-  background-color: #09152f;
+  // background-color: #09152f;
 
   main {
     // border: 1px solid #fff;
     text-align: left;
     padding: 0 55px;
-    background-color: #09152f;
+    // background-color: #09152f;
     padding-bottom: 50px;
 
     // .mainTitle {
@@ -278,12 +280,12 @@
 }
 
 .updateUser::v-deep .el-form-item__label {
-  color: #4b9bb7;
+  // color: #4b9bb7;
 }
 
 .updateUser::v-deep .el-input__inner {
-  background-color: #09152f;
-  border: 1px solid #17324c;
+  // background-color: #09152f;
+  // border: 1px solid #17324c;
 }
 
 .addPerson {
@@ -322,15 +324,16 @@
   right: 0;
 
   .box-card {
-    max-height: 200px;
+    min-height: 240px;
+    max-height: 260px;
     overflow: hidden;
-    background-color: #09152f;
+    // background-color: #09152f;
     position: relative;
     max-width: 220px;
 
     .scrollWrap {
       overflow: scroll;
-      height: 160px;
+      height: 180px;
       position: relative;
       color: #4b9bb7;
 
@@ -357,8 +360,8 @@
       top: 77px;
       right: 20px;
       width: 20px;
-      height: 160px;
-      background-color: #09152f;
+      height: 180px;
+      // background-color: #09152f;
     }
 
     .item {

--
Gitblit v1.8.0