From 229f15c0c723f8f42d6856a84962eebfe2433123 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 12 Jan 2024 17:42:55 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80751,=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E7=9A=84=E5=B7=A6=E4=BE=A7=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/CheckContentModal.vue | 14 +++++++---- .../modules/EnterpriseStandardModal.vue | 24 ++++++++++++------- .../modules/UpdateListModal.vue | 9 +++---- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue index ab6eb0f4..c1a930ff 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue @@ -85,15 +85,15 @@ export default { } }, methods: { - add (publishOriginal) { - this.getFileInfo(publishOriginal).then(res => { + add (fileId) { + this.getFileInfo(fileId).then(res => { this.handlePreview(res) }) this.visible = true this.form.resetFields() }, - edit (publishOriginal, record, index) { - this.getFileInfo(publishOriginal).then(res => { + edit (fileId, record, index) { + this.getFileInfo(fileId).then(res => { this.handlePreview(res) }) this.visible = true @@ -164,6 +164,12 @@ export default { width: 60%; height: 100%; overflow-y: scroll; + .left-spin { + height: 100%; + } + /deep/ .ant-spin-container { + height: 100%; + } iframe { height: calc(100% - 20px) !important; } diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue index e82968f2..bec63b20 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue @@ -149,22 +149,30 @@ export default { // 稽查内容的添加 handleAdd () { const value = this.$refs.addForm.formInline - let publishOriginal = '' - if (value.publish_of_original) { - publishOriginal = value.publish_of_original + // 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 + const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft'] + let fileId = '' + for (const item of fieldArr) { + if (!fileId) { + fileId = value[item] ? value[item].split(',')[0] : '' + } } this.$refs.checkContentModal.title = this.$t('newlyAdded') - this.$refs.checkContentModal.add(publishOriginal) + this.$refs.checkContentModal.add(fileId) }, // 稽查内容的编辑 handleEdit (record, index) { const value = this.$refs.addForm.formInline - let publishOriginal = '' - if (value.publish_of_original) { - publishOriginal = value.publish_of_original + // 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 + const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft'] + let fileId = '' + for (const item of fieldArr) { + if (!fileId) { + fileId = value[item] ? value[item].split(',')[0] : '' + } } this.$refs.checkContentModal.title = this.$t('edit') - this.$refs.checkContentModal.edit(publishOriginal, record, index) + this.$refs.checkContentModal.edit(fileId, record, index) }, // 稽查内容的删除 handleDelete (index) { diff --git a/src/views/workCenter/enterpriseStandardChange/modules/UpdateListModal.vue b/src/views/workCenter/enterpriseStandardChange/modules/UpdateListModal.vue index 48ba2051..45b74db2 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/UpdateListModal.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/UpdateListModal.vue @@ -180,10 +180,11 @@ export default { fileId = res.result[item] ? res.result[item].split(',')[0] : '' } } - if (fileId) - this.getFileInfo(fileId).then(res => { - this.handlePreview(res) - }) + if (fileId) { + this.getFileInfo(fileId).then(res => { + this.handlePreview(res) + }) + } } }).finally(() => { this.leftLoading = false