diff --git a/src/views/warning/edit.vue b/src/views/warning/edit.vue index 5c0e2d4..bfacf2b 100644 --- a/src/views/warning/edit.vue +++ b/src/views/warning/edit.vue @@ -158,6 +158,7 @@ const auditEndWarning = async () => { router.push({ path: "/warning", query: { + ...JSON.parse(route.query.listQuery || '{}'), refresh: Date.now() } }) diff --git a/src/views/warning/index.vue b/src/views/warning/index.vue index 46855c6..2409cc0 100644 --- a/src/views/warning/index.vue +++ b/src/views/warning/index.vue @@ -8,9 +8,13 @@ const route = useRoute() const loading =ref(false) const total =ref(10) const tableData =ref([]) -const query =ref({ - size:10, - current:1 +const query = ref({ + size: Number(route.query.size) || 10, + current: Number(route.query.current) || 1, + reportName: route.query.reportName || '', + projectUnitId: route.query.projectUnitId || '', + auditUnitId: route.query.auditUnitId || '', + warningState: route.query.warningState || '', }) const reset =()=>{ query.value={ @@ -28,15 +32,17 @@ const getList = async ()=>{ const router = useRouter(); const editFun = (row) =>{ console.log('row',row) - let query ={ + const listQuery = query.value + let routeQuery ={ isEnd:row.reportType === "项目控制价", reportId:row.id, isEdit:true, backPath:'/warning', + listQuery: JSON.stringify(listQuery) } router.push({ path:`/warning/edit`, - query: query + query: routeQuery }); } getList()