From 343f6d1b800ea14eb6af331c316e569ee2e2f067 Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Thu, 25 Mar 2021 18:34:25 +0800 Subject: [PATCH] update --- src/utils/request.js | 1 + .../components/archive-view/index.vue | 391 ++++++++++++++++-- .../components/archive-view/item-list.vue | 31 +- .../archive-view/list-file-item.vue | 64 ++- .../archive-view/list-folder-item.vue | 131 +++++- src/views/main_web/workspace/index.vue | 1 + src/views/main_web/workspace/service.js | 1 + 7 files changed, 560 insertions(+), 60 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index ea872937..5296b5a6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -137,6 +137,7 @@ function mapApiPathToFullPath(path) { case "file/updateProjArchiveHistory": case "templateCompany/addTemplateCompany": case "project/addProjectGobalConfig": + case 'file/submitDeliverables': // case 'template/deleteTemplateNodeModelFile': method = 'POST'; break; diff --git a/src/views/main_web/workspace/components/archive-view/index.vue b/src/views/main_web/workspace/components/archive-view/index.vue index cc1ef375..1554d35f 100644 --- a/src/views/main_web/workspace/components/archive-view/index.vue +++ b/src/views/main_web/workspace/components/archive-view/index.vue @@ -2,11 +2,25 @@
从成果中选择交付物
-
查看接收方消息
+
查看接收方消息
-
显示所有勾选文件(xx/xx)
-
节点名称
+
+ 显示所有勾选文件{{selectedKeyCount ? ` (${selectedKeyCount}/${fileTotalCount})`:''}} +
+
+ {{folder.folderName}} +
{{commit.createTime | formatTime}}
@@ -22,32 +37,130 @@
- 点击认证并交付所有勾选文件 + 点击认证并交付所有勾选文件
由工作成果提交的文件
版本号
-
种类
+
文件类型
创建人
提交时间
操作
- +
+ + + + + + + +
+ +
关闭
+
+
+
+
企业名称:
+
+
+
+
项目名称:
+
+
+
+
关联模板名称:
+
+
+
+
对方项目负责人:
+
+
+
+
对接模板节点:
+
+
+
+
对接节点负责人:
+
+
+
+
+
\ No newline at end of file diff --git a/src/views/main_web/workspace/components/archive-view/item-list.vue b/src/views/main_web/workspace/components/archive-view/item-list.vue index 59a17589..82839db2 100644 --- a/src/views/main_web/workspace/components/archive-view/item-list.vue +++ b/src/views/main_web/workspace/components/archive-view/item-list.vue @@ -1,15 +1,40 @@ - \ No newline at end of file diff --git a/src/views/main_web/workspace/components/archive-view/list-file-item.vue b/src/views/main_web/workspace/components/archive-view/list-file-item.vue index f98bc76b..4fa946ff 100644 --- a/src/views/main_web/workspace/components/archive-view/list-file-item.vue +++ b/src/views/main_web/workspace/components/archive-view/list-file-item.vue @@ -1,27 +1,68 @@ + + \ No newline at end of file diff --git a/src/views/main_web/workspace/index.vue b/src/views/main_web/workspace/index.vue index e9ae749e..3bb8be49 100644 --- a/src/views/main_web/workspace/index.vue +++ b/src/views/main_web/workspace/index.vue @@ -54,6 +54,7 @@ v-show="!workFlowVisible" v-if="viewType === 'archive-view'" :currentNodeFolder="currentNodeFolder" + :projectId="projectId" /> diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js index 79cfeb28..40f064e1 100644 --- a/src/views/main_web/workspace/service.js +++ b/src/views/main_web/workspace/service.js @@ -75,6 +75,7 @@ export async function fetchFolderFileList(folderId, userId, commonFolderId) { folder: folderList, folderMap, file: fileList, + deliverables: (data.deliverables || []).map(firstCharToLowerCase), // myFile: (data.myFile || []).map(injectFileBasicValue), // workFile: (data.workFile || []).map(injectFileBasicValue), coordinationFiles: (data.coordinationFiles || []).map(firstCharToLowerCase),