选择人员 模板编辑

src/api/user/userTree.js

@@ -7,6 +7,13 @@ function getUserTree(data) {
         params: data
     })
 }
+// 根据Id获取用户树
+function getUserTreeById(id) {
+    return request({
+        url: `/system/user/tree/${id}`,
+        method: "get",
+    })
+}
 // 根据id获取用户信息
 function getUserPofile(data) {
     return request({
@@ -21,8 +28,17 @@ function getMentUserTree() {
         method: "get",
     })
 }
+// 根据Id获取本部门下用户树
+function getMentUserTreeById(id) {
+    return request({
+        url: `/system/user/tree4dept/${id}`,
+        method: "get",
+    })
+}
 export default {
     getUserTree,
     getUserPofile,
-    getMentUserTree
+    getMentUserTree,
+    getMentUserTreeById,
+    getUserTreeById
 }

src/views/biz/template/index.vue

@@ -126,7 +126,7 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="templateRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="模板类型" prop="tmplType">
-          <el-select v-model="form.tmplType" placeholder="请选择模板类型">
+          <el-select v-model="form.tmplType" disabled placeholder="请选择模板类型">
            <el-option value="word" label="文档"/>
            <el-option value="excel" label="表格"/>
            <el-option value="ppt" label="演示"/>

src/views/department/components/createTasnsfer.vue

@@ -45,6 +45,7 @@ const chooseTagData = ref([]);
 const lastPeople = ref(false);
 const openTree = ref([]);
 const backScreen = ref(props.checkUser);
+const thisFoler = ref(props.upFolderData);
 const allTreeProps = {
   label: "label",
   children: "children",
@@ -64,6 +65,10 @@ const props = defineProps({
     required: true,
     default: () => [],
   },
+  upFolderData: {
+    type: Object,
+    default: () => {},
+  },
 });
 watch(
   () => props.openTrans,
@@ -147,25 +152,44 @@ function allTreeChange(e) {
 }
 // 获取用户树
 function getAllUser() {
-  userTree.getMentUserTree({}).then((res) => {
-    console.log("userTree", res);
-    allTreeData.value = [res];
-    console.log('open', open.value);
-    userTree.getMentUserTree({}).then((res) => {
-      allTreeData.value = [res];
-      // 递归函数来获取所有节点的 id
-      function getAllNodeIds(nodes) {
-        nodes.forEach((node) => {
-          openTree.value.push(node.id);
-          if (node.children && node.children.length > 0) {
-            getAllNodeIds(node.children);
+  if(thisFoler.value){
+    userTree.getMentUserTreeById(thisFoler.value.dirId).then((res) => {
+        allTreeData.value = [res];
+        userTree.getMentUserTreeById(thisFoler.value.dirId).then((res) => {
+          allTreeData.value = [res];
+          // 递归函数来获取所有节点的 id
+          function getAllNodeIds(nodes) {
+            nodes.forEach((node) => {
+              openTree.value.push(node.id);
+              if (node.children && node.children.length > 0) {
+                getAllNodeIds(node.children);
+              }
+            });
           }
+          // 调用递归函数获取所有节点的 id
+          getAllNodeIds(allTreeData.value);
         });
-      }
-      // 调用递归函数获取所有节点的 id
-      getAllNodeIds(allTreeData.value);
-    });
-  });
+      })
+  }else{
+    userTree.getMentUserTree().then((res) => {
+        allTreeData.value = [res];
+        userTree.getMentUserTree().then((res) => {
+          allTreeData.value = [res];
+          // 递归函数来获取所有节点的 id
+          function getAllNodeIds(nodes) {
+            nodes.forEach((node) => {
+              openTree.value.push(node.id);
+              if (node.children && node.children.length > 0) {
+                getAllNodeIds(node.children);
+              }
+            });
+          }
+          // 调用递归函数获取所有节点的 id
+          getAllNodeIds(allTreeData.value);
+        });
+      })
+  }
+  ;
 }
 onMounted(async () => {
   getAllUser();

src/views/department/modalComponebts/CreateFloder.vue

@@ -38,7 +38,7 @@
                             </el-form-item>
                             <el-form-item label="选择成员" v-if="boserForm.dirType === 2">
                             </el-form-item>
-                            <CreateTasnsfer v-if="boserForm.dirType === 2" :checkUser="upFolderData?upFolderData.users:null" @setUsers="setUsers" :openTrans="openTrans"></CreateTasnsfer>
+                            <CreateTasnsfer v-if="boserForm.dirType === 2" :checkUser="upFolderData?upFolderData.users:null" @setUsers="setUsers" :upFolderData="upFolderData" :openTrans="openTrans"></CreateTasnsfer>
                         </template>
                    </template>
                 </el-form>

src/views/department/modalComponebts/Transfer.vue

@@ -77,12 +77,18 @@ export default {
             type: Boolean,
             required: true
         },
+        newDirId: {
+            type: Number,
+            required: true
+        },
     },
     setup(props, { emit }) {
         let { backToFather, sureBackFather } = toRefs(props)
         let result = props.thanks
         let dees = props.clickRowId
         let feeh = props.workOrEdit
+        let dirId = props.newDirId
+        console.log('dirId',dirId);
         let isNewMenus = props.isNewMenu
         let transferModals = ref(false)
         let allTreeData = ref([])
@@ -304,6 +310,7 @@ export default {
             treeRef,
             have,
             filterNode,
+            dirId
         }
     }
 }

src/views/publicment/components/createTasnsfer.vue

@@ -45,6 +45,7 @@ const chooseTagData = ref([]);
 const lastPeople = ref(false);
 const openTree = ref([]);
 const backScreen = ref(props.checkUser);
+const thisFoler = ref(props.upFolderData);
 const allTreeProps = {
   label: "label",
   children: "children",
@@ -64,6 +65,10 @@ const props = defineProps({
     required: true,
     default: () => [],
   },
+  upFolderData: {
+    type: Object,
+    default: () => {},
+  },
 });
 watch(
   () => props.openTrans,
@@ -144,10 +149,27 @@ function allTreeChange(e) {
 }
 // 获取用户树
 function getAllUser() {
-  userTree.getUserTree({}).then((res) => {
-    console.log("userTree", res);
+  if(thisFoler.value){
+    userTree.getUserTreeById(thisFoler.value.dirId).then((res) => {
+    allTreeData.value = [res];
+    userTree.getUserTreeById(thisFoler.value.dirId).then((res) => {
+      allTreeData.value = [res];
+      // 递归函数来获取所有节点的 id
+      function getAllNodeIds(nodes) {
+        nodes.forEach((node) => {
+          openTree.value.push(node.id);
+          if (node.children && node.children.length > 0) {
+            getAllNodeIds(node.children);
+          }
+        });
+      }
+      // 调用递归函数获取所有节点的 id
+      getAllNodeIds(allTreeData.value);
+    });
+  });
+  }else{
+     userTree.getUserTree({}).then((res) => {
     allTreeData.value = [res];
-    console.log('open', open.value);
     userTree.getUserTree({}).then((res) => {
       allTreeData.value = [res];
       // 递归函数来获取所有节点的 id
@@ -163,6 +185,8 @@ function getAllUser() {
       getAllNodeIds(allTreeData.value);
     });
   });
+  }
+ 
 }
 onMounted(async () => {
   getAllUser();

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -38,7 +38,7 @@
                             </el-form-item>
                             <el-form-item label="选择成员" v-if="boserForm.dirType === 2">
                             </el-form-item>
-                            <CreateTasnsfer v-if="boserForm.dirType === 2" :checkUser="upFolderData?upFolderData.users:null" @setUsers="setUsers" :openTrans="openTrans"></CreateTasnsfer>
+                            <CreateTasnsfer v-if="boserForm.dirType === 2" :checkUser="upFolderData?upFolderData.users:null" @setUsers="setUsers" :upFolderData="upFolderData" :openTrans="openTrans"></CreateTasnsfer>
                         </template>
                    </template>
                 </el-form>