From 9f4cf05a52f4aa5dfbd013aec278bfb39122cc3d Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 3 Jan 2025 21:35:57 +0800 Subject: [PATCH] =?UTF-8?q?2025.1.3=20=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=80=81=E6=A1=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E8=AF=A2=E4=BB=B7=20=E8=AF=A2=E4=BB=B7=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=20=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oss/oss.js | 2 + src/views/modules/eam/eamProjectInfo.vue | 125 ++++++++++++------ .../modules/eam/eamProjectInfoForUploads.vue | 2 +- .../modules/inquiry/inquiryApplication.vue | 1 + src/views/modules/oss/ossComponents.vue | 2 +- 5 files changed, 91 insertions(+), 41 deletions(-) diff --git a/src/api/oss/oss.js b/src/api/oss/oss.js index d08b75d..220b171 100644 --- a/src/api/oss/oss.js +++ b/src/api/oss/oss.js @@ -18,3 +18,5 @@ export const queryOss = (data) => createAPI(`/oss`,'post',data) export const removeOss = (data) => createAPI(`/oss/remove`,'post',data) export const previewOssFileById = (data) => createAPI(`/oss/${data.id}`,'post',777) + +export const previewOssFileById2 = (data) => createAPI(`/oss/2/${data.id}`,'post',777) diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index 5a477d6..6de371e 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -175,7 +175,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + @@ -185,7 +185,10 @@ - + + - + + - + + - + + - + + - - 客户编码 - （新客户） - + - + + - + + - + + - + + - + + @@ -258,12 +290,17 @@ - - IQC - + - + + - + + - - - - + + + + + @@ -301,19 +344,19 @@ - PM/Sales + PM/Sales - PjM + PjM - IPQC-Lam/Pri/Etch/Slit + IPQC-Lam/Pri/Etch/Slit - IPQC-Converting + IPQC-Converting @@ -322,33 +365,33 @@ - FQC1 + FQC1 - + FQC2 - Engineer + Engineer - MFG + MFG - + SQE - 文档工程师 + 文档工程师 @@ -4051,4 +4094,8 @@ import {updateColumnSize} from "../../../api/table"; padding: 10px; margin-bottom: 10px; } + +.big-label { + font-size: medium; /* 调整字号 */ +} diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue index 22ad25a..049b30d 100644 --- a/src/views/modules/eam/eamProjectInfoForUploads.vue +++ b/src/views/modules/eam/eamProjectInfoForUploads.vue @@ -153,7 +153,7 @@ v-if="this.$route.query.flag !== '2' && this.$route.query.flag !== '1'" :fields="fields()" :data="exportData" - type="xlsx" + type="xls" :name="exportName" :header="exportHeader" :footer="exportFooter" diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue index 445c008..6657fb9 100644 --- a/src/views/modules/inquiry/inquiryApplication.vue +++ b/src/views/modules/inquiry/inquiryApplication.vue @@ -475,6 +475,7 @@ import {partInformationSearch} from "../../../api/part/partInformation"; import quotationUpload from "../quote/quotation_upload.vue"; import OssComponents from "../oss/ossComponents.vue"; import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; +import {downLoadQuotationFile} from "../../../api/quote/quotationInformation"; export default { computed: { diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue index 37f7f8c..3c22322 100644 --- a/src/views/modules/oss/ossComponents.vue +++ b/src/views/modules/oss/ossComponents.vue @@ -184,7 +184,7 @@ export default { id:row.id, fileType:type } - previewOssFileById(params).then(({data}) => { + previewOssFileById2(params).then(({data}) => { if (type === 'excel' || type === 'word'){ type = 'application/pdf;charset=UTF-8' }