123

doc/产业数据模型及服务/牦牛存栏数据填报/牦牛存栏数据填报前端技术方案.md

@@ -0,0 +1,104 @@
+# 牦牛存栏数据填报 — 前端技术方案
+
+> 依据：同目录 `牦牛存栏数据填报功能需求.md`、`牦牛存栏数据填报技术方案.md`；布局对齐 `dataModel/grassland/index.vue`（双 `el-card` + 分页表格）；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/yakHerdInventory/index.vue` |
+| **组件名** | `YakHerdInventory` |
+| **菜单配置** | 组件路径：`dataModel/yakHerdInventory/index`（「产业数据模型及服务」目录下） |
+| **权限前缀** | `dataModel:yakHerdInventory:list\|query\|add\|edit\|remove\|import` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/yakHerdInventory.js` |
+| **Base** | `/dataModel/yakHerdInventory` |
+
+| 方法 | HTTP | 说明 |
+| --- | --- | --- |
+| `listYakHerdInventory` | GET | `/list` 分页列表 |
+| `getYakHerdInventory` | GET | `/{id}` 详情 |
+| `addYakHerdInventory` | POST | `/` 新增 |
+| `updateYakHerdInventory` | PUT | `/` 修改 |
+| `delYakHerdInventory` | DELETE | `/{ids}` 删除 |
+| `listYakHerdInventoryYearOptions` | GET | `/yearOptions` 可选年份 |
+| `listYakHerdInventoryTownOptions` | GET | `/townOptions` 乡镇下拉 |
+| `importYakHerdInventory` | POST | `/importData`（`multipart/form-data`：`file` + `statYear`） |
+
+模板下载使用 `downloadYakHerdInventoryTemplate()`（**GET** + `responseType: 'blob'`），勿用若依全局 `this.download()`（固定 **POST**，仅适用于导出类接口）。
+
+---
+
+## 3. 页面结构
+
+1. **筛选区**：所属年份（`yearOptions`）、所属乡镇（`townOptions`）；**搜索**、**重置**、**新增**、**导入**。  
+2. **列表区**：所属年份、乡镇、村居数、牧户数、存栏数、公牛存栏数、母牛存栏数；空值展示 `—`。  
+3. **操作列**：查看、修改、删除。  
+4. **新增/编辑弹窗**：年份/乡镇必填；存栏指标必填，`el-input-number`（`:min="0"` `:precision="0"`，非负整数）；备注选填。  
+5. **查看弹窗**：全字段只读（含预留村居、审计信息）；可跳转编辑。  
+6. **导入弹窗**：先选「填报年份」→ 上传 `.xlsx` → 展示 insert/update/fail 及 fail/warn 明细。
+
+**本期前端不实现**：Excel 导出（后端已有 `/export`，需求 §3 标注后续立项）。
+
+---
+
+## 4. 业务规则（前端）
+
+| 规则 | 实现 |
+| --- | --- |
+| 年份范围 | 由 `/yearOptions` 动态加载（当前年起向前 5 年） |
+| 乡镇下拉 | `/townOptions` 返回 `deptId` / `deptName` |
+| 列表筛选 | `statYear`、`townDeptId` 精确匹配 |
+| 存栏数字 | 必填；须为大于等于 0 的整数 |
+| 唯一性 | 同年同乡镇重复由后端拦截，前端展示 `msg` |
+| 导入 | `FormData` 提交；成功后 `$alert` 展示摘要与明细 |
+| 删除 | `$modal.confirm` 后 `delYakHerdInventory(id)` |
+| 预留村居 | 详情展示 `villageDeptId` / `villageName`；表单本期不编辑 |
+
+---
+
+## 5. 国际化
+
+| 项 | 说明 |
+| --- | --- |
+| **语言包** | `dataModel.yakHerdInventory`、`dataModel.common` |
+| **文件** | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+| **Mixin** | `dataModelLocaleMixin`，`dmNs = 'yakHerdInventory'`，`dmT` / `dmCommon` |
+| **注册** | 已随 `dataModel` 模块在 `lang/zh-CN.js`、`lang/bo.js` 引入 |
+
+---
+
+## 6. 联调说明
+
+1. 部署后端 `BizYakHerdInventoryController` 及 `biz_yak_herd_inventory` 表。  
+2. 菜单组件 `dataModel/yakHerdInventory/index`，权限与后端 §5 一致。  
+3. 执行 `sql/biz_yak_herd_inventory.sql`（及乡镇 `sys_dept` 数据）。  
+4. 验证：年份/乡镇筛选、CRUD、导入模板下载、导入结果反馈、双语切换。  
+5. 导入联调：选填报年份 → 上传 `2026年.xlsx` 格式文件；开发环境对照后端日志与 `failMessages`。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/yakHerdInventory/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/yakHerdInventory.js` |
+| Mixin | `ruoyi-ui/src/mixins/dataModelLocaleMixin.js` |
+| i18n | `ruoyi-ui/src/lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：列表/CRUD/详情/导入/模板下载；汉藏 i18n；对齐功能需求 v1.3 |

