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;