From 59c61641427fffc4a23a825d08dc2dad26165c7e Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 1 Apr 2024 13:50:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/companyAdmin/companyDiagram.vue | 42 ++++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 8f7877df..7bfec9aa 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -122,7 +122,7 @@
               width="420px"
             >
               <template slot-scope="scope">
-                <div class="tableBtns">
+                <div class="operation-style">
                   <div
                     v-if="!treeSelectData.projectName"
                     @click="configAccountFn(scope.row, 'yi')"
@@ -138,10 +138,6 @@
                   >
                     <el-button size="small" type="primary">上传账号</el-button>
                   </div>
-                  <div @click="editGroup(scope.row)" class="operationText">
-                    <i class="el-icon-s-operation"></i>
-                    <span>调整组织</span>
-                  </div>
                   <div @click="editAccountFn(scope.row)" class="operationText">
                     <img
                       src="@/assets/images/icon-edit.png"
@@ -185,9 +181,9 @@
               :label="'岗位职责'"
               align="center"
             ></el-table-column>
-            <el-table-column :label="$t('message.deviceManage.operation')">
+            <el-table-column :label="$t('message.deviceManage.operation')" align="center">
               <template slot-scope="scope">
-                <div class="tableBtns">
+                <div class="operation-style">
                   <div @click="editJobFn(scope.row)" class="operationText">
                     <img
                       src="@/assets/images/icon-edit.png"
@@ -241,6 +237,7 @@
             </el-table-column>
             <el-table-column label="授权配置" align="center">
               <template slot-scope="scope">
+                <div class="operation-style">
                   <div
                     @click="relativeGroupFn(scope.row)"
                     class="operationText"
@@ -261,6 +258,7 @@
                     />
                     <span>删除记录</span>
                   </div>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -284,7 +282,6 @@
               label="密码"
               align="center"
             ></el-table-column>
-            </el-table-column>
             <el-table-column
               prop="email"
               label="电子邮箱"
@@ -1142,7 +1139,7 @@
               :check-on-click-node="false"
               show-checkbox
               :props="defaultProps"
-              node-key="itemId"
+              node-key="sn"
               ref="groupTree"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -3090,7 +3087,12 @@ export default {
     },
     // 根据条件获取需要选中的节点keys
     getRelativeKeys(arr){
-      let keysArr = arr;
+      let keysArr = [];
+      arr.map(item => {
+        if(item.isProjectSn && !item.hasSubList){
+          keysArr.push(item.sn)
+        }
+      })
       return keysArr;
     },
     // 关联组织
@@ -3100,8 +3102,8 @@ export default {
     },
     transformGroup(){
       let item = this.selectRowObj;
-      const checked = this.$refs.relativeTree.getCheckedNodes();
-      const halfChecked = this.$refs.relativeTree.getHalfCheckedNodes();
+      const checked = this.$refs.groupTree.getCheckedNodes();
+      const halfChecked = this.$refs.groupTree.getHalfCheckedNodes();
       const checkedArr = this.transfrom(checked);
       const halfCheckedArr = this.transfrom(halfChecked);
       const concatArr = checkedArr.concat(halfCheckedArr);
@@ -3116,7 +3118,7 @@ export default {
         }
       })
       this.$confirm(
-        `账号{${item.account}}审批通过后将会发送【注册成功提醒】到注册人邮箱!`,
+        `账号{${item.account}}将调整组织，确认继续？`,
         this.$t("message.companyDiagram.Tips"),
         {
           confirmButtonText: this.$t(
@@ -3126,11 +3128,11 @@ export default {
           type: "warning",
         }
       ).then(() => {
-        userAuditApi({ id: item.id, approvalProcess:2, companySns: [...companySnArr].join(','), projectSns: [...projectSnArr].join(',') }).then((res) => {
+        updateUserManagerApi({ userId: item.userId, companySns: [...companySnArr].join(','), projectSns: [...projectSnArr].join(',') }).then((res) => {
           if(res.success){
             this.$message.success("调整完成");
             this.editGroupDialog = false;
-            this.getUserAuditListApiFunc();
+            this.getUserManageListApi();
           }
         });
       });
@@ -3214,6 +3216,7 @@ export default {
     },
     // 显示调整组织弹框
     async editGroup(row) {
+      this.selectRowObj = row;
       this.editGroupDialog = true;
       // 打开弹窗时调用上面的接口勾选
       const res = await getSelectedGroupApi({ userId: row.userId });
@@ -3283,7 +3286,11 @@ export default {
         }
       ).then(() => {
         deleteSystemUserApi({ id: item.userId }).then((res) => {
-          this.getAccountList();
+          if(this.tabActiveName == 'first'){
+            this.getAccountList();
+          } else if(this.tabActiveName == 'four'){
+            this.getUserManageListApi();
+          }
           this.$message.success(
             this.$t("message.companyDiagram.deleteSuccess")
           ); //删除成功!
@@ -3815,6 +3822,9 @@ export default {
 .operation-style{
   .flex();
   justify-content: center;
+  .operationText:not(:last-child){
+    margin-right: 10px;
+  }
 }
 .add {
   display: flex;