diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 928514b..de4098d 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -82,3 +82,11 @@ export const deleteDemand = (id) => { method: "delete" }); }; +//需求征集附件列表(归档) +export const getRequirementAttachment = (params) => { + return request({ + url: '/workflow/mosr/requirement/attachments', + method: "get", + params:params + }); +}; diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js index 4ac08f9..d746e48 100644 --- a/src/api/project-manage/index.js +++ b/src/api/project-manage/index.js @@ -27,6 +27,13 @@ export const resubmitApply = (data) => { data: data }); }; +export const getInitiationAttachment = (params) => { + return request({ + url: '/workflow/mosr/project/approval/attachments', + method: "get", + params:params + }); +}; //项目实施 export const getCheckDetail = (projectId) => { return request({ @@ -112,3 +119,10 @@ export const getProjectConclusionProcess = () => { method: "get" }); }; +export const getFilingAttachment = (params) => { + return request({ + url: '/workflow/mosr/project/filing/attachments', + method: "get", + params:params + }); +}; diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 765e88f..8709334 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -33,7 +33,7 @@ + + diff --git a/src/components/TagAndFileUpload.vue b/src/components/TagAndFileUpload.vue index 5b2289a..d29dac5 100644 --- a/src/components/TagAndFileUpload.vue +++ b/src/components/TagAndFileUpload.vue @@ -2,8 +2,8 @@ - - + + handleDelete(row), type: 'primary'}) // } - // if (buttons.has("report")) { + if (buttons.has("report")) { btn.push({label: '需求上报', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) - // } + } return (
{ diff --git a/src/views/project-demand/requirement/upload.vue b/src/views/project-demand/requirement/upload.vue new file mode 100644 index 0000000..6c0bff8 --- /dev/null +++ b/src/views/project-demand/requirement/upload.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js index 3baa2ef..531c4a4 100644 --- a/src/views/project-demand/summary/api/index.js +++ b/src/views/project-demand/summary/api/index.js @@ -38,3 +38,11 @@ export const resubmitReported = (data) => { data: data }); }; + +export const getCollectAttachment = (params) => { + return request({ + url: '/workflow/mosr/requirement/collect/attachments', + method: "get", + params:params + }); +}; diff --git a/src/views/project-demand/summary/upload.vue b/src/views/project-demand/summary/upload.vue new file mode 100644 index 0000000..6c0bff8 --- /dev/null +++ b/src/views/project-demand/summary/upload.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue index 0752f87..ebda94b 100644 --- a/src/views/project-management/filing/attachment.vue +++ b/src/views/project-management/filing/attachment.vue @@ -1,111 +1,204 @@ - diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 4cb549a..d72753c 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -207,9 +207,9 @@ const tableConfig = reactive({ if (buttons.has("details")) { btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'}) } - if (buttons.has("attachments")) { + // if (buttons.has("attachments")) { btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'}) - } + // } if (buttons.has("entry")) { btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'}) } @@ -265,8 +265,8 @@ const handleAttachment = (row) => { router.push({ name: 'Filing/attachment', query: { - id: row.requirementId, - projectId: row.projectId + id: row.projectId, + requirementId:row.requirementId } }) } diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue new file mode 100644 index 0000000..6c0bff8 --- /dev/null +++ b/src/views/project-management/filing/upload.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue index b0a6f48..88e2215 100644 --- a/src/views/project-management/implementation/attachment.vue +++ b/src/views/project-management/implementation/attachment.vue @@ -1,7 +1,7 @@