diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index 2771268..f97b944 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -77,3 +77,11 @@ }) } +// 删除核查数据 +export function deleteCheckData(data: { id: string }) { + return request({ + url: '/standard/check/info/delete', + method: 'post', + data, + }) +} diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index 2771268..f97b944 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -77,3 +77,11 @@ }) } +// 删除核查数据 +export function deleteCheckData(data: { id: string }) { + return request({ + url: '/standard/check/info/delete', + method: 'post', + data, + }) +} diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts index dd68b22..5b313f8 100644 --- a/src/views/business/taskMeasure/certificate/certificate-interface.ts +++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts @@ -31,6 +31,7 @@ taskId: string manufactureNo?: string // 出厂编号 dataId?: string // 检定数据id + measureDataNo?: string // 检定数据编号 } // 表单 diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index 2771268..f97b944 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -77,3 +77,11 @@ }) } +// 删除核查数据 +export function deleteCheckData(data: { id: string }) { + return request({ + url: '/standard/check/info/delete', + method: 'post', + data, + }) +} diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts index dd68b22..5b313f8 100644 --- a/src/views/business/taskMeasure/certificate/certificate-interface.ts +++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts @@ -31,6 +31,7 @@ taskId: string manufactureNo?: string // 出厂编号 dataId?: string // 检定数据id + measureDataNo?: string // 检定数据编号 } // 表单 diff --git a/src/views/business/taskMeasure/certificate/detail.vue b/src/views/business/taskMeasure/certificate/detail.vue index 0b69984..89d8275 100644 --- a/src/views/business/taskMeasure/certificate/detail.vue +++ b/src/views/business/taskMeasure/certificate/detail.vue @@ -191,7 +191,7 @@ processId.value = $route.query.processId as string // 流程实例id taskId.value = $route.query.taskId as string // 任务id用于审批 measureDataId.value = $route.query.measureDataId as string // 检定数据id - isFromCertificateList.value = $route.query.isFromCertificateList as string // 检定数据id + isFromCertificateList.value = $route.query.isFromCertificateList as string // 是否来源于证书列表页 }) diff --git a/src/api/equipment/standard/checkData.ts b/src/api/equipment/standard/checkData.ts index 2771268..f97b944 100644 --- a/src/api/equipment/standard/checkData.ts +++ b/src/api/equipment/standard/checkData.ts @@ -77,3 +77,11 @@ }) } +// 删除核查数据 +export function deleteCheckData(data: { id: string }) { + return request({ + url: '/standard/check/info/delete', + method: 'post', + data, + }) +} diff --git a/src/views/business/taskMeasure/certificate/certificate-interface.ts b/src/views/business/taskMeasure/certificate/certificate-interface.ts index dd68b22..5b313f8 100644 --- a/src/views/business/taskMeasure/certificate/certificate-interface.ts +++ b/src/views/business/taskMeasure/certificate/certificate-interface.ts @@ -31,6 +31,7 @@ taskId: string manufactureNo?: string // 出厂编号 dataId?: string // 检定数据id + measureDataNo?: string // 检定数据编号 } // 表单 diff --git a/src/views/business/taskMeasure/certificate/detail.vue b/src/views/business/taskMeasure/certificate/detail.vue index 0b69984..89d8275 100644 --- a/src/views/business/taskMeasure/certificate/detail.vue +++ b/src/views/business/taskMeasure/certificate/detail.vue @@ -191,7 +191,7 @@ processId.value = $route.query.processId as string // 流程实例id taskId.value = $route.query.taskId as string // 任务id用于审批 measureDataId.value = $route.query.measureDataId as string // 检定数据id - isFromCertificateList.value = $route.query.isFromCertificateList as string // 检定数据id + isFromCertificateList.value = $route.query.isFromCertificateList as string // 是否来源于证书列表页 }) diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue index 67fadfe..c7b7319 100644 --- a/src/views/business/taskMeasure/certificate/list.vue +++ b/src/views/business/taskMeasure/certificate/list.vue @@ -21,10 +21,9 @@ getCertificateList, refuseApproval, } from '@/api/business/taskMeasure/certificate' - +const $router = useRouter() const buttonBoxActive = 'businessCertificate' // 存储在sessionstorage里面的字段名,用于记录右上角buttonbox点击状态 const { proxy } = getCurrentInstance() as any -const $router = useRouter() const menu = ref([]) // 右上角审批状态按钮组合 const active = ref('') // 选中的按钮 // 查询条件 @@ -45,18 +44,20 @@ const operateWidth = ref('150') // 操作栏的宽度 const approvalDialog = ref() // 审批对话ref const columns = ref([ // 表头 - { text: '证书报告编号', value: 'certificateNo', width: '160', align: 'center' }, - { text: '证书报告名称', value: 'certificateName', align: 'center' }, - { text: '被检设备统一编号', value: 'sampleNo', align: 'center', width: '160' }, + { text: '证书编号', value: 'certificateNo', width: '160', align: 'center' }, + { text: '证书名称', value: 'certificateName', align: 'center' }, + // { text: '被检设备统一编号', value: 'sampleNo', align: 'center', width: '160' }, { text: '被检设备名称', value: 'sampleName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '出厂编号', value: 'manufactureNo', align: 'center' }, { text: '生产厂家', value: 'manufacturer', align: 'center' }, - { text: '结论', value: 'conclusion', align: 'center' }, - { text: '限用说明', value: 'restrictionInstruction', align: 'center' }, + { text: '检定数据编号', value: 'fileArr', align: 'center', width: '180', followLink: true }, { text: '检校类别', value: 'measureCategoryName', align: 'center', width: '55' }, + { text: '检定日期', value: 'traceDate', align: 'center', width: '120' }, + { text: '检定结论', value: 'conclusion', align: 'center' }, + { text: '限用说明', value: 'restrictionInstruction', align: 'center' }, + { text: '检定有效期', value: 'measureValidDate', align: 'center' }, { text: '检定员', value: 'staffName', align: 'center' }, - { text: '测试、校准或检定日期', value: 'traceDate', align: 'center', width: '120' }, ]) const list = ref([]) // 表格数据 const total = ref(0) // 总数 @@ -102,6 +103,7 @@ return { ...item, certificateName: `${item.certificateNo}-${item.certificateName}`, // 证书报告名称 + followLinkArr: [item.measureDataNo], // 检定数据编号,是一个链接,可跳转 } }) total.value = res.data.total @@ -294,6 +296,19 @@ } loading.close() } + +// 点击检定数据编号 +const handleClickFollowLink = (row: any, title: string) => { + $router.push({ + path: `measureData/detail/${row.dataId}`, + query: { + itemCategoryName: row.itemCategoryName, // 检定项分类名称 + itemCategoryId: row.itemCategoryId, // 检定项分类id + belongStandardEquipment: row.belongStandardEquipment, // 标准装置code + belongStandardEquipmentName: row.belongStandardEquipmentName, // 标准装置名称 + }, + }) +} // ---------------------------------------钩子------------------------------------------------------- watch(timeRange, (val) => { // 监听时间变化 if (val) { @@ -337,7 +352,7 @@ @@ -345,7 +360,7 @@ @@ -383,8 +398,8 @@ range-separator="至" format="YYYY-MM-DD" value-format="YYYY-MM-DD" - start-placeholder="测试、校准或检定日期(开始)" - end-placeholder="测试、校准或检定日期(结束)" + start-placeholder="检定日期(开始)" + end-placeholder="检定日期(结束)" style="width: 480px;" /> @@ -396,6 +411,7 @@