diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue new file mode 100644 index 0000000..04db5ba --- /dev/null +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -0,0 +1,92 @@ + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue new file mode 100644 index 0000000..04db5ba --- /dev/null +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -0,0 +1,92 @@ + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 6c422c7..0f47bc0 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -23,6 +23,7 @@ const props = defineProps({ infoId: String, // id dataNo: String, // 检定数据编号 + batchIndex: Number, // 批量编辑序号 }) const emits = defineEmits(['giveInfoId']) const user = useUserStore() // 用户信息 @@ -93,7 +94,15 @@ infoId.value = $route.params.id as string } } - +// 批量编辑 +const batchEditRow = ref() +if ($route.query.batchEdit) { + console.log(props.batchIndex, 'props.batchIndex') + pageType.value = 'edit' + batchEditRow.value = JSON.parse($route.query.batchEditRow as string) + infoId.value = batchEditRow.value[props.batchIndex].id + // $route.query = JSON.parse($route.query.batchEditRow as string)[props.batchIndex] +} // --------------------------------------------字典-------------------------------------- const workingLinearEquationList = ref([])// 工作直线方程 const measureMediumList = ref([])// 检定介质 @@ -333,9 +342,9 @@ id: infoId.value, belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 我的任务跳转过来如果已经配置过检定项了,到编辑页面,且用一下三个字段替代传id请求详情 - itemId: $route.query.itemId, // 检定项id - orderId: $route.query.orderId, // 任务单id - sampleId: $route.query.sampleId, // 被检设备id + itemId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId, // 检定项id + orderId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].orderId : $route.query.orderId, // 任务单id + sampleId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].sampleId : $route.query.sampleId, // 被检设备id }) // 有关于检定项的数据 itemFormData.value.itemId = res.data.itemId // 检定项id @@ -938,15 +947,20 @@ }, { immediate: true }) onMounted(() => { - eqptEquipmentId.value = $route.query.sampleId as string // 受检设备id - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 + // $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number] + eqptEquipmentId.value = $route.query.batchEdit ? batchEditRow.value[props.batchIndex].sampleId : $route.query.sampleId as string // 受检设备id + itemFormData.value.itemCategoryName = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemCategoryName : $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipment : $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipmentName : $route.query.belongStandardEquipmentName as string// 标准装置名称 if (pageType.value === 'add') { // 从我的任务跳转过来(新增) - itemFormData.value.itemId = $route.query.itemId as string// 检定项id + itemFormData.value.itemId = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId as string// 检定项id // 查输入值(查检定项管理的详情) - fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) + fetchItemInfo( + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId as string, + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemCategoryName : $route.query.itemCategoryName as string, + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipment : $route.query.belongStandardEquipment as string, + ) } else { fetchInfo() diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue new file mode 100644 index 0000000..04db5ba --- /dev/null +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -0,0 +1,92 @@ + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 6c422c7..0f47bc0 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -23,6 +23,7 @@ const props = defineProps({ infoId: String, // id dataNo: String, // 检定数据编号 + batchIndex: Number, // 批量编辑序号 }) const emits = defineEmits(['giveInfoId']) const user = useUserStore() // 用户信息 @@ -93,7 +94,15 @@ infoId.value = $route.params.id as string } } - +// 批量编辑 +const batchEditRow = ref() +if ($route.query.batchEdit) { + console.log(props.batchIndex, 'props.batchIndex') + pageType.value = 'edit' + batchEditRow.value = JSON.parse($route.query.batchEditRow as string) + infoId.value = batchEditRow.value[props.batchIndex].id + // $route.query = JSON.parse($route.query.batchEditRow as string)[props.batchIndex] +} // --------------------------------------------字典-------------------------------------- const workingLinearEquationList = ref([])// 工作直线方程 const measureMediumList = ref([])// 检定介质 @@ -333,9 +342,9 @@ id: infoId.value, belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 我的任务跳转过来如果已经配置过检定项了,到编辑页面,且用一下三个字段替代传id请求详情 - itemId: $route.query.itemId, // 检定项id - orderId: $route.query.orderId, // 任务单id - sampleId: $route.query.sampleId, // 被检设备id + itemId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId, // 检定项id + orderId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].orderId : $route.query.orderId, // 任务单id + sampleId: $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].sampleId : $route.query.sampleId, // 被检设备id }) // 有关于检定项的数据 itemFormData.value.itemId = res.data.itemId // 检定项id @@ -938,15 +947,20 @@ }, { immediate: true }) onMounted(() => { - eqptEquipmentId.value = $route.query.sampleId as string // 受检设备id - itemFormData.value.itemCategoryName = $route.query.itemCategoryName as string// 设备检定项分类名称 + // $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number] + eqptEquipmentId.value = $route.query.batchEdit ? batchEditRow.value[props.batchIndex].sampleId : $route.query.sampleId as string // 受检设备id + itemFormData.value.itemCategoryName = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemCategoryName : $route.query.itemCategoryName as string// 设备检定项分类名称 itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id - itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code - itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 + itemFormData.value.belongStandardEquipment = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipment : $route.query.belongStandardEquipment as string// 标准装置code + itemFormData.value.belongStandardEquipmentName = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipmentName : $route.query.belongStandardEquipmentName as string// 标准装置名称 if (pageType.value === 'add') { // 从我的任务跳转过来(新增) - itemFormData.value.itemId = $route.query.itemId as string// 检定项id + itemFormData.value.itemId = $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId as string// 检定项id // 查输入值(查检定项管理的详情) - fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string) + fetchItemInfo( + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemId : $route.query.itemId as string, + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].itemCategoryName : $route.query.itemCategoryName as string, + $route.query.batchEdit ? batchEditRow.value[props.batchIndex as Number].belongStandardEquipment : $route.query.belongStandardEquipment as string, + ) } else { fetchInfo() diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index bd21b34..0d03959 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -29,6 +29,14 @@ import CanvasCom from '@/views/business/taskMeasure/print/components/canvas/canvas.vue' import printThreeInfo from '@/views/business/taskMeasure/print/components/label/printThreeInfo.vue' import { printHtml, printImage } from '@/utils/printUtils' +// 批量修改时使用 +const $props = defineProps({ + // 标识第几个(用来取路由数组里面的数据) + batchIndex: { + type: Number, + default: 0, + }, +}) const user = useUserStore() // 用户信息 const textMap: { [key: string]: string } = { edit: '编辑', @@ -63,6 +71,11 @@ infoId.value = $route.params.id as string } } +// 批量编辑 +if ($route.query.batchEdit) { + pageType.value = 'edit' + infoId.value = JSON.parse($route.query.batchEditRow as string)[$props.batchIndex].id +} // -------------------------------------------按钮---------------------------------------------- // 关闭新增页面的回调 const close = () => { @@ -573,7 +586,13 @@ } }) } - +const getFormRef = () => { + return templateDetailRef.value.templateFormAndTableRef.ruleFormRef +} +const setDetail = () => { + pageType.value = 'detail' + templateDetailRef.value.pageType = 'detail' +} // 生成证书处理参数 const solveRecordParams = () => { let params: any @@ -774,11 +793,15 @@ const batchEditRow = ref([]) as any // 批量编辑数据 const isBatchEdit = ref(false) as any // 批量编辑数据 onMounted(async () => { - isBatchEdit.value = `${$route.query.batchEdit}` + isBatchEdit.value = $route.query.batchEdit console.log('isBatchEdit.value', isBatchEdit.value) if (isBatchEdit.value === 'true') { console.log('批量编辑从前一页获取的数据', JSON.parse($route.query.batchEditRow as string)) batchEditRow.value = JSON.parse($route.query.batchEditRow as string) + itemCategoryName.value = batchEditRow.value[$props.batchIndex].itemCategoryName as string || '' // 检定项分类名称 + itemCategoryId.value = batchEditRow.value[$props.batchIndex].itemCategoryId as string || '' // 检定项分类id + belongStandardEquipment.value = batchEditRow.value[$props.batchIndex].belongStandardEquipment as string || ''// 标准装置code + belongStandardEquipmentName.value = batchEditRow.value[$props.batchIndex].belongStandardEquipmentName as string || ''// 标准装置名称 } else { itemCategoryName.value = $route.query.itemCategoryName as string || '' // 检定项分类名称 @@ -800,6 +823,14 @@ // document.body.appendChild(link) // link.click() } + +defineExpose({ + save, + getFormRef, + check, + solveSaveParams, + setDetail, +})