diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index 57e8b703f..f4d4a7b20 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -124,4 +124,9 @@ export const importTemplate = () => { // 删除之前的包装和标签 export const deleteOldLabels = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id }) +} + +// 查看履历表 +export const querySupplierResume = (asnNumber:string) => { + return request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber }) } \ No newline at end of file diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index e571f3bf9..fbc42f7d2 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -757,6 +757,7 @@ export default { 物料描述2:'Material Description2', 项目代码:'Item Code', 质检明细:'Quality inspection details', + 履历表明细:'Details of your resume', 添加附件:'Add Attachment', 变更记录:'Change Record', 添加明细:'Add Detail', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index c5655b206..dce38d2f3 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -759,6 +759,7 @@ export default { 物料描述2:'物料描述2', 项目代码:'项目代码', 质检明细:'质检明细', + 履历表明细:'履历表明细', 添加附件:'添加附件', 变更记录:'变更记录', 添加明细:'添加明细', diff --git a/src/permission.ts b/src/permission.ts index 08c744c55..4ef46714a 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -23,7 +23,8 @@ const whiteList = [ '/bind', '/register', '/oauthLogin/gitee', - '/purchasereceiptReport' + '/purchasereceiptReport', + '/supplierResume' ] // 路由加载前 diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 285839f2d..93b4a8b26 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -265,6 +265,16 @@ const remainingRouter: AppRouteRecordRaw[] = [ noTagsView: true } }, + { + path: '/supplierResume', + component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'), + name: 'supplierResume', + meta: { + hidden: true, + title: t('ts.查看履历表'), + noTagsView: true + } + }, { path: '/bpm', component: Layout, diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 8d9ec527d..268e4400e 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -772,6 +772,17 @@ export function mainListPlanCheckQualityReportBtn(option: any) { hasPermi: '' }) } +export function mainListSupplierResumeBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.查看履历表`).replace('ts.', ''), + name: 'mainSupplierResume', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-计划流程-提交审批按钮 export function mainListPlanSubBtn(option: any) { diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 7be97e488..88e1eeb45 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -78,7 +78,7 @@ /> { defaultButtons.mainListPackageBtn(null), // 包装 defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowMainButton3(row) - }) // 查看质检报告 + }), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({ + hide: isShowMainButton3(row) + }) // 查看履历表 ] } const listTableRef = ref() @@ -313,6 +316,9 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanCheckQualityReport') { // 查看质检报告 checkQualityReport(row) + } else if (val == 'mainSupplierResume') { + // 查看履历表 + checkSupplierResume(row) } else if (val == 'mainJobAcc') { // 承接 handleAccept(row.id) @@ -323,11 +329,19 @@ const buttonTableClick = async (val, row) => { const reportHeight = ref(window.innerHeight - 120) const showQualityReport = ref(false) const qualityReport = ref('') +const reportTitle = ref('') + const checkQualityReport = async (row) => { + reportTitle.value = t('ts.质检明细') showQualityReport.value = true qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber } - +// 查看履历表 +const checkSupplierResume = async (row) => { + reportTitle.value = t('ts.履历表明细') + showQualityReport.value = true + qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber +} /** 添加/修改操作 */ // const formRef = ref() // const openForm = async (type : string, row ?: number) => { diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 30a62efa2..2dbdc478f 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -686,7 +686,7 @@ export const InspectionJobMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 300, + width: 390, fixed: 'right' } } diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 88c78d50f..f61aae936 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -85,7 +85,7 @@ /> { // hasPermi: 'qms:inspection-recode-main:execute', // }), // 执行 defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 - defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 + defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 ] } @@ -306,6 +307,9 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanCheckQualityReport') { // 查看质检报告 checkQualityReport(row) + } else if (val == 'mainSupplierResume') { + // 查看履历表 + checkSupplierResume(row) } else if (val == 'edit') { //修改 // 执行 @@ -317,10 +321,18 @@ const buttonTableClick = async (val, row) => { const reportHeight = ref(window.innerHeight - 120) const showQualityReport = ref(false) const qualityReport = ref('') +const reportTitle = ref('') const checkQualityReport = async (row) => { + reportTitle.value = t('ts.质检明细') showQualityReport.value = true qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber } +// 查看履历表 +const checkSupplierResume = async (row) => { + reportTitle.value = t('ts.履历表明细') + showQualityReport.value = true + qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber +} /** 添加/修改操作 */ const basicFormRef = ref() // const openForm = async (type : string, row ?: number) => { diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index b40337a96..2952c93c1 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 340, + width: 430, fixed: 'right' } } diff --git a/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue b/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue index 8f4d0a7b6..83f1384eb 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue +++ b/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue @@ -5,7 +5,7 @@ + +