From 1bfc50508bbb657bd135f6608096e7912ca1d966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Sat, 8 Feb 2025 14:29:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/smartExcel/cpts/excel-info.vue | 1 + .../modules/base/smartExcel/cpts/excel-summary.vue | 6 ++++-- .../modules/base/smartExcel/cpts/excel-view.vue | 14 ++++++++++---- .../modules/base/smartExcel/cpts/filling-info.vue | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index bf741fcca..dcad6f170 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-info.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue @@ -182,6 +182,7 @@ export default { ...mapGetters(['clientHeight', 'resolution']), }, props: { + taskId: { type: String, default: "" diff --git a/src/views/modules/base/smartExcel/cpts/excel-summary.vue b/src/views/modules/base/smartExcel/cpts/excel-summary.vue index ee2ed3b56..a96195d85 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-summary.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-summary.vue @@ -82,14 +82,16 @@ export default { this.$emit('close') }, handleClickShowView(val){ - const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId } = val; + const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = val; this.$store.state.sidebarFold = true; this.showView = true; this.sheetTotal = false this.workbookId = val.taskId; this.userId = val.userId; this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction}; - this.mergeObj = {subWorkBookId,workBookId } + this.mergeObj = {subWorkBookId,workBookId,taskStateName } + this.taskStateName=val.taskStateName + }, handleClickShowViewAll(val){ this.$store.state.sidebarFold = true; diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index d5624b46d..79094db7f 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -25,9 +25,9 @@
- 驳回重提 - 审核存档 - 保存 + 驳回重提 + 审核存档 + 保存
@@ -84,7 +84,11 @@ export default { userId:{ type:String, default:'' - } + }, + taskStateName: { + type: String, + default: "" + }, }, computed: { tableHeight() { @@ -97,6 +101,8 @@ export default { }, watch: {}, async mounted() { + console.log(this.mergeObj,"dskjlfsdklf"); + if (this.sheetTotal) { this.currentId = this.workbookId; this.loadWorkBook() diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue index d216f5a41..844b34c4a 100644 --- a/src/views/modules/base/smartExcel/cpts/filling-info.vue +++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue @@ -65,7 +65,7 @@ (点击以下表格开始提报任务)
-
{{formData.taskTitle}}
@@ -90,7 +90,7 @@
- +