diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index ae706cb..6bfdbfc 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -139,6 +139,7 @@ export const saveOrderReportForDefect= data => createAPI(`/pms/eam/saveOrderRepo export const checkWorkOrder= data => createAPI(`/pms/eam/checkWorkOrder`,'post',data) export const selectNameByMes= data => createAPI(`/pms/eam/selectNameByMes`,'post',data) export const submitDefect= data => createAPI(`/pms/eam/submitDefect`,'post',data) +export const submitDefects= data => createAPI(`/pms/eam/submitDefects`,'post',data) export const eamWorkPlanOverviewSearch= data => createAPI(`/pms/eam/eamWorkPlanOverviewSearch`,'post',data) export const getPlanDetailList= data => createAPI(`/pms/eam/getPlanDetailList`,'post',data) export const delPlanDetail= data => createAPI(`/pms/eam/delPlanDetail`,'post',data) 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/router/index.js b/src/router/index.js index 85e2cd7..0e48b1d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -61,15 +61,6 @@ const router = new Router({ router.beforeEach((to, from, next) => {console.log(Vue.prototype.$store) - // const token = localStorage.getItem('token'); - // const isLogin = to.name === 'login'; // 判断是否是登录页 - // - // // 保存原始路径（仅在未登录状态下保存） - // if (!token && !isLogin) { - // console.log('保存重定向路径：', to.fullPath); - // localStorage.setItem('redirectPath', to.fullPath); - // } - // 添加动态(菜单)路由 // 1. 已经添加 or 全局路由, 直接访问 // 2. 获取菜单列表, 添加并保存本地存储 @@ -102,6 +93,15 @@ router.beforeEach((to, from, next) => {console.log(Vue.prototype.$store) router.push({ name: 'login' }) }) } + + const token = localStorage.getItem('token'); + const isLogin = to.name === 'login'; // 判断是否是登录页 + + // 保存原始路径（仅在未登录状态下保存） + if (!token && !isLogin) { + console.log('保存重定向路径：', to.fullPath); + localStorage.setItem('redirectPath', to.fullPath); + } }) /** diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 64dd02b..54b24a3 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -105,13 +105,20 @@ import { getUUID } from '@/utils' }) }).then(({data}) => { if (data && data.code === 0) { - // console.log('跳转前路径:', localStorage.getItem('redirectPath')); // 检查路径是否正确 + console.log('跳转前路径:', localStorage.getItem('redirectPath')); // 检查路径是否正确 this.$cookie.set('token', data.token) // 动态跳转逻辑 - // const redirectPath = localStorage.getItem('redirectPath') || '/home'; - // console.log('Redirecting to:', redirectPath); // 调试输出 - // this.$router.replace(redirectPath); // 根据保存的路径跳转 - this.$router.replace({name: 'home'}) + const redirectPath = localStorage.getItem('redirectPath') || ''; + + // 设置需要判断的路径 + const pathsToRedirect = ['/auth-authQuote', '/auth-authInquiry']; + + if (pathsToRedirect.some(path => redirectPath.indexOf(path) !== -1)) { + this.$router.replace(redirectPath); + } else { + this.$router.replace({ name: 'home' }); + } + console.log('Redirecting to:', redirectPath); // 调试输出 this.$i18n.locale=data.language localStorage.setItem('locale', data.language) localStorage.setItem('refresh', "0") diff --git a/src/views/modules/auth/authInquiry.vue b/src/views/modules/auth/authInquiry.vue index 3491a3a..2a4fed5 100644 --- a/src/views/modules/auth/authInquiry.vue +++ b/src/views/modules/auth/authInquiry.vue @@ -315,13 +315,13 @@ import OssComponents from "../oss/ossComponents.vue"; import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; export default { - // beforeRouteEnter(to, from, next) { - // next((vm) => { - // // 跳转后清除 redirectPath - // localStorage.removeItem('redirectPath'); - // console.log('redirectPath 已清除'); - // }); - // }, + beforeRouteEnter(to, from, next) { + next((vm) => { + // 跳转后清除 redirectPath + localStorage.removeItem('redirectPath'); + console.log('redirectPath 已清除'); + }); + }, computed: { statusDisplay() { return this.inquiryInfoData.status === 'C' ? '草稿' : (this.inquiryInfoData.status === 'B' ? '已下达' : '已报价') diff --git a/src/views/modules/auth/authQuote.vue b/src/views/modules/auth/authQuote.vue index 6484c8c..e5db904 100644 --- a/src/views/modules/auth/authQuote.vue +++ b/src/views/modules/auth/authQuote.vue @@ -218,13 +218,13 @@ import QuoteDetail from "../quote/detail/quoteDetail.vue"; import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; export default { - // beforeRouteEnter(to, from, next) { - // next((vm) => { - // // 跳转后清除 redirectPath - // localStorage.removeItem('redirectPath'); - // console.log('redirectPath 已清除'); - // }); - // }, + beforeRouteEnter(to, from, next) { + next((vm) => { + // 跳转后清除 redirectPath + localStorage.removeItem('redirectPath'); + console.log('redirectPath 已清除'); + }); + }, computed: { // quotationInformationFlag () { // return (value) => { 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/eam/eamWorkOrderForApprove.vue b/src/views/modules/eam/eamWorkOrderForApprove.vue new file mode 100644 index 0000000..e25d63d --- /dev/null +++ b/src/views/modules/eam/eamWorkOrderForApprove.vue @@ -0,0 +1,1717 @@ + + + + + diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue index 445c008..ae8683d 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: { @@ -953,6 +954,24 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 5022, + serialNumber: '5022Table1BomStatus', + tableId: '5022Table1', + tableName: '询价信息表', + columnProp: 'bomStatus', + headerAlign: 'center', + align: 'center', + columnLabel: 'BOM状态', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 5022, 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' }