Merge pull request 'master' (#870) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/870

src/api/project-manage/attachment.js

@@ -8,6 +8,13 @@ export const searchFileList = (params) => {
         params: params
     });
 };
+export const searchAllFileList = (params) => {
+    return request({
+        url: '/workflow/mosr/attachment/all',
+        method: "get",
+        params: params
+    });
+};
 export const uploadFileList = (data) => {
     return request({
         url: '/workflow/mosr/attachment/upload',

src/views/project-management/filing/attachment.vue

@@ -12,14 +12,11 @@
 </template>
 
 <script setup lang="jsx">
-import {searchFileList} from "@/api/project-manage/attachment.js";
+import {searchFileList,searchAllFileList} from "@/api/project-manage/attachment.js";
 import {ElNotification} from "element-plus";
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
-
-
 import {useCacheStore} from '@/stores/cache.js'
-
 import {toThousands} from '@/utils/changePrice.js'
 const cacheStore = useCacheStore()
 const route = useRoute()
@@ -260,7 +257,7 @@ const baseForm = ref()
 const paneList = ref([
   {
     label: '全部',
-    name: '111'
+    name: 'all'
   },
   {
     label: '需求征集',
@@ -329,12 +326,20 @@ const handleClick = (tab) => {
 }
 
 const search = async (param) => {
-  param.targetId = projectId.value
+  if( activeName.value=='all'){
-  param.targetState = activeName.value
+    param.targetId = projectId.value
-  searchFileList(param).then(res => {
+    searchAllFileList(param).then(res => {
-    loading.value = false
+      loading.value = false
-    changeFileList(res)
+      changeFileList(res)
-  })
+    })
+  }else {
+    param.targetId = projectId.value
+    param.targetState = activeName.value
+    searchFileList(param).then(res => {
+      loading.value = false
+      changeFileList(res)
+    })
+  }
 }
 
 const changeFileList = (res) => {