11

ruoyi-screen/src/utils/useDialogStatYearSync.js

@@ -0,0 +1,38 @@
+import { watch } from 'vue'
+import { useStatYear } from '@/stores/statYear'
+
+/**
+ * 弹框年份单向跟随全局统计年份：
+ * - 全局年变化 → 写入 query.statYear
+ * - 弹框内改年份不影响全局
+ *
+ * @param {{ statYear: number|string|undefined }} query 弹框查询对象（需含 statYear）
+ * @param {{ visible?: import('vue').Ref<boolean>, onSynced?: () => void }} [options]
+ * @returns {{ syncDialogYearFromGlobal: () => void }}
+ */
+export function useDialogStatYearSync(query, options = {}) {
+  const { visible, onSynced } = options
+  const { statYear } = useStatYear()
+
+  function parseGlobalYear() {
+    const y = Number(statYear.value)
+    return Number.isFinite(y) ? y : undefined
+  }
+
+  /** 将当前全局统计年写入弹框年份 */
+  function syncDialogYearFromGlobal() {
+    query.statYear = parseGlobalYear()
+  }
+
+  watch(
+    () => statYear.value,
+    () => {
+      syncDialogYearFromGlobal()
+      if (visible?.value && typeof onSynced === 'function') {
+        onSynced()
+      }
+    }
+  )
+
+  return { syncDialogYearFromGlobal }
+}

ruoyi-screen/src/views/commonProsperity/ProjectTypeDetailDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getCommonProsperityProjectTypeDetails } from '@/api/commonProsperity'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 
 const props = defineProps({
   modelValue: { type: Boolean, default: false }
@@ -28,6 +29,15 @@ const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
 
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
+
 async function fetchList() {
   loading.value = true
   try {
@@ -53,13 +63,13 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   pageNum.value = 1
   fetchList()
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   pageNum.value = 1
   fetchList()
 }

ruoyi-screen/src/views/home/BreedingEntityQuantityDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getBreedingEntityQuantities } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -68,7 +78,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -81,7 +91,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/CooperativeDevelopmentDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getCooperativeDevelopments } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const TAB_BASIC = 'basic'
@@ -56,6 +57,15 @@ const pageSize = ref(10)
 const activeTab = ref(TAB_BASIC)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function parseBusinessScopeList(value) {
@@ -109,7 +119,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -123,7 +133,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/FamilyRanchDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getFamilyRanches } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const TAB_BASIC = 'basic'
@@ -45,6 +46,15 @@ const pageSize = ref(10)
 const activeTab = ref(TAB_BASIC)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -79,7 +89,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -93,7 +103,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/FarmerHouseholdDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getFarmerHouseholds } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const TAB_CAP_FLOOR = 'capFloor'
@@ -39,6 +40,15 @@ const pageSize = ref(10)
 const activeTab = ref(TAB_CAP_FLOOR)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -73,7 +83,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -87,7 +97,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/GrasslandAreaDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getFarmerHouseholds } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -68,7 +78,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -81,7 +91,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/HerdInventoryDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getYakHerdInventories } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -68,7 +78,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -81,7 +91,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/ImbalanceWarningDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getGrassLivestockImbalanceWarnings } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -36,6 +37,15 @@ const pageSize = ref(10)
 /** 弹框年份：2021～当年 */
 const yearSelectOptions = buildScreenYearOptions()
 
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function familyRanchName(row) {
@@ -86,7 +96,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -99,7 +109,7 @@ function onTownChange() {
 }
 
 async function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/LivestockOutboundDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getYakOutboundReports } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const OUTBOUND_TOTAL_PROPS = [
@@ -43,6 +44,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function toNum(val) {
@@ -94,7 +104,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -107,7 +117,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/LivestockOwnershipDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getLivestockOwnershipHouseholds } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 /** 接口无村居数字段；本表为村×年月粒度，有村则计 1 */
@@ -76,7 +86,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -89,7 +99,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/PerCapitaIncomeDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getPerCapitaIncomes } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 
 const props = defineProps({
   modelValue: { type: Boolean, default: false }
@@ -29,6 +30,15 @@ const pageSize = ref(10)
 /** 弹框年份：2021～当年 */
 const yearSelectOptions = buildScreenYearOptions()
 
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
+
 function formatPercent(val) {
   if (val === null || val === undefined || val === '') {
     return displayEmpty(null)
@@ -65,13 +75,13 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   pageNum.value = 1
   fetchList()
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   pageNum.value = 1
   fetchList()
 }

ruoyi-screen/src/views/home/SelfConsumptionDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getYakOutboundReports } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function toNum(val) {
@@ -87,7 +97,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -100,7 +110,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/YakHerdInventoryDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getYakHerdInventories } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -68,7 +78,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -81,7 +91,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/home/YakInventoryOutboundDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getYakInventoryOutbounds } from '@/api/home'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 async function fetchList() {
@@ -68,7 +78,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -81,7 +91,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/livestockResources/ProductOutputDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getLivestockProductOutputs } from '@/api/livestockResources'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function formatOutput(val) {
@@ -79,7 +89,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -92,7 +102,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined

ruoyi-screen/src/views/livestockResources/ThreeAssetsProblemReportDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getThreeAssetsProblemReports } from '@/api/livestockResources'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
 
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
+
 async function fetchList() {
   loading.value = true
   try {
@@ -65,7 +75,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.townDeptId = undefined
   query.villageDeptId = undefined
   pageNum.value = 1
@@ -77,7 +87,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.townDeptId = undefined
   query.villageDeptId = undefined
   pageNum.value = 1

ruoyi-screen/src/views/livestockResources/VaccinationDataDialog.vue

@@ -4,6 +4,7 @@ import ScreenModal from '@/components/ScreenModal.vue'
 import { getLivestockVaccinationData } from '@/api/livestockResources'
 import { displayEmpty } from '@/utils/displayEmpty'
 import { buildScreenYearOptions } from '@/utils/screenYearOptions'
+import { useDialogStatYearSync } from '@/utils/useDialogStatYearSync'
 import { useScreenTownVillageOptions } from '@/utils/screenTownVillage'
 
 const props = defineProps({
@@ -34,6 +35,15 @@ const pageNum = ref(1)
 const pageSize = ref(10)
 
 const yearSelectOptions = buildScreenYearOptions()
+
+const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
+  visible,
+  onSynced: () => {
+    pageNum.value = 1
+    fetchList()
+  }
+})
+
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
 function formatRate(val) {
@@ -79,7 +89,7 @@ function handleSearch() {
 }
 
 function handleReset() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined
@@ -92,7 +102,7 @@ function onTownChange() {
 }
 
 function onOpen() {
-  query.statYear = undefined
+  syncDialogYearFromGlobal()
   query.statMonth = undefined
   query.townDeptId = undefined
   query.villageDeptId = undefined