From 720496569ec946b00823ce62fa2da0f885423d29 Mon Sep 17 00:00:00 2001 From: yinq Date: Sat, 8 Feb 2025 14:58:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=BB=E6=95=B0=E6=8D=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=B7=AF=E7=94=B1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/masterData/index.vue | 4 ++-- src/views/system/masterDataDetail/index.vue | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/system/masterData/index.vue b/src/views/system/masterData/index.vue index 40b3dc9..0d86b16 100644 --- a/src/views/system/masterData/index.vue +++ b/src/views/system/masterData/index.vue @@ -69,7 +69,7 @@ - + @@ -148,7 +148,7 @@ - + diff --git a/src/views/system/masterDataDetail/index.vue b/src/views/system/masterDataDetail/index.vue index 5078711..560641e 100644 --- a/src/views/system/masterDataDetail/index.vue +++ b/src/views/system/masterDataDetail/index.vue @@ -259,9 +259,8 @@ const data = reactive>({ const {queryParams, form, rules} = toRefs(data); -console.log({ queryParam:Object.keys(router.currentRoute.value.query).length>0 ? JSON.stringify(router.currentRoute.value.query):'{"router": "brand"}' }); -const routeParam = ref({ queryParam:Object.keys(router.currentRoute.value.query).length>0 ? JSON.stringify(router.currentRoute.value.query):'{"router": "brand"}' }) +const routeParam = ref({ queryParam:Object.keys(router.currentRoute.value.query).length>0 ? router.currentRoute.value.query.router : 'null' }) const masterDataTitle = ref() const tableTh = ref([]) const masterDataId = ref() @@ -272,7 +271,6 @@ const isTree = ref(false) listMasterData(routeParam.value).then(e => { let data = e.rows?.[0] ||{} isTree.value = data.parentFlag === '1' - console.log(data) masterDataId.value = data.masterDataId masterDataTitle.value = data.masterDataTitle let fieldNameList = ['1','2','3','4','5'] @@ -291,6 +289,9 @@ listMasterData(routeParam.value).then(e => { /** 查询主数据维护明细列表 */ const getList = async () => { + // const currentRoute = router.currentRoute.value.query; + // console.log("::", currentRoute.router); + loading.value = true; const res = await listMasterDataDetail({...queryParams.value,masterDataId:masterDataId.value}); masterDataDetailList.value = res.rows;