From 97cf733ae11faf4bc72bca6b4bc24dcb1498025b Mon Sep 17 00:00:00 2001 From: chenxf Date: Tue, 6 Jan 2026 20:25:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(forceNotice):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=B1=9E=E6=80=A7=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E5=92=8C=E6=95=B0=E6=8D=AE=E8=A6=86=E7=9B=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一文件名属性从 fileName 改为 filename，确保属性名一致性 - 修改数据赋值方式，使用展开运算符保留原有数据，避免完全覆盖 - 在 force、inclusion、liccan、recovery、remove 模块中应用相同修复 --- src/views/forceNotice/force/handle.vue | 7 +++++-- src/views/forceNotice/inclusion/handle.vue | 7 +++++-- src/views/forceNotice/liccan/handle.vue | 7 +++++-- src/views/forceNotice/recovery/handle.vue | 7 +++++-- src/views/forceNotice/remove/handle.vue | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/views/forceNotice/force/handle.vue b/src/views/forceNotice/force/handle.vue index 21bc7a8..ee7b268 100644 --- a/src/views/forceNotice/force/handle.vue +++ b/src/views/forceNotice/force/handle.vue @@ -598,7 +598,7 @@ export default { this.data.fileList = data.map((item) => { return { ...item, - name: item.fileName + name: item.filename } }) }), @@ -608,7 +608,10 @@ export default { }).then((busInfo) => { const busName = this.data.busName this.data.status = busInfo[0].status - this.data = busInfo[0] + this.data = { + ...this.data, + ...busInfo[0] + } if (busName) { this.data.busName = busName } diff --git a/src/views/forceNotice/inclusion/handle.vue b/src/views/forceNotice/inclusion/handle.vue index 1ac4451..0a034ac 100644 --- a/src/views/forceNotice/inclusion/handle.vue +++ b/src/views/forceNotice/inclusion/handle.vue @@ -582,7 +582,7 @@ export default { this.data.fileList = data.map((item) => { return { ...item, - name: item.fileName + name: item.filename } }) }), @@ -592,7 +592,10 @@ export default { }).then((busInfo) => { const busName = this.data.busName this.data.status = busInfo[0].status - this.data = busInfo[0] + this.data = { + ...this.data, + ...busInfo[0] + } if (busName) { this.data.busName = busName } diff --git a/src/views/forceNotice/liccan/handle.vue b/src/views/forceNotice/liccan/handle.vue index 7e3e66f..d38bd34 100644 --- a/src/views/forceNotice/liccan/handle.vue +++ b/src/views/forceNotice/liccan/handle.vue @@ -454,7 +454,7 @@ export default { this.data.fileList = data.map((item) => { return { ...item, - name: item.fileName + name: item.filename } }) }), @@ -462,7 +462,10 @@ export default { bizSeqNo: this.$route.query.bizSeqNo }).then((busInfo) => { this.data.status = busInfo.status - this.data = busInfo + this.data = { + ...this.data, + ...busInfo + } const permission = ({ '0': 'xrExamine', '1': 'xrApprove' diff --git a/src/views/forceNotice/recovery/handle.vue b/src/views/forceNotice/recovery/handle.vue index 35b9203..782a1e3 100644 --- a/src/views/forceNotice/recovery/handle.vue +++ b/src/views/forceNotice/recovery/handle.vue @@ -508,7 +508,7 @@ export default { this.data.fileList = data.map((item) => { return { ...item, - name: item.fileName + name: item.filename } }) }), @@ -516,7 +516,10 @@ export default { bizSeqNo: this.$route.query.bizSeqNo }).then((busInfo) => { this.data.status = busInfo.status - this.data = busInfo + this.data = { + ...this.data, + ...busInfo + } const permission = ({ '0': 'xrExamine', '1': 'xrApprove' diff --git a/src/views/forceNotice/remove/handle.vue b/src/views/forceNotice/remove/handle.vue index 4b7545b..f101700 100644 --- a/src/views/forceNotice/remove/handle.vue +++ b/src/views/forceNotice/remove/handle.vue @@ -513,7 +513,7 @@ export default { this.data.fileList = data.map((item) => { return { ...item, - name: item.fileName + name: item.filename } }) }), @@ -521,7 +521,10 @@ export default { bizSeqNo: this.$route.query.bizSeqNo }).then((busInfo) => { this.data.status = busInfo.status - this.data = busInfo + this.data = { + ...this.data, + ...busInfo + } const permission = ({ '0': 'xrExamine', '1': 'xrApprove' From c40d55c2aab80cec31d76bb24eaf73939297897d Mon Sep 17 00:00:00 2001 From: chenxf Date: Tue, 6 Jan 2026 20:28:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(force-notice):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了 forceNotice 模块中多个页面的 previewFile 方法中字段名大小写不一致的问题， 统一将 attachmentId、bizSeqNo、attachType 等字段名修改为小写形式 attachmentid、 bizseq、attachtype，确保附件预览功能正常工作。 --- src/views/forceNotice/force/handle.vue | 2 +- src/views/forceNotice/inclusion/handle.vue | 2 +- src/views/forceNotice/liccan/handle.vue | 2 +- src/views/forceNotice/recovery/handle.vue | 2 +- src/views/forceNotice/remove/handle.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/forceNotice/force/handle.vue b/src/views/forceNotice/force/handle.vue index ee7b268..45af18c 100644 --- a/src/views/forceNotice/force/handle.vue +++ b/src/views/forceNotice/force/handle.vue @@ -697,7 +697,7 @@ export default { }) }, previewFile(file) { - window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentId || file?.response?.data?.attachmentId}&bizSeqNo=${file.bizSeqNo}&attachType=${file.attachType}`, '_blank') + window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentid || file?.response?.data?.attachmentid}&bizSeqNo=${file.bizseq}&attachType=${file.attachtype}`, '_blank') }, getUsersWithPermission(isUpper) { const ps = [] diff --git a/src/views/forceNotice/inclusion/handle.vue b/src/views/forceNotice/inclusion/handle.vue index 0a034ac..171d28b 100644 --- a/src/views/forceNotice/inclusion/handle.vue +++ b/src/views/forceNotice/inclusion/handle.vue @@ -671,7 +671,7 @@ export default { }) }, previewFile(file) { - window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentId || file?.response?.data?.attachmentId}&bizSeqNo=${file.bizSeqNo}&attachType=${file.attachType}`, '_blank') + window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentid || file?.response?.data?.attachmentid}&bizSeqNo=${file.bizseq}&attachType=${file.attachtype}`, '_blank') }, getUsersWithPermission(isUpper) { const ps = [] diff --git a/src/views/forceNotice/liccan/handle.vue b/src/views/forceNotice/liccan/handle.vue index d38bd34..a6cd35c 100644 --- a/src/views/forceNotice/liccan/handle.vue +++ b/src/views/forceNotice/liccan/handle.vue @@ -533,7 +533,7 @@ export default { }) }, previewFile(file) { - window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentId || file?.response?.data?.attachmentId}&bizSeqNo=${file.bizSeqNo}&attachType=${file.attachType}`, '_blank') + window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentid || file?.response?.data?.attachmentid}&bizSeqNo=${file.bizseq}&attachType=${file.attachtype}`, '_blank') }, getUsersWithPermission(isUpper) { const ps = [] diff --git a/src/views/forceNotice/recovery/handle.vue b/src/views/forceNotice/recovery/handle.vue index 782a1e3..378b093 100644 --- a/src/views/forceNotice/recovery/handle.vue +++ b/src/views/forceNotice/recovery/handle.vue @@ -587,7 +587,7 @@ export default { }) }, previewFile(file) { - window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentId || file?.response?.data?.attachmentId}&bizSeqNo=${file.bizSeqNo}&attachType=${file.attachType}`, '_blank') + window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentid || file?.response?.data?.attachmentid}&bizSeqNo=${file.bizseq}&attachType=${file.attachtype}`, '_blank') }, getUsersWithPermission(isUpper) { const ps = [] diff --git a/src/views/forceNotice/remove/handle.vue b/src/views/forceNotice/remove/handle.vue index f101700..7a879b7 100644 --- a/src/views/forceNotice/remove/handle.vue +++ b/src/views/forceNotice/remove/handle.vue @@ -581,7 +581,7 @@ export default { }) }, previewFile(file) { - window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentId || file?.response?.data?.attachmentId}&bizSeqNo=${file.bizSeqNo}&attachType=${file.attachType}`, '_blank') + window.open(`${process.env.VUE_APP_BASE_API}/xrAttachment/getMaterial?id=${file.attachmentid || file?.response?.data?.attachmentid}&bizSeqNo=${file.bizseq}&attachType=${file.attachtype}`, '_blank') }, getUsersWithPermission(isUpper) { const ps = []