Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/add.vue

src/api/project-manage/index.js

@@ -55,13 +55,18 @@ export const getProjectCheckProcess = (projectId) => {
     method: "get"
   });
 };
-export const getImplementationAttachment = (projectId) => {
+export const getImplementationAttachment = (params) => {
   return request({
-    url: '/workflow/mosr/project/implementation/tags',
+    url: '/workflow/mosr/project/implementation/attachments',
     method: "get",
-    params:{
-      projectId:projectId
-    }
+    params:params
+  });
+};
+export const uploadAttachment= (data) => {
+  return request({
+    url: '/workflow/mosr/project/implementation/upload',
+    method: "post",
+    data: data
   });
 };
 export const addLedger = (data) => {
@@ -71,6 +76,16 @@ export const addLedger = (data) => {
     data: data
   });
 };
+
+export const getTags = (projectId) => {
+  return request({
+    url: '/workflow/mosr/project/implementation/tags',
+    method: "get",
+    params:{
+      projectId:projectId
+    }
+  });
+};
 //项目归档
 export const getConclusionDetail = (ProjectId) => {
   return request({
@@ -99,15 +114,3 @@ export const getProjectConclusionProcess = () => {
     method: "get"
   });
 };
-
-//文件查询
-export const searchFile = (targetId,tag) => {
-  return request({
-    url: '/workflow/process/file/query',
-    method: "get",
-    params:{
-      targetId:targetId,
-      tag:tag
-    }
-  });
-};