diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue index fb24253a..85776be5 100644 --- a/src/views/erp/stock/record/index.vue +++ b/src/views/erp/stock/record/index.vue @@ -16,12 +16,6 @@ - - - - - @@ -66,6 +60,15 @@ + + + + @@ -83,12 +86,6 @@ sortable /> - - - { showAllFilters.value = !showAllFilters.value @@ -229,6 +227,15 @@ const handleQuery = () => { /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() + activeName.value = '' + queryParams.categoryType = undefined + handleQuery() +} + +const handleTabClick = (tab: any) => { + const value = String(tab.paneName || '') + activeName.value = value + queryParams.categoryType = value ? Number(value) : undefined handleQuery() } diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue index 1c7a16e6..cf131c6c 100644 --- a/src/views/erp/stock/stock/index.vue +++ b/src/views/erp/stock/stock/index.vue @@ -27,21 +27,6 @@ - - - - - + + + + - - - @@ -188,6 +177,7 @@ const queryParams = reactive<{ }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 +const activeName = ref('') const productList = ref([]) // 产品列表 const warehouseList = ref([]) // 仓库列表 const categoryTypeOptions = computed(() => getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)) @@ -256,6 +246,15 @@ const handleQuery = () => { /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() + activeName.value = '' + queryParams.categoryType = undefined + handleQuery() +} + +const handleTabClick = (tab: any) => { + const value = String(tab.paneName || '') + activeName.value = value + queryParams.categoryType = value ? Number(value) : undefined handleQuery() }