diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue index a4da51c..71e49b1 100644 --- a/src/views/equipement/info/book/components/certificate.vue +++ b/src/views/equipement/info/book/components/certificate.vue @@ -72,7 +72,7 @@ // 点击证书编号 const handleClickFollowLink = (row: any, title: string) => { $router.push({ - path: `/source/resultConfirmDoc/detail/${row.equipmentId}`, + path: `/source/resultConfirmDoc/detail/${row.confirmId}`, query: { approvalStatusName: '全部', // 审批状态名称 }, diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue index a4da51c..71e49b1 100644 --- a/src/views/equipement/info/book/components/certificate.vue +++ b/src/views/equipement/info/book/components/certificate.vue @@ -72,7 +72,7 @@ // 点击证书编号 const handleClickFollowLink = (row: any, title: string) => { $router.push({ - path: `/source/resultConfirmDoc/detail/${row.equipmentId}`, + path: `/source/resultConfirmDoc/detail/${row.confirmId}`, query: { approvalStatusName: '全部', // 审批状态名称 }, diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue index a416411..c64d28d 100644 --- a/src/views/equipement/source/resultConfirm/components/basic.vue +++ b/src/views/equipement/source/resultConfirm/components/basic.vue @@ -832,7 +832,7 @@ *{{ item.text }} diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue index a4da51c..71e49b1 100644 --- a/src/views/equipement/info/book/components/certificate.vue +++ b/src/views/equipement/info/book/components/certificate.vue @@ -72,7 +72,7 @@ // 点击证书编号 const handleClickFollowLink = (row: any, title: string) => { $router.push({ - path: `/source/resultConfirmDoc/detail/${row.equipmentId}`, + path: `/source/resultConfirmDoc/detail/${row.confirmId}`, query: { approvalStatusName: '全部', // 审批状态名称 }, diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue index a416411..c64d28d 100644 --- a/src/views/equipement/source/resultConfirm/components/basic.vue +++ b/src/views/equipement/source/resultConfirm/components/basic.vue @@ -832,7 +832,7 @@ *{{ item.text }} diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue index b89c20b..8287ea4 100644 --- a/src/views/equipement/source/resultConfirm/list.vue +++ b/src/views/equipement/source/resultConfirm/list.vue @@ -572,14 +572,14 @@ } // ------------------------------------------钩子------------------------------------------------ -watch(dateRange, (val) => { +watch(dateRange, (val) => { // 检定有效期 if (val) { - listQuery.value.createTimeStart = `${val[0]}` - listQuery.value.createTimeEnd = `${val[1]}` + listQuery.value.measureValidDateStart = `${val[0]}` + listQuery.value.measureValidDateEnd = `${val[1]}` } else { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' + listQuery.value.measureValidDateStart = '' + listQuery.value.measureValidDateEnd = '' } }) watch(planTraceTimeDateRange, (val) => { @@ -760,7 +760,7 @@ diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue index b89c20b..8287ea4 100644 --- a/src/views/equipement/source/resultConfirm/list.vue +++ b/src/views/equipement/source/resultConfirm/list.vue @@ -572,14 +572,14 @@ } // ------------------------------------------钩子------------------------------------------------ -watch(dateRange, (val) => { +watch(dateRange, (val) => { // 检定有效期 if (val) { - listQuery.value.createTimeStart = `${val[0]}` - listQuery.value.createTimeEnd = `${val[1]}` + listQuery.value.measureValidDateStart = `${val[0]}` + listQuery.value.measureValidDateEnd = `${val[1]}` } else { - listQuery.value.createTimeStart = '' - listQuery.value.createTimeEnd = '' + listQuery.value.measureValidDateStart = '' + listQuery.value.measureValidDateEnd = '' } }) watch(planTraceTimeDateRange, (val) => { @@ -760,7 +760,7 @@