diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 778d711..8ab5375 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -109,11 +109,13 @@ deep: true, immediate: true, }) +const $router = useRouter() // 进入消息列表 const toMessageList = () => { // 清空消息列表 websocket.resetMessageList() // 路由跳转到指定控制台(页面暂未开发) + $router.push('/workbench/approve') } // 消息详情 const toMessageDetail = (message: Message) => { diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 778d711..8ab5375 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -109,11 +109,13 @@ deep: true, immediate: true, }) +const $router = useRouter() // 进入消息列表 const toMessageList = () => { // 清空消息列表 websocket.resetMessageList() // 路由跳转到指定控制台(页面暂未开发) + $router.push('/workbench/approve') } // 消息详情 const toMessageDetail = (message: Message) => { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index bbda4f2..68f41ca 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -52,7 +52,7 @@ [SCHEDULE.DEVICE_FIX_APPROVAL]: '/maintenance/maintenanceList', // 设备检修申请, [SCHEDULE.DEVICE_FIX_ACCEPTANCE]: '/maintenance/maintenanceCheckList', // 设备检修保养验收单, [SCHEDULE.BUSINESS_CERT_PRINT]: '/schedule/certPrintList', // 证书打印, - [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/reportOnCredentialsApproval', // 证书报告, + [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/measureDataList', // 证书报告, [SCHEDULE.BUSINESS_SUBPACKAGE_APPLY]: '/subpackage/itemApply', // 分包项目申请, [SCHEDULE.BUSINESS_SUBPACKAGE_CHECK]: '/subpackage/itemCheck', // 分包项目验收, [SCHEDULE.BUSINESS_SUBPACKAGE_RECORD]: '/subpackage/archives', // 分包方档案, diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 778d711..8ab5375 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -109,11 +109,13 @@ deep: true, immediate: true, }) +const $router = useRouter() // 进入消息列表 const toMessageList = () => { // 清空消息列表 websocket.resetMessageList() // 路由跳转到指定控制台(页面暂未开发) + $router.push('/workbench/approve') } // 消息详情 const toMessageDetail = (message: Message) => { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index bbda4f2..68f41ca 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -52,7 +52,7 @@ [SCHEDULE.DEVICE_FIX_APPROVAL]: '/maintenance/maintenanceList', // 设备检修申请, [SCHEDULE.DEVICE_FIX_ACCEPTANCE]: '/maintenance/maintenanceCheckList', // 设备检修保养验收单, [SCHEDULE.BUSINESS_CERT_PRINT]: '/schedule/certPrintList', // 证书打印, - [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/reportOnCredentialsApproval', // 证书报告, + [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/measureDataList', // 证书报告, [SCHEDULE.BUSINESS_SUBPACKAGE_APPLY]: '/subpackage/itemApply', // 分包项目申请, [SCHEDULE.BUSINESS_SUBPACKAGE_CHECK]: '/subpackage/itemCheck', // 分包项目验收, [SCHEDULE.BUSINESS_SUBPACKAGE_RECORD]: '/subpackage/archives', // 分包方档案, diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index 0657cde..e07a0b1 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -44,7 +44,7 @@ // 表头 const reportHead = ref([ { text: '名称', value: 'certificateReportName', align: 'center' }, - { text: '检定员', value: 'measurePersonName', align: 'center' }, + { text: '检定员', value: 'measurePerson', align: 'center' }, { text: '状态', value: 'approvalStatusName', align: 'center', width: '110' }, ]) @@ -323,8 +323,8 @@ diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 778d711..8ab5375 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -109,11 +109,13 @@ deep: true, immediate: true, }) +const $router = useRouter() // 进入消息列表 const toMessageList = () => { // 清空消息列表 websocket.resetMessageList() // 路由跳转到指定控制台(页面暂未开发) + $router.push('/workbench/approve') } // 消息详情 const toMessageDetail = (message: Message) => { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index bbda4f2..68f41ca 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -52,7 +52,7 @@ [SCHEDULE.DEVICE_FIX_APPROVAL]: '/maintenance/maintenanceList', // 设备检修申请, [SCHEDULE.DEVICE_FIX_ACCEPTANCE]: '/maintenance/maintenanceCheckList', // 设备检修保养验收单, [SCHEDULE.BUSINESS_CERT_PRINT]: '/schedule/certPrintList', // 证书打印, - [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/reportOnCredentialsApproval', // 证书报告, + [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/measureDataList', // 证书报告, [SCHEDULE.BUSINESS_SUBPACKAGE_APPLY]: '/subpackage/itemApply', // 分包项目申请, [SCHEDULE.BUSINESS_SUBPACKAGE_CHECK]: '/subpackage/itemCheck', // 分包项目验收, [SCHEDULE.BUSINESS_SUBPACKAGE_RECORD]: '/subpackage/archives', // 分包方档案, diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index 0657cde..e07a0b1 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -44,7 +44,7 @@ // 表头 const reportHead = ref([ { text: '名称', value: 'certificateReportName', align: 'center' }, - { text: '检定员', value: 'measurePersonName', align: 'center' }, + { text: '检定员', value: 'measurePerson', align: 'center' }, { text: '状态', value: 'approvalStatusName', align: 'center', width: '110' }, ]) @@ -323,8 +323,8 @@ diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts index ef83803..1a66ad0 100644 --- a/src/views/business/lab/measureData/measureData-interface.ts +++ b/src/views/business/lab/measureData/measureData-interface.ts @@ -58,7 +58,7 @@ certificationCompanyAddress: string // 证书单位地址 calibrationPlace: string // 检校地点 - repeatTime: string // 复校时间 + repeatTime: number | undefined // 复校时间 deliverTime: string // 接收时间 measureResult: string // 检定结果 environmentCode: string // 环境记录单编号 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 778d711..8ab5375 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -109,11 +109,13 @@ deep: true, immediate: true, }) +const $router = useRouter() // 进入消息列表 const toMessageList = () => { // 清空消息列表 websocket.resetMessageList() // 路由跳转到指定控制台(页面暂未开发) + $router.push('/workbench/approve') } // 消息详情 const toMessageDetail = (message: Message) => { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index bbda4f2..68f41ca 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -52,7 +52,7 @@ [SCHEDULE.DEVICE_FIX_APPROVAL]: '/maintenance/maintenanceList', // 设备检修申请, [SCHEDULE.DEVICE_FIX_ACCEPTANCE]: '/maintenance/maintenanceCheckList', // 设备检修保养验收单, [SCHEDULE.BUSINESS_CERT_PRINT]: '/schedule/certPrintList', // 证书打印, - [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/reportOnCredentialsApproval', // 证书报告, + [SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS]: '/lab/measureDataList', // 证书报告, [SCHEDULE.BUSINESS_SUBPACKAGE_APPLY]: '/subpackage/itemApply', // 分包项目申请, [SCHEDULE.BUSINESS_SUBPACKAGE_CHECK]: '/subpackage/itemCheck', // 分包项目验收, [SCHEDULE.BUSINESS_SUBPACKAGE_RECORD]: '/subpackage/archives', // 分包方档案, diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index 0657cde..e07a0b1 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -44,7 +44,7 @@ // 表头 const reportHead = ref([ { text: '名称', value: 'certificateReportName', align: 'center' }, - { text: '检定员', value: 'measurePersonName', align: 'center' }, + { text: '检定员', value: 'measurePerson', align: 'center' }, { text: '状态', value: 'approvalStatusName', align: 'center', width: '110' }, ]) @@ -323,8 +323,8 @@ diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts index ef83803..1a66ad0 100644 --- a/src/views/business/lab/measureData/measureData-interface.ts +++ b/src/views/business/lab/measureData/measureData-interface.ts @@ -58,7 +58,7 @@ certificationCompanyAddress: string // 证书单位地址 calibrationPlace: string // 检校地点 - repeatTime: string // 复校时间 + repeatTime: number | undefined // 复校时间 deliverTime: string // 接收时间 measureResult: string // 检定结果 environmentCode: string // 环境记录单编号 diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index b0e72e7..c2d6cb2 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -25,9 +25,10 @@ import { getDictByCode } from '@/api/system/dict' import useUserStore from '@/store/modules/user' import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue' -import { downloadFile } from '@/utils/download' +import { download, downloadFile } from '@/utils/download' import type { dictType } from '@/global' import { exportFile } from '@/utils/exportUtils' +import { getPhotoUrl } from '@/api/system/tool' const user = useUserStore() // 用户信息 const textMap: { [key: string]: string } = { @@ -67,7 +68,7 @@ certificationCompanyAddress: '', // 证书单位地址 calibrationPlace: '', // 检校地点 - repeatTime: '', // 复校时间 + repeatTime: undefined, // 复校时间 deliverTime: '', // 接收时间 measureResult: '', // 检定结果 environmentCode: '', // 环境记录单编号 @@ -204,7 +205,7 @@ // -----------------------------------------所依据的技术文件---------------------------------- const selectTechFilesRef = ref() -const fileList = ref([]) // 依据的技术文件 +const fileList = ref([]) as any // 依据的技术文件 // 点击所依据的技术文件 const selectTechFiles = () => { selectTechFilesRef.value.initDialog() @@ -404,6 +405,20 @@ form.value.templateName = val.templateName || '' // 证书报告模板名称 } +// 点击下载证书附件 +const downloadCertFile = () => { + if (form.value.certificateReportFile) { + getPhotoUrl(form.value.certificateReportFile).then((res) => { + download(res.data, form.value.certificateReportFile) + }).catch(() => { + ElMessage.error('下载失败') + }) + } + else { + ElMessage.warning('无可下载内容') + } +} + // 点击下载证书模板按钮 const downloadCertTemplate = () => { if (!form.value.templateId) { @@ -442,7 +457,7 @@ const params = { ...form.value, businessEnvironmentRecord: businessEnvironmentRecord.value, // 环境记录单 - fileList: fileList.value, // 依据的技术文件 + fileList: fileList.value === '' ? [] : fileList.value, // 依据的技术文件 equipmentInfoList: equipmentInfoList.value, // 所用的计量标准器具列表/监测设备 sampleId: sampleList.value[0].id, // 样品id(打印证书接口要必传) sampleNo: sampleList.value[0].sampleNo, // 样品编号 @@ -451,7 +466,7 @@ manufacturingNo: sampleList.value[0].manufacturingNo, // 出厂编号 manufacturer: sampleList.value[0].manufacturer, // 生产厂家 sampleRemark: sampleList.value[0].remark, // 样品备注 - id: pageType.value === 'add' ? '' : form.value.id, + id: infoId.value, } return params } @@ -466,7 +481,9 @@ loading.close() form.value = res.data fileList.value = res.data.fileList // 依据的技术文件 - form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',') + if (Array.isArray(res.data.fileList)) { + form.value.techFilesName = fileList.value.map((item: { fileName: string }) => item.fileName).join(',') + } sampleList.value = [{ sampleNo: res.data.sampleNo, // 样品编号 sampleName: res.data.sampleName, // 样品名称 @@ -482,6 +499,7 @@ validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate, } }) // 所用的计量标准器具 + businessEnvironmentRecord.value = res.data.businessEnvironmentRecord // 环境记录单数据 form.value.environmentCode = res.data.businessEnvironmentRecord.environmentCode// 环境记录单编号 if (id && certificateReportCode) { @@ -516,9 +534,10 @@ background: 'rgba(255, 255, 255, 0.8)', }) const params = solveParams() - if (pageType.value === 'add') { // 新建 - addMeasureData(params).then((res) => { + if (pageType.value === 'add' && !infoId.value) { // 新建 + addMeasureData({ ...params, processId: '' }).then((res) => { submitId.value = res.data.data.id + infoId.value = res.data.data.id form.value.certificateReportCode = res.data.data.certificateReportCode form.value.certificateReportName = res.data.data.certificateReportName ElMessage.success('保存成功') @@ -528,14 +547,14 @@ }) } - else if (pageType.value === 'edit') { // 编辑 + else if (pageType.value === 'edit' || (pageType.value === 'add' && infoId.value)) { // 编辑 if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回 failUpdateMeasureData(params).then((res) => { ElMessage.success('保存成功') loading.close() - if (type !== 'saveUploadFile') { - close() - } + // if (type !== 'saveUploadFile') { + // close() + // } }).catch(() => { loading.close() }) @@ -544,9 +563,9 @@ draftUpdateMeasureData(params).then((res) => { ElMessage.success('保存成功') loading.close() - if (type !== 'saveUploadFile') { - close() - } + // if (type !== 'saveUploadFile') { + // close() + // } }).catch(() => { loading.close() }) @@ -628,13 +647,13 @@ } else if (val === '同意') { - approvalDialog.value.initDialog('agree', query.taskId, query.id, query.decisionItem) + approvalDialog.value.initDialog('agree', query.taskId, infoId.value, query.decisionItem) } else if (val === '驳回') { - approvalDialog.value.initDialog('reject', query.taskId, query.id, query.decisionItem) + approvalDialog.value.initDialog('reject', query.taskId, infoId.value, query.decisionItem) } else if (val === '拒绝') { - approvalDialog.value.initDialog('refuse', query.taskId, query.id, query.decisionItem) + approvalDialog.value.initDialog('refuse', query.taskId, infoId.value, query.decisionItem) } } // ------------------------------------事件------------------------------------------------- @@ -681,9 +700,12 @@ 上传证书 - + 下载证书模板 + + 下载证书附件 + 同意 @@ -696,7 +718,7 @@ 提交 - + 保存