From 709a27db6b7f034f04a8e8af56abf3fb9d3c71ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 12 Aug 2024 18:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 1 - src/views/qms/inspectionRecord/index.vue | 18 +++++++++++++++-- .../inspectionRecordMain.data.ts | 2 +- src/views/qms/inspectionRecordFirst/index.vue | 20 +++++++++++++++---- .../inspectionRecordFirstMain.data.ts | 16 ++++++++++++++- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 54ab710bf..c6d5d8191 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -290,7 +290,6 @@ const buttonTableClick = async (val, row) => { } } -// 查看质检报告 // 查看质检报告 const reportHeight = ref(window.innerHeight - 120) const showQualityReport = ref(false) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 533b848f3..155092fbb 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -116,6 +116,7 @@ import UseAddForm from './useAddForm.vue' import AddForm from './addForm.vue' import Detail from './detail.vue' import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain' +import { getReportUrl } from '@/utils/systemParam' import { InspectionJobMain, @@ -189,7 +190,7 @@ const buttonBaseClick = (val, item) => { // 其他按钮 console.log('其他按钮', item) } -} +} const isShowMainButton = (row, val) => { if (!row.callbackRequestNumber) { @@ -234,7 +235,8 @@ const butttondata = (row) => { // hide:row.useDecision, // hasPermi: 'qms:inspection-recode-main:execute', // }), // 执行 - defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }) // 编辑 + defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 + defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 ] } @@ -278,12 +280,24 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainOrderPub') { //发布 handleOrderPub(row) + }else if (val == 'mainPlanCheckQualityReport') { + // 查看质检报告 + checkQualityReport(row) } else if (val == 'edit') { //修改 // 执行 execute('execute', row) } } + +// 查看质检报告 +const reportHeight = ref(window.innerHeight - 120) +const showQualityReport = ref(false) +const qualityReport = ref('') +const checkQualityReport = async (row) => { + showQualityReport.value = true + qualityReport.value = `${getReportUrl()}/purchasereceiptReport?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 7a6389c69..9c106671b 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: 250, + width: 300, fixed: 'right' } } diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index be76b3c3e..291691010 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -62,6 +62,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import AddForm from '../inspectionRecordFirst/addForm.vue' import Detail from './detail.vue' + import { getReportUrl } from '@/utils/systemParam' import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data' @@ -138,8 +139,8 @@ const buttonBaseClick = (val, item) => { defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑 defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:delete' }), // 删除 defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi: 'qms:inspection-recode-first-main:pub' }), // 发布 - - defaultButtons.mainExport({ hide: !row.isPublished}), // 导出 + defaultButtons.mainExport({ hide: !row.isPublished }),// 导出 + defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 ] } @@ -155,11 +156,22 @@ const buttonBaseClick = (val, item) => { handleDelete(row.id) }else if (val == 'mainOrderPub') { //发布 handleOrderPub(row) - }else if (val == 'mainExport') { + }else if (val == 'mainPlanCheckQualityReport') { + // 查看质检报告 + checkQualityReport(row) + } else if (val == 'mainExport') { // 导出 handleMainExport(row) } - } +} + // 查看质检报告 +const reportHeight = ref(window.innerHeight - 120) +const showQualityReport = ref(false) +const qualityReport = ref('') +const checkQualityReport = async (row) => { + showQualityReport.value = true + qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}` +} /** 添加/修改操作 */ const basicFormRef = ref() const openForm = async (type : string, row ?: number) => { diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts index b6dea510f..59f1c6049 100644 --- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts +++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts @@ -145,13 +145,27 @@ export const InspectionRecordMain = useCrudSchemas( disabled: false } }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 180 + } + }, { label: '操作', field: 'action', isForm: false, isDetail: false, table: { - width: 200, + width: 300, fixed: 'right' } }