diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 4b9f536..41dc21b 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -142,7 +142,7 @@ let getId = '' if (form.configType === 'add') { const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.dat + getId = res.data } else { const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 4b9f536..41dc21b 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -142,7 +142,7 @@ let getId = '' if (form.configType === 'add') { const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.dat + getId = res.data } else { const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) diff --git a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue b/src/views/business/taskMeasure/certificate/components/approvalRecord.vue deleted file mode 100644 index cf6fae7..0000000 --- a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 4b9f536..41dc21b 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -142,7 +142,7 @@ let getId = '' if (form.configType === 'add') { const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.dat + getId = res.data } else { const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) diff --git a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue b/src/views/business/taskMeasure/certificate/components/approvalRecord.vue deleted file mode 100644 index cf6fae7..0000000 --- a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/taskMeasure/certificate/components/basic.vue b/src/views/business/taskMeasure/certificate/components/basic.vue index 7b71b09..8ad025c 100644 --- a/src/views/business/taskMeasure/certificate/components/basic.vue +++ b/src/views/business/taskMeasure/certificate/components/basic.vue @@ -35,6 +35,7 @@ originalRecordFile: '', // 原始记录 }) const infoId = ref('') // id +const getMeasureDataId = ref('') // 检定数据id const approvalStatusName = ref('') // 审批状态名称 // ---------------------------------------标签--------------------------------------------- const radioMenus = ref([ // 标签内容 @@ -98,13 +99,21 @@ loading.close() form.value.originalRecordFile = res.data.originalRecordFile // 原始记录 form.value.certificateFile = res.data.certificateFile // 检定证书 + form.value.sampleName = res.data.sampleName // 被检设备名称 + form.value.model = res.data.model // 规格型号 + form.value.manufacturingNo = res.data.manufactureNo// 出厂编号 + getMeasureDataId.value = res.data.dataId emits('reportData', res.data.certificateFile, res.data.originalRecordFile) // } }) } // -------------------------------------------------------------------------------------- - +watch(() => props.measureDataId, (newValue) => { + if (newValue) { + getMeasureDataId.value = newValue + } +}, { immediate: true }) onMounted(async () => { await getDict() // 获取字典 form.value.sampleName = $route.query.sampleName as string// 被检设备名称 @@ -152,5 +161,5 @@ - + diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 4b9f536..41dc21b 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -142,7 +142,7 @@ let getId = '' if (form.configType === 'add') { const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.dat + getId = res.data } else { const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) diff --git a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue b/src/views/business/taskMeasure/certificate/components/approvalRecord.vue deleted file mode 100644 index cf6fae7..0000000 --- a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/taskMeasure/certificate/components/basic.vue b/src/views/business/taskMeasure/certificate/components/basic.vue index 7b71b09..8ad025c 100644 --- a/src/views/business/taskMeasure/certificate/components/basic.vue +++ b/src/views/business/taskMeasure/certificate/components/basic.vue @@ -35,6 +35,7 @@ originalRecordFile: '', // 原始记录 }) const infoId = ref('') // id +const getMeasureDataId = ref('') // 检定数据id const approvalStatusName = ref('') // 审批状态名称 // ---------------------------------------标签--------------------------------------------- const radioMenus = ref([ // 标签内容 @@ -98,13 +99,21 @@ loading.close() form.value.originalRecordFile = res.data.originalRecordFile // 原始记录 form.value.certificateFile = res.data.certificateFile // 检定证书 + form.value.sampleName = res.data.sampleName // 被检设备名称 + form.value.model = res.data.model // 规格型号 + form.value.manufacturingNo = res.data.manufactureNo// 出厂编号 + getMeasureDataId.value = res.data.dataId emits('reportData', res.data.certificateFile, res.data.originalRecordFile) // } }) } // -------------------------------------------------------------------------------------- - +watch(() => props.measureDataId, (newValue) => { + if (newValue) { + getMeasureDataId.value = newValue + } +}, { immediate: true }) onMounted(async () => { await getDict() // 获取字典 form.value.sampleName = $route.query.sampleName as string// 被检设备名称 @@ -152,5 +161,5 @@ - + diff --git a/src/views/business/taskMeasure/certificate/detail.vue b/src/views/business/taskMeasure/certificate/detail.vue index 89d8275..abe45de 100644 --- a/src/views/business/taskMeasure/certificate/detail.vue +++ b/src/views/business/taskMeasure/certificate/detail.vue @@ -231,10 +231,10 @@ - + - + diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 77912a1..472cb1e 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -212,7 +212,7 @@ [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: 'sbyzzycqkczgl', // 异常情况处置管理 // 计量检定业务 - [SCHEDULE.CERTIFICATE_APPROVAL]: 'jljdywzsspgl', // 检定审批管理 + [SCHEDULE.CERTIFICATE_APPROVAL]: '/businessCertificate/detail', // 检定审批管理 [SCHEDULE.CERTIFICATE_PRINT_APPROVAL]: 'jljdywzsgl', // 证书管理 [SCHEDULE.CERTIFICATE_CHANGE_APPROVAL]: 'jljdywzsbchghsqd', // 证书/报告补充或更换申请单 [SCHEDULE.SUBPACKAGE_DIRECTORIES_APPROVAL]: 'jljdywcsjzhgfbfml', // 测试、校准或检定合格分包方名录 diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 4b9f536..41dc21b 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -142,7 +142,7 @@ let getId = '' if (form.configType === 'add') { const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.dat + getId = res.data } else { const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) diff --git a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue b/src/views/business/taskMeasure/certificate/components/approvalRecord.vue deleted file mode 100644 index cf6fae7..0000000 --- a/src/views/business/taskMeasure/certificate/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/taskMeasure/certificate/components/basic.vue b/src/views/business/taskMeasure/certificate/components/basic.vue index 7b71b09..8ad025c 100644 --- a/src/views/business/taskMeasure/certificate/components/basic.vue +++ b/src/views/business/taskMeasure/certificate/components/basic.vue @@ -35,6 +35,7 @@ originalRecordFile: '', // 原始记录 }) const infoId = ref('') // id +const getMeasureDataId = ref('') // 检定数据id const approvalStatusName = ref('') // 审批状态名称 // ---------------------------------------标签--------------------------------------------- const radioMenus = ref([ // 标签内容 @@ -98,13 +99,21 @@ loading.close() form.value.originalRecordFile = res.data.originalRecordFile // 原始记录 form.value.certificateFile = res.data.certificateFile // 检定证书 + form.value.sampleName = res.data.sampleName // 被检设备名称 + form.value.model = res.data.model // 规格型号 + form.value.manufacturingNo = res.data.manufactureNo// 出厂编号 + getMeasureDataId.value = res.data.dataId emits('reportData', res.data.certificateFile, res.data.originalRecordFile) // } }) } // -------------------------------------------------------------------------------------- - +watch(() => props.measureDataId, (newValue) => { + if (newValue) { + getMeasureDataId.value = newValue + } +}, { immediate: true }) onMounted(async () => { await getDict() // 获取字典 form.value.sampleName = $route.query.sampleName as string// 被检设备名称 @@ -152,5 +161,5 @@ - + diff --git a/src/views/business/taskMeasure/certificate/detail.vue b/src/views/business/taskMeasure/certificate/detail.vue index 89d8275..abe45de 100644 --- a/src/views/business/taskMeasure/certificate/detail.vue +++ b/src/views/business/taskMeasure/certificate/detail.vue @@ -231,10 +231,10 @@ - + - + diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue index ea0ebd8..ba481c7 100644 --- a/src/views/workbench/approve/list.vue +++ b/src/views/workbench/approve/list.vue @@ -126,21 +126,29 @@ // 跳转详情页 const detail = (row: any) => { - // updateApprovalStatus({ids: [row.id]}) - // const formId = row.formId - - // $router.push({ - // path: `${WORKPATHS[name]}/detail/${row.businessId}`, - // query: { - // id: row.businessId, - // type: 'detail', - // approvalStatusName: '全部', - // standardNo: row.businessCode, // 标准装置编号 - // equipmentNo: row.businessCode, // 设备编号 - // standardName: row.extraContent, // 标准装置名称 - // standardId: row.businessId, // id - // }, - // }) + // updateApprovalStatus({ ids: [row.id] }) + const formId = row.formId + // approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称 + // processId: row.processId, // 流程实例id + // taskId: row.taskId, // 任务id + // sampleName: row.sampleName, // 被检设备名称 + // model: row.model, // 规格型号 + // manufacturingNo: row.manufactureNo, // 出厂编号 + // measureDataId: row.dataId, // 检定数据id + $router.push({ + path: `${formIdUrl[formId]}/${row.bizId}`, + query: { + id: row.bizId, + type: 'detail', + approvalStatusName: '全部', + processId: row.processId, // 流程实例id + taskId: row.taskId, // 任务id + // sampleName: row.sampleName, // 被检设备名称 + // model: row.model, // 规格型号 + // manufacturingNo: row.manufactureNo, // 出厂编号 + // measureDataId: row.dataId, // 检定数据id + }, + }) } // 时间变更