ruoyi-ui/src/api/dataModel/yakHerdInventory.js

@@ -0,0 +1,94 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listYakHerdInventory(query) {
+  return request({
+    url: "/dataModel/yakHerdInventory/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getYakHerdInventory(id) {
+  return request({
+    url: "/dataModel/yakHerdInventory/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addYakHerdInventory(data) {
+  return request({
+    url: "/dataModel/yakHerdInventory",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateYakHerdInventory(data) {
+  return request({
+    url: "/dataModel/yakHerdInventory",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delYakHerdInventory(ids) {
+  return request({
+    url: "/dataModel/yakHerdInventory/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份（当前年起向前 5 年） */
+export function listYakHerdInventoryYearOptions() {
+  return request({
+    url: "/dataModel/yakHerdInventory/yearOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listYakHerdInventoryTownOptions() {
+  return request({
+    url: "/dataModel/yakHerdInventory/townOptions",
+    method: "get"
+  })
+}
+
+/** Excel 导入（multipart/form-data，file 为 el-upload 的 raw File） */
+export function importYakHerdInventory(file, statYear) {
+  const formData = new FormData()
+  formData.append("file", file, file.name)
+  formData.append("statYear", String(statYear))
+  return request({
+    url: "/dataModel/yakHerdInventory/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET，后端 @GetMapping("/importTemplate")） */
+export function downloadYakHerdInventoryTemplate() {
+  return request({
+    url: "/dataModel/yakHerdInventory/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/** 按年份导出（GET，后端 @GetMapping("/export")） */
+export function exportYakHerdInventory(statYear) {
+  return request({
+    url: "/dataModel/yakHerdInventory/export",
+    method: "get",
+    params: { statYear },
+    responseType: "blob"
+  })
+}

ruoyi-ui/src/lang/bo/dataModel.js

@@ -19,6 +19,7 @@ export default {
     msgModOk: "བཟོ་བཅོས་ཟིན།",
     msgAddOk: "གསར་སྣོན་ཟིན།",
     ruleLen100: "ཡིག་ཆ་100ལས་མི་ཆོག",
+    ruleLen500: "ཡིག་ཆ་500ལས་མི་ཆོག",
     syncLoading: "གཞི་གྲངས་མཉམ་སྒྲིག་བཞིན... སྒུག་རོགས།"
   },
   status: {
@@ -272,5 +273,67 @@ export default {
     dateRangeInvalid: "འགོ་ཚེས་མཇུག་ཚེས་ལས་མི་ཆུག",
     actionViewAsset: "གཡག་ཡིག་ཆ་ལྟ།",
     emptyList: "ཉེན་བརྡ་མེད།"
+  },
+  yakHerdInventory: {
+    queryStatYear: "ལོ་ཚད།",
+    queryTown: "ཤང་གྲོང་།",
+    colStatYear: "ལོ་ཚད།",
+    colTownName: "ཤང་གྲོང་།",
+    colVillageCount: "གྲོང་ཚོ་གྲངས།",
+    colHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
+    colYakTotal: "གནས་ཚད།",
+    colBullTotal: "ཕོ་བ་གནས་ཚད།",
+    colCowTotal: "མོ་བ་གནས་ཚད།",
+    formStatYear: "ལོ་ཚད།",
+    formTown: "ཤང་གྲོང་།",
+    formVillageCount: "གྲོང་ཚོ་གྲངས།",
+    formHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
+    formYakTotal: "གཡག་གནས་ཚད།",
+    formBullTotal: "ཕོ་བ་གནས་ཚད།",
+    formCowTotal: "མོ་བ་གནས་ཚད།",
+    formBreedingBullCount: "རྒྱུད་ཕོ་བ།",
+    formBullCastratedCount: "ཕོ/སྤྱི་བ།",
+    formCowUnder1Count: "མོ 1 ལོ་མན།",
+    formCow13Count: "མོ 1-3 ལོ།",
+    formCow312Count: "མོ 3-12 ལོ།",
+    formCowOver12Count: "མོ 12 ལོ་ཡན།",
+    formRemark: "ཟིན་བྲིས།",
+    phRemark: "འདེམས་ཆོག ཡིག་ཆ་500ལས་མི་ཆོག",
+    formVillageDeptId: "གྲོང་ཚོ ID（预留）",
+    formVillageName: "གྲོང་ཚོ（预留）",
+    sectionBasic: "གཞི་རྩའི་ཆ་འཕྲིན།",
+    sectionInventory: "གནས་ཚད་གྲངས་ཀ།",
+    sectionReserved: "预留",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "模板下载",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatYearInvalid: "年份不在可选范围",
+    exportLoading: "正在导出...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择年份",
+    importTip: "先选年份再上传 .xlsx",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入：新增 {insert} 更新 {update} 失败 {fail}",
+    importWarnTitle: "警告",
+    importFailTitle: "失败明细",
+    dialogAdd: "[新增]牦牛存栏",
+    dialogEdit: "[编辑]牦牛存栏",
+    confirmDelete: "是否删除？",
+    emptyList: "暂无数据",
+    unitGe: "个",
+    unitHousehold: "户",
+    unitHead: "头",
+    ruleStatYearRequired: "请选择年份",
+    ruleTownRequired: "请选择乡镇",
+    ruleCountRequired: "请填写",
+    ruleCountNonNegative: "≥0 整数",
+    viewCreateBy: "创建人",
+    viewUpdateBy: "修改人",
+    viewUpdateTime: "修改时间"
   }
 }

ruoyi-ui/src/lang/zh/dataModel.js

@@ -19,6 +19,7 @@ export default {
     msgModOk: "修改成功",
     msgAddOk: "新增成功",
     ruleLen100: "长度不能超过 100 个字符",
+    ruleLen500: "长度不能超过 500 个字符",
     syncLoading: "正在同步数据，请稍候..."
   },
   status: {
@@ -272,5 +273,67 @@ export default {
     dateRangeInvalid: "开始日期不能晚于结束日期",
     actionViewAsset: "查看牦牛档案",
     emptyList: "暂无预警数据"
+  },
+  yakHerdInventory: {
+    queryStatYear: "所属年份",
+    queryTown: "所属乡镇",
+    colStatYear: "所属年份",
+    colTownName: "乡镇",
+    colVillageCount: "村居数",
+    colHerdsmanHouseholdCount: "牧户数",
+    colYakTotal: "存栏数",
+    colBullTotal: "公牛存栏数",
+    colCowTotal: "母牛存栏数",
+    formStatYear: "所属年份",
+    formTown: "所属乡镇",
+    formVillageCount: "村居数",
+    formHerdsmanHouseholdCount: "牧户数",
+    formYakTotal: "牦牛存栏数",
+    formBullTotal: "公牛存栏数",
+    formCowTotal: "母牛存栏数",
+    formBreedingBullCount: "种公牛存栏数",
+    formBullCastratedCount: "公牛/阉畜存栏数",
+    formCowUnder1Count: "1岁以下母牛存栏数",
+    formCow13Count: "1～3岁母牛存栏数",
+    formCow312Count: "3～12岁母牛存栏数",
+    formCowOver12Count: "12岁以上母牛存栏数",
+    formRemark: "备注",
+    phRemark: "选填，不超过 500 字",
+    formVillageDeptId: "所属村居ID（预留）",
+    formVillageName: "所属村居（预留）",
+    sectionBasic: "基本信息",
+    sectionInventory: "存栏指标",
+    sectionReserved: "预留字段",
+    btnImport: "导入",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatYearInvalid: "导出年份不在可选范围内",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importTip: "请先选择填报年份，再上传与模板格式一致的 .xlsx 文件",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]牦牛存栏数据",
+    dialogEdit: "[编辑]牦牛存栏数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitGe: "个",
+    unitHousehold: "户",
+    unitHead: "头",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleTownRequired: "请选择所属乡镇",
+    ruleCountRequired: "请填写该项",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    viewCreateBy: "创建人",
+    viewUpdateBy: "修改人",
+    viewUpdateTime: "修改时间"
   }
 }

ruoyi-ui/src/utils/request.js

@@ -31,6 +31,10 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  // FormData 上传须去掉 JSON Content-Type，由浏览器自动带 multipart boundary
+  if (config.data instanceof FormData) {
+    delete config.headers['Content-Type']
+  }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params)
@@ -39,6 +43,9 @@ service.interceptors.request.use(config => {
     config.url = url
   }
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    if (config.data instanceof FormData) {
+      return config
+    }
     const requestObj = {
       url: config.url,
       data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,

ruoyi-ui/src/views/dataModel/yakHerdInventory/index.vue

@@ -0,0 +1,687 @@
+<template>
+  <div class="app-container">
+    <el-card shadow="never">
+      <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
+        <el-form-item prop="statYear">
+          <template slot="label">{{ dmT("queryStatYear") }}</template>
+          <el-select v-model="queryParams.statYear" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
+            <el-option v-for="y in yearOptions" :key="y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="townDeptId">
+          <template slot="label">{{ dmT("queryTown") }}</template>
+          <el-select v-model="queryParams.townDeptId" :placeholder="dmCommon('pleaseSelect')" clearable filterable style="width: 180px">
+            <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ dmCommon("search") }}</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ dmCommon("reset") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:yakHerdInventory:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:yakHerdInventory:import']"
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImportOpen"
+          >{{ dmT("btnImport") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:yakHerdInventory:export']"
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExportOpen"
+          >{{ dmCommon("export") }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <br />
+
+    <el-card shadow="never">
+      <el-table v-loading="loading" :data="tableList" border>
+        <template slot="empty">
+          <span>{{ dmT("emptyList") }}</span>
+        </template>
+        <el-table-column :label="dmT('colStatYear')" prop="statYear" align="center" width="100" />
+        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colVillageCount')" align="center" width="90">
+          <template slot-scope="scope">{{ formatCount(scope.row.villageCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colHerdsmanHouseholdCount')" align="center" width="90">
+          <template slot-scope="scope">{{ formatCount(scope.row.herdsmanHouseholdCount) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colYakTotal')" align="center" width="100">
+          <template slot-scope="scope">{{ formatCount(scope.row.yakTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colBullTotal')" align="center" width="110">
+          <template slot-scope="scope">{{ formatCount(scope.row.bullTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colCowTotal')" align="center" width="110">
+          <template slot-scope="scope">{{ formatCount(scope.row.cowTotal) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmCommon('colOp')" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-hasPermi="['dataModel:yakHerdInventory:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:yakHerdInventory:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:yakHerdInventory:remove']" type="text" size="mini" @click="handleDelete(scope.row)">{{ dmCommon("delete") }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+
+    <el-dialog :title="dialogTitle" :visible.sync="open" width="920px" append-to-body @close="cancel">
+      <el-form :key="formKey" ref="form" :model="form" label-width="150px" size="small">
+        <div class="yhi-section-title">{{ dmT("sectionBasic") }}</div>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item prop="statYear" :rules="formRules.statYear">
+              <template slot="label">{{ dmT("formStatYear") }}</template>
+              <el-select v-model="form.statYear" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
+                <el-option v-for="y in yearOptions" :key="'f-' + y" :label="String(y)" :value="y" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="townDeptId" :rules="formRules.townDeptId">
+              <template slot="label">{{ dmT("formTown") }}</template>
+              <el-select v-model="form.townDeptId" :placeholder="dmCommon('pleaseSelect')" filterable style="width: 100%">
+                <el-option v-for="item in townOptions" :key="'ft-' + item.deptId" :label="item.deptName" :value="item.deptId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="yhi-section-title">{{ dmT("sectionInventory") }}</div>
+        <el-row :gutter="16">
+          <el-col v-for="field in countFields" :key="field.prop" :span="12">
+            <el-form-item :prop="field.prop" :rules="formRules.count">
+              <template slot="label">{{ dmT(field.labelKey) }}</template>
+              <div class="dm-input-with-unit">
+                <el-input-number
+                  v-model="form[field.prop]"
+                  :min="0"
+                  :precision="0"
+                  :controls="true"
+                  controls-position="right"
+                  class="dm-input-with-unit__input"
+                />
+                <span class="dm-input-with-unit__suffix">{{ dmT(field.unitKey) }}</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item prop="remark" :rules="formRules.remark">
+          <template slot="label">{{ dmT("formRemark") }}</template>
+          <el-input v-model="form.remark" type="textarea" :rows="2" :placeholder="dmT('phRemark')" maxlength="500" show-word-limit />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">{{ dmCommon("ok") }}</el-button>
+        <el-button @click="cancel">{{ dmCommon("cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="920px" append-to-body>
+      <el-form label-width="150px" size="small">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formStatYear')">
+              <span>{{ viewRow.statYear || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formTown')">
+              <span>{{ viewRow.townName || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-for="field in countFields" :key="'v-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatCount(viewRow[field.prop]) }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="dmT('formRemark')">
+              <span class="yhi-view-text">{{ viewRow.remark || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmCommon('colCreate')">
+              <span>{{ viewRow.createTime ? parseTime(viewRow.createTime) : dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('viewCreateBy')">
+              <span>{{ viewRow.createBy || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('viewUpdateBy')">
+              <span>{{ viewRow.updateBy || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('viewUpdateTime')">
+              <span>{{ viewRow.updateTime ? parseTime(viewRow.updateTime) : dash }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-hasPermi="['dataModel:yakHerdInventory:edit']"
+          type="primary"
+          @click="handleEditFromView"
+        >{{ dmCommon("edit") }}</el-button>
+        <el-button @click="viewOpen = false">{{ dmCommon("close") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="dmT('importTitle')" :visible.sync="importOpen" width="480px" append-to-body @close="resetImport">
+      <el-form ref="importFormRef" :model="importForm" label-width="100px" size="small">
+        <el-form-item prop="statYear" :rules="importRules.statYear">
+          <template slot="label">{{ dmT("importStatYear") }}</template>
+          <el-select v-model="importForm.statYear" :placeholder="dmT('importStatYearPh')" style="width: 100%">
+            <el-option v-for="y in yearOptions" :key="'i-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <p class="yhi-import-tip">{{ dmT("importTip") }}</p>
+        <el-upload
+          ref="importUpload"
+          drag
+          :limit="1"
+          accept=".xlsx,.xls"
+          :auto-upload="false"
+          action="#"
+        >
+          <i class="el-icon-upload" />
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div slot="tip" class="el-upload__tip">
+            <el-link type="primary" :underline="false" @click="handleDownloadTemplate">{{ dmT("btnDownloadTemplate") }}</el-link>
+          </div>
+        </el-upload>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" :loading="importing" @click="handleImportSubmit">{{ dmCommon("ok") }}</el-button>
+        <el-button @click="importOpen = false">{{ dmCommon("cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="dmT('exportTitle')" :visible.sync="exportOpen" width="480px" append-to-body @close="resetExport">
+      <el-form ref="exportFormRef" :model="exportForm" label-width="100px" size="small">
+        <el-form-item prop="statYear" :rules="exportRules.statYear">
+          <template slot="label">{{ dmT("exportStatYear") }}</template>
+          <el-select v-model="exportForm.statYear" :placeholder="dmT('exportStatYearPh')" style="width: 100%">
+            <el-option v-for="y in yearOptions" :key="'e-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" :loading="exporting" @click="handleExportSubmit">{{ dmCommon("ok") }}</el-button>
+        <el-button @click="exportOpen = false">{{ dmCommon("cancel") }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import dataModelLocaleMixin from "@/mixins/dataModelLocaleMixin"
+import {
+  listYakHerdInventory,
+  getYakHerdInventory,
+  addYakHerdInventory,
+  updateYakHerdInventory,
+  delYakHerdInventory,
+  listYakHerdInventoryYearOptions,
+  listYakHerdInventoryTownOptions,
+  importYakHerdInventory,
+  downloadYakHerdInventoryTemplate,
+  exportYakHerdInventory
+} from "@/api/dataModel/yakHerdInventory"
+import { blobValidate } from "@/utils/ruoyi"
+import { saveAs } from "file-saver"
+
+const COUNT_FIELDS = [
+  { prop: "villageCount", labelKey: "formVillageCount", unitKey: "unitGe" },
+  { prop: "herdsmanHouseholdCount", labelKey: "formHerdsmanHouseholdCount", unitKey: "unitHousehold" },
+  { prop: "yakTotal", labelKey: "formYakTotal", unitKey: "unitHead" },
+  { prop: "bullTotal", labelKey: "formBullTotal", unitKey: "unitHead" },
+  { prop: "cowTotal", labelKey: "formCowTotal", unitKey: "unitHead" },
+  { prop: "breedingBullCount", labelKey: "formBreedingBullCount", unitKey: "unitHead" },
+  { prop: "bullCastratedCount", labelKey: "formBullCastratedCount", unitKey: "unitHead" },
+  { prop: "cowUnder1Count", labelKey: "formCowUnder1Count", unitKey: "unitHead" },
+  { prop: "cow13Count", labelKey: "formCow13Count", unitKey: "unitHead" },
+  { prop: "cow312Count", labelKey: "formCow312Count", unitKey: "unitHead" },
+  { prop: "cowOver12Count", labelKey: "formCowOver12Count", unitKey: "unitHead" }
+]
+
+function createEmptyForm() {
+  const form = {
+    id: undefined,
+    statYear: undefined,
+    townDeptId: undefined,
+    remark: undefined
+  }
+  COUNT_FIELDS.forEach((field) => {
+    form[field.prop] = 0
+  })
+  return form
+}
+
+function normalizeCountFields(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  COUNT_FIELDS.forEach((field) => {
+    const val = row[field.prop]
+    row[field.prop] = val == null || val === "" ? 0 : val
+  })
+  return row
+}
+
+export default {
+  name: "YakHerdInventory",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "yakHerdInventory",
+      loading: false,
+      importing: false,
+      exporting: false,
+      open: false,
+      viewOpen: false,
+      importOpen: false,
+      exportOpen: false,
+      dialogEdit: false,
+      formKey: 0,
+      total: 0,
+      tableList: [],
+      yearOptions: [],
+      townOptions: [],
+      viewRow: {},
+      importForm: {
+        statYear: undefined
+      },
+      exportForm: {
+        statYear: undefined
+      },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        statYear: undefined,
+        townDeptId: undefined
+      },
+      form: createEmptyForm()
+    }
+  },
+  computed: {
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    countFields() {
+      return COUNT_FIELDS
+    },
+    dialogTitle() {
+      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
+    },
+    formRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        townDeptId: [{ required: true, message: this.dmT("ruleTownRequired"), trigger: "change" }],
+        count: [
+          { required: true, message: this.dmT("ruleCountRequired"), trigger: "change" },
+          { validator: this.validateRequiredCount, trigger: "change" }
+        ],
+        remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
+      }
+    },
+    importRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }]
+      }
+    },
+    exportRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }]
+      }
+    }
+  },
+  created() {
+    this.loadOptions()
+    this.getList()
+  },
+  methods: {
+    loadOptions() {
+      listYakHerdInventoryYearOptions().then((res) => {
+        this.yearOptions = Array.isArray(res.data) ? res.data : []
+      })
+      listYakHerdInventoryTownOptions().then((res) => {
+        this.townOptions = Array.isArray(res.data) ? res.data : []
+      })
+    },
+    formatCount(val) {
+      if (val == null || val === "") {
+        return this.dash
+      }
+      return val
+    },
+    validateRequiredCount(rule, value, callback) {
+      if (value == null || value === "") {
+        callback(new Error(this.dmT("ruleCountRequired")))
+        return
+      }
+      if (!Number.isInteger(value) || value < 0) {
+        callback(new Error(this.dmT("ruleCountNonNegative")))
+        return
+      }
+      callback()
+    },
+    buildListQuery() {
+      const q = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize
+      }
+      if (this.queryParams.statYear != null) {
+        q.statYear = this.queryParams.statYear
+      }
+      if (this.queryParams.townDeptId != null) {
+        q.townDeptId = this.queryParams.townDeptId
+      }
+      return q
+    },
+    buildPayload() {
+      const remarkText = this.form.remark != null ? String(this.form.remark).trim() : ""
+      const payload = {
+        statYear: this.form.statYear,
+        townDeptId: this.form.townDeptId,
+        remark: remarkText !== "" ? remarkText : undefined
+      }
+      COUNT_FIELDS.forEach((field) => {
+        payload[field.prop] = this.form[field.prop]
+      })
+      return payload
+    },
+    getList() {
+      this.loading = true
+      listYakHerdInventory(this.buildListQuery())
+        .then((res) => {
+          this.tableList = res.rows || []
+          this.total = res.total != null ? res.total : 0
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.queryParams.statYear = undefined
+      this.queryParams.townDeptId = undefined
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleAdd() {
+      this.formKey += 1
+      this.form = createEmptyForm()
+      this.dialogEdit = false
+      this.open = true
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
+    },
+    handleEdit(row) {
+      getYakHerdInventory(row.id).then((res) => {
+        const data = res.data || {}
+        this.formKey += 1
+        this.dialogEdit = true
+        this.form = normalizeCountFields(data)
+        this.open = true
+        this.viewOpen = false
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      })
+    },
+    handleEditFromView() {
+      this.handleEdit(this.viewRow)
+    },
+    handleView(row) {
+      getYakHerdInventory(row.id).then((res) => {
+        this.viewRow = res.data || {}
+        this.viewOpen = true
+      })
+    },
+    handleDelete(row) {
+      this.$modal
+        .confirm(this.dmT("confirmDelete"))
+        .then(() => delYakHerdInventory(row.id))
+        .then(() => {
+          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
+          this.viewOpen = false
+          this.getList()
+        })
+        .catch(() => {})
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const payload = this.buildPayload()
+        if (this.dialogEdit) {
+          payload.id = this.form.id
+          updateYakHerdInventory(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgModOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addYakHerdInventory(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.form = createEmptyForm()
+    },
+    handleImportOpen() {
+      this.importForm.statYear = this.queryParams.statYear
+      this.importOpen = true
+      this.$nextTick(() => {
+        this.resetImportFiles()
+      })
+    },
+    resetImportFiles() {
+      if (this.$refs.importUpload) {
+        this.$refs.importUpload.clearFiles()
+      }
+    },
+    resetImport() {
+      this.importing = false
+      this.importForm.statYear = undefined
+      this.resetImportFiles()
+    },
+    handleDownloadTemplate() {
+      const filename = `yak_herd_inventory_template_${new Date().getTime()}.xlsx`
+      this.$modal.loading("正在下载模板，请稍候")
+      downloadYakHerdInventoryTemplate()
+        .then(async (data) => {
+          if (blobValidate(data)) {
+            saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)
+          } else {
+            const resText = await data.text()
+            const rspObj = JSON.parse(resText)
+            this.$modal.msgError(rspObj.msg || "下载模板失败")
+          }
+        })
+        .catch(() => {
+          this.$modal.msgError("下载模板失败")
+        })
+        .finally(() => {
+          this.$modal.closeLoading()
+        })
+    },
+    handleExportOpen() {
+      this.exportForm.statYear = this.queryParams.statYear
+      this.exportOpen = true
+      this.$nextTick(() => {
+        if (this.$refs.exportFormRef) {
+          this.$refs.exportFormRef.clearValidate()
+        }
+      })
+    },
+    resetExport() {
+      this.exporting = false
+      this.exportForm.statYear = undefined
+    },
+    handleExportSubmit() {
+      this.$refs.exportFormRef.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const statYear = this.exportForm.statYear
+        if (!this.yearOptions.includes(statYear)) {
+          this.$modal.msgError(this.dmT("exportStatYearInvalid"))
+          return
+        }
+        const filename = `${statYear}年牦牛存栏数据.xlsx`
+        this.exporting = true
+        this.$modal.loading(this.dmT("exportLoading"))
+        exportYakHerdInventory(statYear)
+          .then(async (data) => {
+            if (blobValidate(data)) {
+              saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)
+              this.exportOpen = false
+            } else {
+              const resText = await data.text()
+              const rspObj = JSON.parse(resText)
+              this.$modal.msgError(rspObj.msg || this.dmT("exportFail"))
+            }
+          })
+          .catch(() => {
+            this.$modal.msgError(this.dmT("exportFail"))
+          })
+          .finally(() => {
+            this.exporting = false
+            this.$modal.closeLoading()
+          })
+      })
+    },
+    handleImportSubmit() {
+      this.$refs.importFormRef.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const upload = this.$refs.importUpload
+        const files = upload && upload.uploadFiles
+        if (!files || !files.length) {
+          this.$modal.msgError("请选择要上传的文件")
+          return
+        }
+        const raw = files[0].raw
+        const name = (raw.name || "").toLowerCase()
+        if (!name.endsWith(".xlsx") && !name.endsWith(".xls")) {
+          this.$modal.msgError('请选择后缀为 "xls" 或 "xlsx" 的文件')
+          return
+        }
+        this.importing = true
+        this.$modal.loading(this.dmT("importLoading"))
+        importYakHerdInventory(raw, this.importForm.statYear)
+          .then((res) => {
+            this.importOpen = false
+            this.showImportResult(res.data || {})
+            this.getList()
+          })
+          .finally(() => {
+            this.importing = false
+            this.$modal.closeLoading()
+            this.resetImportFiles()
+          })
+      })
+    },
+    showImportResult(data) {
+      const insert = data.insertCount != null ? data.insertCount : 0
+      const update = data.updateCount != null ? data.updateCount : 0
+      const fail = data.failCount != null ? data.failCount : 0
+      let html = this.dmT("importSummary", { insert, update, fail })
+      if (data.warnMessages && data.warnMessages.length) {
+        html += `<p><strong>${this.dmT("importWarnTitle")}</strong></p><p>${data.warnMessages.join("<br/>")}</p>`
+      }
+      if (data.failMessages && data.failMessages.length) {
+        html += `<p><strong>${this.dmT("importFailTitle")}</strong></p><p>${data.failMessages.join("<br/>")}</p>`
+      }
+      this.$alert(
+        `<div style='overflow:auto;overflow-x:hidden;max-height:70vh;padding:10px 20px 0;'>${html}</div>`,
+        this.dmT("importTitle"),
+        { dangerouslyUseHTMLString: true }
+      )
+    }
+  }
+}
+</script>
+
+<style scoped>
+.yhi-section-title {
+  margin: 4px 0 12px;
+  padding-left: 8px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+  border-left: 3px solid #409eff;
+}
+
+.yhi-view-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.yhi-import-tip {
+  margin: 0 0 12px;
+  font-size: 12px;
+  color: #909399;
+  line-height: 1.6;
+}
+
+.dm-input-with-unit {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.dm-input-with-unit__input {
+  flex: 1;
+  width: 0;
+}
+.dm-input-with-unit__input ::v-deep.el-input-number {
+  width: 100%;
+}
+.dm-input-with-unit__suffix {
+  flex-shrink: 0;
+  margin-left: 8px;
+  color: #606266;
+  font-size: 14px;
+  white-space: nowrap;
+}
+</style>