Browse Source

右边文件夹编辑,左边一级文件夹重命名不刷新,公共下新建组织报错

liuQiang 2 years ago
parent
commit
4a539ed156

+ 11 - 3
src/views/department/MyFile.vue

@@ -238,6 +238,10 @@
                                 <img src="@/assets/images/collect.png" alt="" />
                                 <span class="shouzhi">收藏</span>
                             </div>
+                            <div class="menu_item" v-if="thisFolder.dirType ==='1' && clickRow.dirType === '2' && isDept" @click="upFirstFoler(null)">
+                                <img src="@/assets/images/notePencil.png" alt="" />
+                                <span class="shouzhi">编辑</span>
+                            </div>
                         </div>
                     </div>
                     <!-- 文件 -->
@@ -1517,9 +1521,12 @@ export default {
                 }
             }
         }
-        //点击收藏后刷新文件
-        const refreshFile = ()=>{
+        //刷新
+        const refreshFile = (left)=>{
             // console.log('ref',toRaw(thisFolder.value));
+            if(left){
+                leftNewFile.value = true
+            }
             if(toRaw(thisFolder.value).dirId && !leftNewFile.value){//如果点开了文件夹
             // console.log(111);
                folderClick()
@@ -1724,11 +1731,12 @@ export default {
         }
         //修改文件夹权限
         const upFirstFoler =async (item)=>{
+            oneOrTwo.value = item?1:0
             // console.log('upFirstFoler',item);
+            item = item || clickRow.value
             const res = await  myfile.getDir(item.dirId)
             console.log('upFirstFolerres = ',res);
             upFolderData.value = toRaw(res.data)
-            oneOrTwo.value = 1
             folderCase.value = true
         }
         const upBefore = (file)=>{

+ 6 - 3
src/views/department/components/createTasnsfer.vue

@@ -158,9 +158,12 @@ onMounted(async () => {
   // console.log('checkUser',checkUser);
   // console.log('allTreeData.value',allTreeData.value);
   //设置勾选项
-  const arr = checkUser.map(item => {
-    return item.userId
-  })
+  let arr = []
+  if(checkUser){
+    arr = checkUser.map(item => {
+       return item.userId
+     })
+  }
   backScreen.value = arr
   // 设置右侧列表数据
   chooseTagData.value = checkUser.map(item => {

+ 20 - 4
src/views/department/modalComponebts/CreateFloder.vue

@@ -202,7 +202,7 @@ export default {
                             "dirType":2,
                             "isEncrypt":"Y",
                             "encryptLevel":FolderRole.levelCode,
-                            "users":users.value,
+                            "users":thisType.dirType === "1"?boserForm.value.users:users.value,
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }
                         console.log('query',query);
@@ -215,8 +215,8 @@ export default {
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
                             "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null,
-                            "users":users.value,
-                            "dirRole":thisRole.length?thisRole.join(','):''
+                            "users":thisType.dirType === "1"?boserForm.value.users:users.value,
+                            "dirRole":thisType.dirType === "1"?boserForm.value.memberRoles.join(','):thisRole.join(',')
                         }
                     }
                     console.log('free0query',query);
@@ -244,7 +244,9 @@ export default {
                 })
                 return
             }
-            let query ={
+            let query  = {}
+            if(free === 1){
+                 query ={
                     "dirName": boserForm.value.dirName,
                     "parentId": drId - 0,
                     "spaceId": spId - 0,
@@ -255,6 +257,20 @@ export default {
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
                 }
+            }else{
+                 query ={
+                    "dirName": boserForm.value.dirName,
+                    "parentId": newdrid - 0,
+                    "spaceId": newspid - 0,
+                    'dirId':upFolderData.dirId,
+                    "dirType":thisType.dirType=='2'?'2':boserForm.value.dirType,
+                    "dirRole":boserForm.value.memberRoles.join(','),
+                    "users":boserForm.value.users,
+                    "isEncrypt":boserForm.value.isEncrypt,
+                    "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
+                }
+            }
+            
                 console.log('query',query);
                 documents.editFolerDocument(
                        query

+ 1 - 1
src/views/department/modalComponebts/FolderReName.vue

@@ -58,7 +58,7 @@ export default {
                 name: newName.value,
             }).then(res => {
                 if (res.code === 200) {
-                    props.getAllTop()
+                    props.getAllTop(true)
                     ElMessage({
                         message: '重命名成功',
                         type: "success"

+ 10 - 2
src/views/publicment/MyFile.vue

@@ -236,6 +236,10 @@
                                 <img src="@/assets/images/collect.png" alt="" />
                                 <span  class="shouzhi">收藏</span>
                             </div>
+                            <div class="menu_item" v-if="thisFolder.dirType ==='1' && clickRow.dirType === '2' && isDept" @click="upFirstFoler(null)">
+                                <img src="@/assets/images/notePencil.png" alt="" />
+                                <span class="shouzhi">编辑</span>
+                            </div>
                         </div>
                     </div>
                     <!-- 文件 -->
@@ -1535,8 +1539,11 @@ export default {
             }
         }
         //点击收藏后刷新文件
-        const refreshFile = ()=>{
+        const refreshFile = (left)=>{
             // console.log('ref',toRaw(thisFolder.value));
+            if(left){
+                leftNewFile.value = true
+            }
             if(toRaw(thisFolder.value).dirId && !leftNewFile.value){//如果点开了文件夹
             // console.log(111);
                folderClick()
@@ -1737,11 +1744,12 @@ export default {
         }
         //修改文件夹权限
         const upFirstFoler =async (item)=>{
+            oneOrTwo.value = item?1:0
         // console.log('upFirstFoler',item);
+            item = item || clickRow.value
             const res = await  myfile.getDir(item.dirId)
             console.log('upFirstFolerres = ',res);
             upFolderData.value = toRaw(res.data)
-            oneOrTwo.value = 1
             folderCase.value = true
         }
         const backTopPath = ()=>{

+ 6 - 3
src/views/publicment/components/createTasnsfer.vue

@@ -156,9 +156,12 @@ onMounted(async () => {
   // console.log('checkUser',checkUser);
   // console.log('allTreeData.value',allTreeData.value);
   //设置勾选项
-  const arr = checkUser.map(item => {
-    return item.userId
-  })
+  let arr = []
+  if(checkUser){
+    arr = checkUser.map(item => {
+       return item.userId
+     })
+  }
   backScreen.value = arr
   // 设置右侧列表数据
   chooseTagData.value = checkUser.map(item => {

+ 19 - 4
src/views/publicment/modalComponebts/CreateFloder.vue

@@ -201,7 +201,7 @@ export default {
                             "dirType":2,
                             "isEncrypt":"Y",
                             "encryptLevel":FolderRole.levelCode,
-                            "users":users.value,
+                            "users":thisType.dirType === "1"?boserForm.value.users:users.value,
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }
                         console.log('query',query);
@@ -214,8 +214,8 @@ export default {
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
                             "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null,
-                            "users":users.value,
-                            "dirRole":thisRole.length?thisRole.join(','):''
+                            "users":thisType.dirType === "1"?boserForm.value.users:users.value,
+                            "dirRole":thisType.dirType === "1"?boserForm.value.memberRoles.join(','):thisRole.join(',')
                         }
                     }
                     console.log('free0query',query);
@@ -244,7 +244,9 @@ export default {
                 })
                 return
             }
-            let query ={
+            let query  = {}
+            if(free === 1){
+                 query ={
                     "dirName": boserForm.value.dirName,
                     "parentId": drId - 0,
                     "spaceId": spId - 0,
@@ -255,6 +257,19 @@ export default {
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
                 }
+            }else{
+                 query ={
+                    "dirName": boserForm.value.dirName,
+                    "parentId": newdrid - 0,
+                    "spaceId": newspid - 0,
+                    'dirId':upFolderData.dirId,
+                    "dirType":thisType.dirType=='2'?'2':boserForm.value.dirType,
+                    "dirRole":boserForm.value.memberRoles.join(','),
+                    "users":boserForm.value.users,
+                    "isEncrypt":boserForm.value.isEncrypt,
+                    "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
+                }
+            }
                 console.log('query',query);
                 documents.editFolerDocument(
                        query

+ 1 - 1
src/views/publicment/modalComponebts/FolderReName.vue

@@ -58,7 +58,7 @@ export default {
                 name: newName.value,
             }).then(res => {
                 if (res.code === 200) {
-                    props.getAllTop()
+                    props.getAllTop(true)
                     ElMessage({
                         message: '重命名成功',
                         type: "success"