scorpio před 2 roky
rodič
revize
2ee794db49

+ 6 - 0
src/api/project/index.js

@@ -127,5 +127,11 @@ export default {
    */
   doneHistory (params) {
     return fetch('/blade-project-manage-v2/folder/v2/history', params)
+  },
+  /**
+   * 是否有权限创建文件夹
+   */
+  queryCreateFolder (params) {
+    return fetch('/blade-project-manage-v2/folder/v2/queryFolderGrant', params)
   }
 }

+ 1 - 1
src/layout/top.vue

@@ -134,7 +134,7 @@ export default {
       ],
       params: {
         keyword: '',
-        searchType: 'all',
+        searchType: 'project',
         pages: 1,
         size: 10
 

+ 17 - 5
src/views/home/component/folder_info.vue

@@ -37,9 +37,9 @@
         </div>
       </div>
       <div class="flex flex-center mr-5 " style="flex: 1.2">
-        <base-button v-if='permissions.permissions.home_folder_authorize' class="mr-20" icon="User" title="批量授权"
+        <base-button v-if='canCreateFolder' class="mr-20" icon="User" title="批量授权"
                      type="0" @click='authorizeShow = true'/>
-        <base-button v-if='permissions.permissions.home_folder_new' icon="Plus" title="添加文件夹" type="0"
+        <base-button v-if='canCreateFolder' icon="Plus" title="添加文件夹" type="0"
                      @click="addShow = true"/>
         <!--        <base-button v-if='permissions.permissions.home_folders_apply' class="ml-10" icon="User" title="批量授权"/>-->
       </div>
@@ -67,7 +67,7 @@
                 style="width: 100%"
             />
           </el-form-item>
-          <el-form-item label="文件夹类型2">
+          <el-form-item label="文件夹类型">
             <el-select
                 v-model="dictKey"
                 clearable
@@ -108,7 +108,7 @@ import basicCurd from '@/components/basic-curd/index.vue'
 
 export default {
   name: 'right2',
-  components: { baseButton, folderList, authorize, basicCurd },
+  components: { baseButton, folderList, authorize },
   props: {
     data: {
       type: Object,
@@ -190,14 +190,26 @@ export default {
             prop: 'updateTime'
           }
         ]
-      }
+      },
+      canCreateFolder: false
     }
   },
   created () {
     this.projectId = this.$route.query.id
     this.getFolderList()
+    this.queryCreateFolder()
   },
   methods: {
+    queryCreateFolder () {
+      this.$api.project.queryCreateFolder({ projectId: this.projectId }).then(res => {
+        if (res.code === 200) {
+          console.log(res)
+          this.canCreateFolder = res.data.status === 2
+        } else {
+          console.log(res)
+        }
+      })
+    },
     getDict () {
       this.$api.project.folderType({ stageId: this.projectStageId }).then(res => {
         if (res.code === 200) {

+ 1 - 1
src/views/home/component/folder_list.vue

@@ -367,7 +367,7 @@ export default {
         return
       }
       const tmp = { projectId: this.projectId, ownerId: this.ownerId }
-      const item = { startTime: this.applyTime[0], endTime: this.applyTime[1], folderId: this.currentFolder.fileFolderId }
+      const item = { startTime: this.applyTime[0], endTime: this.applyTime[1], folderId: this.currentFolder.id }
       const list = [item]
       this.$api.project.apply(Object.assign(tmp, { folders: list })).then(res => {
         if (res.code === 200) {