修改生产树

src/util/index.js

@@ -123,4 +123,30 @@ export const downloadFile = (url, fileName) => {
   }else{
     return false
   }
+}
+/**
+ *遍历树
+ **/
+ export const assembleTree = (tree) => {
+  if(!tree){
+    return 
+  }
+  let list = {}
+  const assemble = (data,parentList) => {
+    parentList = parentList?parentList:[]
+    data.map(ele => {
+      let newparentList = JSON.parse(JSON.stringify(parentList))
+      newparentList.push(ele.id)
+      if(ele.children){
+        list[ele.id] = newparentList
+        return assemble(ele.children,newparentList)
+      }else{
+        list[ele.id] = newparentList
+        return {[ele.id]:newparentList}
+      }
+    })
+    return list
+  }
+  let treeList = assemble(tree)
+  return treeList
 }

src/view/organization/list.vue

@@ -144,7 +144,7 @@ import { useRoute } from "vue-router";
 import seeInfo from "./seeInfo.vue";
 import {PHONE} from '@/constant/REG'
 import { getApp } from "@/app";
-import { getRoke } from '@/util'
+import { getRoke,assembleTree } from '@/util'
 import {
   getTreeselect,
   delTreeitem,
@@ -243,11 +243,9 @@ export default {
       if (val.id) {
         let treeList = assembleTree(data.treedata)
         let superiorValue = treeList && treeList[val.id] //val.ancestors && val.ancestors.split(',').slice(1)
-        console.log('superiorValue',superiorValue,treeList,val.id);
         superiorValue.pop()
         data.detailType = "编辑";
         data.superiorValue = superiorValue
-        console.log('superiorValue',data.superiorValue);
         data.detail = {
           ...val,
           deptType:val.deptType.toString()
@@ -258,7 +256,6 @@ export default {
         data.superiorValue = [];
         data.detail = {};
       }
-      console.log("insertProject", val,data.superiorValue);
       data.show = true;
     };
     const handleChange = (val) => {
@@ -307,38 +304,7 @@ export default {
       // getApp().$ref.treeBox.setCurrentKey(user.info.id)
     };
     
-    const assembleTree = (tree) => {
-      if(!tree){
-        return 
-      }
-      let list = {}
-      const assemble = (data,parentList) => {
-        parentList = parentList?parentList:[]
-        data.map(ele => {
-          let newparentList = JSON.parse(JSON.stringify(parentList))
-          console.log('parentList',parentList,data,ele.id);
-          newparentList.push(ele.id)
-          if(ele.children){
-            list[ele.id] = newparentList
-            return assemble(ele.children,newparentList)
-          }else{
-            list[ele.id] = newparentList
-            return {[ele.id]:newparentList}
-          }
-        })
-        return list
-      }
-      let treeList = assemble(tree)
-      // .map(el => {
-      //   treeList = {
-      //     ...treeList,
-      //     ...el
-      //   }
-      //   console.log('treeList',treeList,el);
-      // })
-      console.log('treeList',treeList);
-      return treeList
-    }
+
     onMounted(async () => {
       console.log(myCascader)
       getTreedata();

src/view/user/index.vue

@@ -187,7 +187,7 @@ import user from "@/state/user";
 import axios from "axios";
 import {PHONE,EPSW} from '@/constant/REG'
 import { ADMIN_USER_ID } from "@/constant";
-import { getRoke } from '@/util'
+import { getRoke,assembleTree } from '@/util'
 
 import { getTreeselect,getUserList, updateUser, deleUser, changeUserStatus,userAdd,userEdit } from "@/request/config";
 import { getApp } from "../../app";
@@ -217,15 +217,13 @@ export default {
       if (!row.status) {
         return getApp().$message.error("请先启用用户", "提示");
       }
-      // let superiorValue = val.ancestors && val.ancestors.split(',').slice(1)
-      let deptIdList = row.deptIdList&&row.deptIdList.split(',') || []
-      deptIdList.push(row.deptId)
+      let treeList = assembleTree(data.treedata)
+      let superiorValue = treeList && treeList[row.deptId] //val.ancestors && val.ancestors.split(',').slice(1)
       data.editData = {
         editName:row.nickName,
         roleId:row.roleId,
-        deptIdList:deptIdList,
+        deptIdList:superiorValue,
       }
-      console.log('updateInfo',row,data.editData)
       data.relationDeptId = row.deptId
       operRoleId.value = row.roleId;
       state.oper.value.readyUpdate(row);
@@ -282,7 +280,8 @@ export default {
       ADMIN_USER_ID,
       roleKey,
       newAddclick,
-      getRoke
+      getRoke,
+      assembleTree
     };
   },
   methods: {