diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue index c2ab542d..0d5bf4b1 100644 --- a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue +++ b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue @@ -186,20 +186,21 @@ const getList = async () => { if (!props.recipeId) { list.value = [] total.value = 0 + detailList.value = [] + to.value = 0 return } loading.value = true try { if (activeTab.value === 'manual') { const data = await RecipePointRecordApi.getRecipePointRecordPage(buildQueryParams()) - list.value = data.list - total.value = data.total + list.value = data.list + total.value = data.total } else { const d = await RecipeDeviceRecordApi.getRecipeDeviceRecordPage(buildQueryParams()) - detailList.value = d.list - to.value = d.total + detailList.value = d.list + to.value = d.total } - } finally { loading.value = false } @@ -219,15 +220,15 @@ watch( () => props.recipeId, () => { queryParams.pageNo = 1 - // if (activeTab.value === 'manual') getList() - } + }, + { immediate: true } ) watch( () => activeTab.value, (tab) => { - // if (tab === 'manual') + queryParams.pageNo = 1 getList() } ) diff --git a/src/views/formula/formulaLibrary/index.vue b/src/views/formula/formulaLibrary/index.vue index 45113b53..eda13f80 100644 --- a/src/views/formula/formulaLibrary/index.vue +++ b/src/views/formula/formulaLibrary/index.vue @@ -1,44 +1,24 @@