diff --git a/src/views/forceNotice/force/handle.vue b/src/views/forceNotice/force/handle.vue index 21bc7a8..45af18c 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 } @@ -694,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 1ac4451..171d28b 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 } @@ -668,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 7e3e66f..a6cd35c 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' @@ -530,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 35b9203..378b093 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' @@ -584,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 4b7545b..7a879b7 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' @@ -578,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 = []