diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index aa6e8a3f..d03a9301 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -40,7 +40,7 @@ import {RouteRecordRaw} from "vue-router"; const props = defineProps({ item: { - type: Object as PropType, + type: Object, required: true }, isNest: { @@ -55,7 +55,7 @@ const props = defineProps({ const onlyOneChild = ref(); -function hasOneShowingChild(children = [] as any, parent: RouteRecordRaw) { +function hasOneShowingChild(children = [] as any, parent: any) { if (!children) { children = []; } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 78ed559e..3dfb29aa 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -68,8 +68,8 @@ const {ctx} = getCurrentInstance() as any const router = useRouter() const route = useRoute(); -const visitedViews = computed(() => tagsViewStoreHook().visitedViews) -const routes = computed(() => usePermissionStoreHook().routes) +const visitedViews = computed(() => tagsViewStoreHook().visitedViews) +const routes = computed(() => usePermissionStoreHook().routes) const affixTags = ref([]); const visible = ref(false); diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue index a0ea690d..b17b21bc 100644 --- a/src/views/oms/order/index.vue +++ b/src/views/oms/order/index.vue @@ -172,7 +172,8 @@ const state = reactive({ queryParams: { pageNum: 1, pageSize: 10, - orderSn: undefined + orderSn: undefined, + status:undefined }, pageList: [], total: 0, @@ -223,7 +224,8 @@ function resetQuery() { state.queryParams = { pageNum: 1, pageSize: 10, - orderSn: undefined + orderSn: undefined, + status: undefined } handleQuery() } diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue index 9862f621..f199cd2f 100644 --- a/src/views/pms/category/components/Attribute.vue +++ b/src/views/pms/category/components/Attribute.vue @@ -33,7 +33,7 @@ circle plain size="mini" - @click.prevent="handleAdd(index)" + @click.prevent="handleAdd()" style="margin-left: 15px" /> diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue index c405d9fa..3e03bfb8 100644 --- a/src/views/pms/goods/components/GoodsAttribute.vue +++ b/src/views/pms/goods/components/GoodsAttribute.vue @@ -31,7 +31,7 @@