diff --git a/src/components/app-header/app-header.vue b/src/components/app-header/app-header.vue
index cc1f4ef9..36f27068 100644
--- a/src/components/app-header/app-header.vue
+++ b/src/components/app-header/app-header.vue
@@ -107,7 +107,7 @@ export default {
},
isOnLine() {
return this.$store.state.gatewayState;
- }
+ },
},
watch: {
isMaxWindowSize(val) {
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 edea450e..9f094fff 100644
--- a/src/views/main_web/workspace/components/archive-view/index.vue
+++ b/src/views/main_web/workspace/components/archive-view/index.vue
@@ -56,6 +56,11 @@
@click.stop="authModalVisible = true"
>
交付并认证
+
+ 取消交付
@@ -247,6 +252,8 @@ export default {
this.fetchFolderFiles();
// 2. 查询历史提交记录
this.fetchArchiveHistory();
+
+ this.fetchReceiverInfo();
},
watch: {
authModalVisible(v) {
@@ -261,6 +268,9 @@ export default {
},
},
methods: {
+ cancelArchive() {
+ this.$emit('cancel');
+ },
isChildrenAllChecked(node) {
return recursionEvery(node.children, this.selectedKeyMap);
},
@@ -385,6 +395,7 @@ export default {
);
wrapErrorHint(res);
this.receiverInfo = firstCharToLowerCase(res.Data || {});
+ this.$emit('on-query-receiver-info', this.receiverInfo);
},
},
};
diff --git a/src/views/main_web/workspace/components/file-explorer/index.vue b/src/views/main_web/workspace/components/file-explorer/index.vue
index 07cd9e27..8a571394 100644
--- a/src/views/main_web/workspace/components/file-explorer/index.vue
+++ b/src/views/main_web/workspace/components/file-explorer/index.vue
@@ -861,6 +861,7 @@ export default {
if (v) {
this.selectedFileIdList = [];
}
+ this.$emit('select-mode-change', v);
},
isShowCommitJudgeWindow(val) {
// this.lookCoopTarget();
diff --git a/src/views/main_web/workspace/index.vue b/src/views/main_web/workspace/index.vue
index 873537e8..ce2bfc8e 100644
--- a/src/views/main_web/workspace/index.vue
+++ b/src/views/main_web/workspace/index.vue
@@ -11,7 +11,27 @@
:showRecycleBin="!workFlowVisible"
:onBackBtnClick="appHeaderBackBtnClick"
>
-
+
+
+
+
+
{{projectName}}
- 交付模板成果
+
@@ -88,8 +111,15 @@ export default {
viewType: 'file-explorer', // computed: file-explorer || archive-view
// 搜索关键字
searchKeywords: "",
+ selectMode: false,
+ receiverInfo: {},
};
},
+ watch: {
+ currentNodeFolder(data) {
+ console.log(data)
+ }
+ },
computed: {
appHeaderTitle() {
return this.workFlowVisible
@@ -118,6 +148,12 @@ export default {
this.fetchNodeFolders();
},
methods: {
+ onSelectModeChange(v) {
+ this.selectMode = v;
+ },
+ onQueryReceiverInfo(data) {
+ this.receiverInfo = data;
+ },
closeWorkFlow() {
this.workFlowVisible = false;
},
@@ -371,6 +407,26 @@ export default {
text-align: center;
}
}
+
+.app-header-left-content {
+ .left-content-title {
+ color: rgba(0, 0, 0, 1);
+ font-size: 20px;
+ margin-right: 24px;
+ }
+ .button-like {
+ position: relative;
+ top: -6px;
+ padding: 6px 8px;
+ margin-right: 16px;
+ color: rgba(143, 143, 143, 100);
+ font-size: 14px;
+ border-radius: 8px;
+ background-color: rgba(255, 255, 255, 1);
+ }
+}
+
+