更新前端页面

doc/产业数据模型及服务/可支配收入数据填报/可支配收入数据填报前端技术方案.md

@@ -0,0 +1,108 @@
+# 可支配收入数据填报 — 前端技术方案
+
+> 依据：同目录 `可支配收入数据填报功能需求.md`、`可支配收入数据填报技术方案.md`；布局对齐存栏等填报页（双 `el-card` + 分页表格）；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/disposableIncome/index.vue` |
+| **组件名** | `DisposableIncome` |
+| **菜单配置** | 组件路径：`dataModel/disposableIncome/index` |
+| **权限前缀** | `dataModel:disposableIncome:list\|query\|add\|edit\|remove` |
+
+无导入 / 导出按钮与接口。
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/disposableIncome.js` |
+| **Base** | `/dataModel/disposableIncome` |
+
+| 方法 | HTTP | 说明 |
+| --- | --- | --- |
+| `listDisposableIncome` | GET | `/list` 分页列表 |
+| `getDisposableIncome` | GET | `/{id}` 详情 |
+| `addDisposableIncome` | POST | `/` 新增 |
+| `updateDisposableIncome` | PUT | `/` 修改 |
+| `delDisposableIncome` | DELETE | `/{ids}` 删除 |
+| `listDisposableIncomeYearOptions` | GET | `/yearOptions`（当前年起向前 5 年共 6 个） |
+
+---
+
+## 3. 页面结构
+
+1. **筛选区**：所属年份；搜索、重置、新增。  
+2. **列表区**：所属年份、农村居民人均可支配收入、增幅、增速、脱贫人口人均纯收入、操作。  
+3. **操作列**：查看、修改、删除。  
+4. **新增/编辑弹窗**：年份、人均可支配收入、增幅（选填）、增速（选填）、人均纯收入、备注；新增年份默认本年。  
+5. **查看弹窗**：上述字段只读。
+
+---
+
+## 4. 业务规则（前端）
+
+| 规则 | 实现 |
+| --- | --- |
+| 年份选项 | `/yearOptions`；列表筛选可清空；进入页不默认年份 |
+| 必填 | `statYear`、`ruralDisposableIncome`、`povertyNetIncome`（≥0） |
+| 增幅 / 增速表单 | **普通 `el-input`**（非 `el-input-number`），支持空值；提交空 → 不传/后端按 `null` 补齐 |
+| 改年份或人均可支配收入 | 编辑态清空增幅、增速输入，与后端 `recalculateGrowth` 一致 |
+| 列表 / 详情展示 | `formatIncrease`：`null` → `0.00`；`formatGrowthRate`：`null` → `0.00%`，有值则按小数×100 显示百分比 |
+| 收入金额展示 | `formatMoney` → 两位小数；空值 `—` |
+| 唯一性 | 同年重复由后端拦截「该年份数据已存在」 |
+| 删除 | `$modal.confirm` 后物理删除 |
+
+### 4.1 字段映射
+
+| 界面 | 字段 |
+| --- | --- |
+| 所属年份 | `statYear` |
+| 农村居民人均可支配收入（元） | `ruralDisposableIncome` |
+| 增幅（元） | `incomeIncrease` |
+| 增速（小数，如 0.1228） | `incomeGrowthRate` |
+| 脱贫人口人均纯收入（元） | `povertyNetIncome` |
+| 备注 | `remark` |
+
+---
+
+## 5. 国际化
+
+| 项 | 说明 |
+| --- | --- |
+| **语言包** | `dataModel.disposableIncome`、`dataModel.common` |
+| **文件** | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+| **Mixin** | `dataModelLocaleMixin`，`dmNs = 'disposableIncome'` |
+
+---
+
+## 6. 联调说明
+
+1. 部署后端并执行 `sql/biz_disposable_income.sql`。  
+2. 菜单组件 `dataModel/disposableIncome/index`，权限见 §1。  
+3. 验证：新增默认本年；不填增幅增速时有上年则列表自动出现；改年份/可支配收入后重算；列表/详情 null 显示 `0.00` / `0.00%`；编辑回填时 null 保持空；无导入导出入口。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/disposableIncome/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/disposableIncome.js` |
+| Mixin | `ruoyi-ui/src/mixins/dataModelLocaleMixin.js` |
+| i18n | `ruoyi-ui/src/lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：县级年度 CRUD；增幅/增速选填；列表详情 null 显示为 0；无导入导出 |
+| 1.2 | 与需求对齐：改年份/可支配收入清空增幅增速；增速百分比展示 |

doc/产业数据模型及服务/合作社发展数据填报/合作社发展数据填报前端技术方案.md

@@ -0,0 +1,129 @@
+# 合作社发展数据填报 — 前端技术方案
+
+> 依据：同目录 `合作社发展数据填报功能需求.md`、`合作社发展数据填报技术方案.md`；交互对齐存栏/出栏填报（双 `el-card` + 分页表格）；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/cooperativeDevelopment/index.vue` |
+| **组件名** | `CooperativeDevelopment` |
+| **菜单配置** | 组件路径：`dataModel/cooperativeDevelopment/index` |
+| **权限前缀** | `dataModel:cooperativeDevelopment:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/cooperativeDevelopment.js` |
+| **Base** | `/dataModel/cooperativeDevelopment` |
+
+| 方法 | HTTP | 说明 |
+| --- | --- | --- |
+| `listCooperativeDevelopment` | GET | `/list` 分页列表 |
+| `getCooperativeDevelopment` | GET | `/{id}` 详情 |
+| `addCooperativeDevelopment` | POST | `/` 新增 |
+| `updateCooperativeDevelopment` | PUT | `/` 修改 |
+| `delCooperativeDevelopment` | DELETE | `/{ids}` 删除 |
+| `listCooperativeDevelopmentYearOptions` | GET | `/yearOptions` |
+| `listCooperativeDevelopmentMonthOptions` | GET | `/monthOptions` |
+| `listCooperativeDevelopmentTownOptions` | GET | `/townOptions` |
+| `listCooperativeDevelopmentVillageTree` | GET | `/villageTree` 县→乡镇→村 |
+| `importCooperativeDevelopment` | POST | `/importData`（`file` + `statYear` + `statMonth`） |
+| `exportCooperativeDevelopment` | GET | `/export`（`statYear` + `statMonth`，可选 `townDeptId`，`blob`） |
+| `downloadCooperativeDevelopmentTemplate` | GET | `/importTemplate`（`blob`） |
+
+模板下载与导出均用 **GET + `blob`**，勿用若依全局 `this.download()`（固定 POST）。
+
+---
+
+## 3. 页面结构
+
+1. **筛选区**：所属年份、所属月份、所属乡镇、所属村（可搜索）、合作社名称；搜索、重置、新增、导入、导出。  
+2. **列表区**（列顺序）：所属年份、所属月份、所属村、所属乡镇、合作社名称、法定代表人、成立时间、注册资本、截止年底总资产、总收入、亏损、牛存栏、牛出栏、操作；空值展示 `—`。  
+3. **操作列**：查看、修改、删除。  
+4. **新增/编辑弹窗**：年份、月份、所属村、合作社名称（必填）；分区录入见 §4；**牲畜入股小计**只读（牛入股+羊入股）；新增默认当前年月。  
+5. **查看弹窗**：全部明细只读（含乡镇反推结果、牲畜入股小计、经营范围/模式/运营情况）。  
+6. **导入弹窗**：选填报年月（默认当前）→ 上传 `.xlsx` → `$alert` 展示 insert/update/fail/warn。  
+7. **导出弹窗**：选所属年月（默认当前）、可选所属乡镇（可清空；不选则全部）→ 下载 `{年}年{月}月合作社发展数据.xlsx`。
+
+---
+
+## 4. 业务规则（前端）
+
+| 规则 | 实现 |
+| --- | --- |
+| 年份 / 月份 | `/yearOptions`、`/monthOptions`；展示 `{month}月`；不可选未来月 |
+| 村选项 | `/villageTree` 拍平为「乡镇 / 村」下拉；`el-select` + `filterable` 支持搜索 |
+| 列表筛选 | `statYear`、`statMonth`、`townDeptId`、`villageDeptId`、`cooperativeName`；进入页不默认年月 |
+| 提交体 | 传 `villageDeptId`、合作社名称及明细；**不传**乡镇（后端反推） |
+| 唯一性 | 同年同月同村同合作社名称重复由后端拦截 |
+| 牲畜入股小计 | 前端只读展示 `cattleShareCount + sheepShareCount`；保存时以后端重算为准 |
+| 经营范围 | `el-checkbox-group` → 提交逗号分隔字符串（与后端枚举一致） |
+| 经营模式 / 运营情况 | `el-radio-group` 单选，取值与后端标签一致 |
+| 导入 | `FormData` 含年月；按唯一键 upsert，摘要含新增/更新条数 |
+| 导出 | 可选 `townDeptId`；导出文件不含合计行（后端保证） |
+| 删除 | `$modal.confirm` 后物理删除 |
+
+### 4.1 表单分区与字段
+
+| 分区 | 字段（小驼峰） |
+| --- | --- |
+| 基本信息 | `statYear`、`statMonth`、`villageDeptId`、`cooperativeName`、`legalRepresentative`、`establishDate`（`el-date-picker`，`yyyy-MM-dd`）、`registeredCapital`、`yearEndTotalAssets` |
+| 入社与入股 | `memberHouseholdCount`、`memberPopulationCount`、`povertyMonitorCount`、`cattleShareCount`、`sheepShareCount`、**`livestockShareTotal`（只读）**、`grasslandShareArea`、`laborShareCount`、`cashShareAmount`、`otherShareAmount` |
+| 效益情况 | `totalIncome`、`netIncome`、`cashDividend`、`inKindDividend`、`revolvingFund`、`lossAmount` |
+| 就业与存出栏 | `collegeGraduateCount`、`collegeGraduateWage`、`farmerTransferEmploymentCount`、`farmerTransferWage`、`cattleInventoryCount`、`cattleOutboundCount`、`sheepInventoryCount`、`sheepOutboundCount` |
+| 产品认证与培训 | `trademarkProductCount`、`qualityCertProductCount`、`trainingManageCount`、`trainingSkillCount`、`trainingOtherCount` |
+| 经营情况 | `businessScope`（多选）、`businessModel`（单选）、`operationStatus`（单选）、`remark` |
+
+### 4.2 枚举取值（与 Excel / 后端一致）
+
+| 类型 | 取值 |
+| --- | --- |
+| 主要经营范围 | 养殖业、种养结合、农产品加工、农机服务、劳务输出、建筑工程、旅游服务、运输、特色产品制作及销售、其他 |
+| 经营模式分类 | 整村合作社、股份合作社、联合合作社、多种经营合作社、公司型合作社、其它 |
+| 运营情况 | 规范、一般、差 |
+
+---
+
+## 5. 国际化
+
+| 项 | 说明 |
+| --- | --- |
+| **语言包** | `dataModel.cooperativeDevelopment`、`dataModel.common` |
+| **文件** | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+| **Mixin** | `dataModelLocaleMixin`，`dmNs = 'cooperativeDevelopment'` |
+
+文案键覆盖筛选/列表/表单分区/导入导出/校验提示；单位含户、人、头、个、万元、万亩。
+
+---
+
+## 6. 联调说明
+
+1. 部署后端并执行 `sql/biz_cooperative_development.sql`。  
+2. 菜单组件配置为 `dataModel/cooperativeDevelopment/index`，权限见 §1。  
+3. 验证：村下拉可搜索；新增只选村且乡镇回填；同年同月同村同名拦截；导入 upsert 摘要；导出可选乡镇且无合计行；详情含全部明细；汉藏切换。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/cooperativeDevelopment/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/cooperativeDevelopment.js` |
+| Mixin | `ruoyi-ui/src/mixins/dataModelLocaleMixin.js` |
+| i18n | `ruoyi-ui/src/lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×合作社×年月；列表/CRUD/详情/导入 upsert/导出可选乡镇；经营范围多选与模式/运营单选；汉藏 i18n |
+| 1.1 | 与实现对齐：村选项为拍平可搜索 `el-select`（非 Treeselect）；牲畜入股小计表单只读展示 |

doc/产业数据模型及服务/家庭牧场数据填报/家庭牧场数据填报前端技术方案.md

@@ -0,0 +1,81 @@
+# 家庭牧场数据填报 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；交互对齐出栏/合作社村级填报；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/familyRanch/index.vue` |
+| **组件名** | `FamilyRanch` |
+| **菜单配置** | 组件路径：`dataModel/familyRanch/index` |
+| **权限前缀** | `dataModel:familyRanch:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/familyRanch.js` |
+| **Base** | `/dataModel/familyRanch` |
+
+CRUD、`yearOptions` / `monthOptions` / `townOptions` / `villageTree`、导入 `importData`、模板 `importTemplate`、导出 `export`（可选 `townDeptId`）与畜牧产品产量模块同构；模板/导出均为 **GET + blob**。
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：年、月、乡镇、企业名称（无村筛选，与需求一致）。  
+2. **列表**：年、月、乡镇、村、企业、法人、类型、注册资本、成立时间、牛存栏、牛出栏、草场面积（`grasslandAreaSubtotal`）、操作。  
+3. **新增/编辑**：选村（可搜索）；企业类型默认「个体工商户」、销售渠道默认「其他」；成立时间 `el-date-picker`（`yyyy-MM-dd`）；派生字段只读展示。  
+4. **详情**：全部字段含派生 + 乡镇只读。  
+5. **导入**：选年月 → upsert 摘要。  
+6. **导出**：选年月；所属乡镇与列表共用选项与文案，打开时带入列表当前乡镇，清空=全部。
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 必填 | 年、月、村、企业名称 |
+| 提交 | 只传 `villageDeptId` 与录入项；乡镇与派生由后端计算 |
+| 前端只读派生 | 存栏小计、草场面积小计、利润、是否草畜平衡户（与后端公式一致，便于预览） |
+| 是/否 | `hasSubsidy` / `hasTrademark` / `hasQualityCert` 单选「是」「否」 |
+| 枚举 | 企业类型、销售渠道与后端 `FamilyRanchValidation` 一致 |
+
+---
+
+## 5. 国际化
+
+`dataModel.familyRanch`（`lang/zh|bo/dataModel.js`）；`dmNs = 'familyRanch'`。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_family_ranch.sql`。  
+2. 菜单组件 `dataModel/familyRanch/index`。  
+3. 验证：默认类型/渠道、派生只读、导出乡镇带入列表筛选、草畜失衡写入疾病预警（后端）。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/familyRanch/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/familyRanch.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×年月×企业；CRUD + 导入 upsert + 导出乡镇与列表联动 |
+| 1.1 | 成立时间日期组件；补助资金年份 `type=year`（`yyyy`）；派生字段表单只读预览 |

doc/产业数据模型及服务/畜牧产品产量登记/畜牧产品产量登记前端技术方案.md

@@ -0,0 +1,92 @@
+# 畜牧产品产量登记 — 前端技术方案
+
+> 依据：同目录功能需求、技术方案；交互对齐出栏/合作社村级填报；字段 **小驼峰**。
+
+---
+
+## 1. 页面与路由
+
+| 项 | 说明 |
+| --- | --- |
+| **Vue 路径** | `ruoyi-ui/src/views/dataModel/livestockProductOutput/index.vue` |
+| **组件名** | `LivestockProductOutput` |
+| **菜单配置** | 组件路径：`dataModel/livestockProductOutput/index` |
+| **权限前缀** | `dataModel:livestockProductOutput:list\|query\|add\|edit\|remove\|import\|export` |
+
+---
+
+## 2. API 模块
+
+| 项 | 说明 |
+| --- | --- |
+| **文件** | `ruoyi-ui/src/api/dataModel/livestockProductOutput.js` |
+| **Base** | `/dataModel/livestockProductOutput` |
+
+| 方法 | HTTP | 说明 |
+| --- | --- | --- |
+| `listLivestockProductOutput` | GET | `/list` |
+| `getLivestockProductOutput` | GET | `/{id}` |
+| `addLivestockProductOutput` | POST | `/` |
+| `updateLivestockProductOutput` | PUT | `/` |
+| `delLivestockProductOutput` | DELETE | `/{ids}` |
+| `listLivestockProductOutputYearOptions` | GET | `/yearOptions` |
+| `listLivestockProductOutputMonthOptions` | GET | `/monthOptions` |
+| `listLivestockProductOutputTownOptions` | GET | `/townOptions` |
+| `listLivestockProductOutputVillageTree` | GET | `/villageTree` |
+| `importLivestockProductOutput` | POST | `/importData`（`file` + 年月） |
+| `downloadLivestockProductOutputTemplate` | GET | `/importTemplate`（`blob`） |
+| `exportLivestockProductOutput` | GET | `/export`（年月，可选 `townDeptId`，`blob`） |
+
+---
+
+## 3. 页面结构
+
+1. **筛选**：年、月、乡镇、村（可搜索）；搜索 / 重置 / 新增 / 导入 / 导出。  
+2. **列表**：年、月、乡镇、村、肉产量、奶产量、操作。  
+3. **新增/编辑**：年、月、村（必填）；肉/奶产量（万吨，≥0）；备注；新增默认本年本月；不选乡镇。  
+4. **详情**：全部字段 + 乡镇只读。  
+5. **导入**：选年月 → 上传 → upsert 摘要。  
+6. **导出**：选年月，可选乡镇；文件含合计行（后端）。
+
+---
+
+## 4. 业务规则
+
+| 规则 | 实现 |
+| --- | --- |
+| 村选项 | `/villageTree` 拍平为「乡镇 / 村」；`el-select` + `filterable` |
+| 提交 | 只传 `villageDeptId` 与产量；乡镇由后端反推 |
+| 唯一键 | 年+月+村，重复由后端拦截 |
+| 产量 | `meatOutput`、`milkOutput`，单位万吨，精度 4 位，可选非负 |
+
+---
+
+## 5. 国际化
+
+`dataModel.livestockProductOutput`（`lang/zh|bo/dataModel.js`）；`dmNs = 'livestockProductOutput'`。
+
+---
+
+## 6. 联调说明
+
+1. 执行 `sql/biz_livestock_product_output.sql`。  
+2. 菜单组件 `dataModel/livestockProductOutput/index`。  
+3. 验证：村可搜索、CRUD、导入 upsert、导出含合计行。
+
+---
+
+## 7. 文件清单
+
+| 类型 | 路径 |
+| --- | --- |
+| 页面 | `ruoyi-ui/src/views/dataModel/livestockProductOutput/index.vue` |
+| API | `ruoyi-ui/src/api/dataModel/livestockProductOutput.js` |
+| i18n | `lang/zh/dataModel.js`、`lang/bo/dataModel.js` |
+
+---
+
+## 8. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：村×年月；CRUD + 导入 upsert + 导出可选乡镇 |

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listCooperativeDevelopment(query) {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getCooperativeDevelopment(id) {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addCooperativeDevelopment(data) {
+  return request({
+    url: "/dataModel/cooperativeDevelopment",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateCooperativeDevelopment(data) {
+  return request({
+    url: "/dataModel/cooperativeDevelopment",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delCooperativeDevelopment(ids) {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listCooperativeDevelopmentYearOptions() {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listCooperativeDevelopmentMonthOptions() {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listCooperativeDevelopmentTownOptions() {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listCooperativeDevelopmentVillageTree() {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importCooperativeDevelopment(file, statYear, statMonth) {
+  const formData = new FormData()
+  formData.append("file", file, file.name)
+  formData.append("statYear", String(statYear))
+  formData.append("statMonth", String(statMonth))
+  return request({
+    url: "/dataModel/cooperativeDevelopment/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadCooperativeDevelopmentTemplate() {
+  return request({
+    url: "/dataModel/cooperativeDevelopment/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportCooperativeDevelopment(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/cooperativeDevelopment/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

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

@@ -0,0 +1,52 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listDisposableIncome(query) {
+  return request({
+    url: "/dataModel/disposableIncome/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getDisposableIncome(id) {
+  return request({
+    url: "/dataModel/disposableIncome/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addDisposableIncome(data) {
+  return request({
+    url: "/dataModel/disposableIncome",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateDisposableIncome(data) {
+  return request({
+    url: "/dataModel/disposableIncome",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delDisposableIncome(ids) {
+  return request({
+    url: "/dataModel/disposableIncome/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份（当前年起向前 5 年） */
+export function listDisposableIncomeYearOptions() {
+  return request({
+    url: "/dataModel/disposableIncome/yearOptions",
+    method: "get"
+  })
+}

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listFamilyRanch(query) {
+  return request({
+    url: "/dataModel/familyRanch/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getFamilyRanch(id) {
+  return request({
+    url: "/dataModel/familyRanch/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addFamilyRanch(data) {
+  return request({
+    url: "/dataModel/familyRanch",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateFamilyRanch(data) {
+  return request({
+    url: "/dataModel/familyRanch",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delFamilyRanch(ids) {
+  return request({
+    url: "/dataModel/familyRanch/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listFamilyRanchYearOptions() {
+  return request({
+    url: "/dataModel/familyRanch/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listFamilyRanchMonthOptions() {
+  return request({
+    url: "/dataModel/familyRanch/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listFamilyRanchTownOptions() {
+  return request({
+    url: "/dataModel/familyRanch/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listFamilyRanchVillageTree() {
+  return request({
+    url: "/dataModel/familyRanch/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importFamilyRanch(file, statYear, statMonth) {
+  const formData = new FormData()
+  formData.append("file", file, file.name)
+  formData.append("statYear", String(statYear))
+  formData.append("statMonth", String(statMonth))
+  return request({
+    url: "/dataModel/familyRanch/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadFamilyRanchTemplate() {
+  return request({
+    url: "/dataModel/familyRanch/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportFamilyRanch(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/familyRanch/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

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

@@ -0,0 +1,120 @@
+import request from "@/utils/request"
+
+/** 分页列表 */
+export function listLivestockProductOutput(query) {
+  return request({
+    url: "/dataModel/livestockProductOutput/list",
+    method: "get",
+    params: query
+  })
+}
+
+/** 详情 */
+export function getLivestockProductOutput(id) {
+  return request({
+    url: "/dataModel/livestockProductOutput/" + id,
+    method: "get"
+  })
+}
+
+/** 新增 */
+export function addLivestockProductOutput(data) {
+  return request({
+    url: "/dataModel/livestockProductOutput",
+    method: "post",
+    data
+  })
+}
+
+/** 修改 */
+export function updateLivestockProductOutput(data) {
+  return request({
+    url: "/dataModel/livestockProductOutput",
+    method: "put",
+    data
+  })
+}
+
+/** 删除 */
+export function delLivestockProductOutput(ids) {
+  return request({
+    url: "/dataModel/livestockProductOutput/" + ids,
+    method: "delete"
+  })
+}
+
+/** 可选年份 */
+export function listLivestockProductOutputYearOptions() {
+  return request({
+    url: "/dataModel/livestockProductOutput/yearOptions",
+    method: "get"
+  })
+}
+
+/** 可选月份（1～12） */
+export function listLivestockProductOutputMonthOptions() {
+  return request({
+    url: "/dataModel/livestockProductOutput/monthOptions",
+    method: "get"
+  })
+}
+
+/** 乡镇下拉 */
+export function listLivestockProductOutputTownOptions() {
+  return request({
+    url: "/dataModel/livestockProductOutput/townOptions",
+    method: "get"
+  })
+}
+
+/** 县→乡镇→村树 */
+export function listLivestockProductOutputVillageTree() {
+  return request({
+    url: "/dataModel/livestockProductOutput/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
+export function importLivestockProductOutput(file, statYear, statMonth) {
+  const formData = new FormData()
+  formData.append("file", file, file.name)
+  formData.append("statYear", String(statYear))
+  formData.append("statMonth", String(statMonth))
+  return request({
+    url: "/dataModel/livestockProductOutput/importData",
+    method: "post",
+    headers: {
+      repeatSubmit: false
+    },
+    data: formData
+  })
+}
+
+/** 下载导入模板（GET） */
+export function downloadLivestockProductOutputTemplate() {
+  return request({
+    url: "/dataModel/livestockProductOutput/importTemplate",
+    method: "get",
+    responseType: "blob"
+  })
+}
+
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportLivestockProductOutput(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
+  return request({
+    url: "/dataModel/livestockProductOutput/export",
+    method: "get",
+    params,
+    responseType: "blob"
+  })
+}

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

@@ -67,6 +67,14 @@ export function listYakHerdInventoryTownOptions() {
   })
 }
 
+/** 县→乡镇→村树（表单/筛选选村） */
+export function listYakHerdInventoryVillageTree() {
+  return request({
+    url: "/dataModel/yakHerdInventory/villageTree",
+    method: "get"
+  })
+}
+
 /** Excel 导入（multipart/form-data，file 为 el-upload 的 raw File） */
 export function importYakHerdInventory(file, statYear, statMonth) {
   const formData = new FormData()
@@ -92,12 +100,21 @@ export function downloadYakHerdInventoryTemplate() {
   })
 }
 
-/** 按年月导出（GET，后端 @GetMapping("/export")） */
-export function exportYakHerdInventory(statYear, statMonth) {
+/**
+ * 按年月导出（GET，后端 @GetMapping("/export")）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportYakHerdInventory(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
   return request({
     url: "/dataModel/yakHerdInventory/export",
     method: "get",
-    params: { statYear, statMonth },
+    params,
     responseType: "blob"
   })
 }

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

@@ -67,7 +67,15 @@ export function listYakOutboundReportTownOptions() {
   })
 }
 
-/** Excel 导入（multipart/form-data，file 为 el-upload 的 raw File） */
+/** 县→乡镇→村树 */
+export function listYakOutboundReportVillageTree() {
+  return request({
+    url: "/dataModel/yakOutboundReport/villageTree",
+    method: "get"
+  })
+}
+
+/** Excel 导入 */
 export function importYakOutboundReport(file, statYear, statMonth) {
   const formData = new FormData()
   formData.append("file", file, file.name)
@@ -92,12 +100,21 @@ export function downloadYakOutboundReportTemplate() {
   })
 }
 
-/** 按年月导出（GET） */
-export function exportYakOutboundReport(statYear, statMonth) {
+/**
+ * 按年月导出（GET）
+ * @param {number} statYear
+ * @param {number} statMonth
+ * @param {number} [townDeptId] 可选乡镇
+ */
+export function exportYakOutboundReport(statYear, statMonth, townDeptId) {
+  const params = { statYear, statMonth }
+  if (townDeptId != null && townDeptId !== "") {
+    params.townDeptId = townDeptId
+  }
   return request({
     url: "/dataModel/yakOutboundReport/export",
     method: "get",
-    params: { statYear, statMonth },
+    params,
     responseType: "blob"
   })
 }

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

@@ -1,4 +1,4 @@
-/** 产业数据模型及体系 — 藏文 */
+/** ཐོན་ལས་གཞི་གྲངས་དཔེ་གཞི་དང་མ་ལག — བོད་ཡིག */
 export default {
   common: {
     search: "འཚོལ་བཤེར།",
@@ -275,145 +275,469 @@ export default {
     emptyList: "ཉེན་བརྡ་མེད།"
   },
   yakHerdInventory: {
-    queryStatYear: "ལོ་ཚད།",
-    queryStatMonth: "ཟླ་ཚད།",
-    queryTown: "ཤང་གྲོང་།",
-    colStatYear: "ལོ་ཚད།",
-    colStatMonth: "ཟླ་ཚད།",
-    colTownName: "ཤང་གྲོང་།",
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
     statMonthLabel: "{month}ཟླ།",
     colVillageCount: "གྲོང་ཚོ་གྲངས།",
-    colHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
-    colYakTotal: "གནས་ཚད།",
-    colBullTotal: "ཕོ་བ་གནས་ཚད།",
-    colCowTotal: "མོ་བ་གནས་ཚད།",
-    formStatYear: "ལོ་ཚད།",
-    formStatMonth: "ཟླ་ཚད།",
-    formTown: "ཤང་གྲོང་།",
+    colHerdsmanHouseholdCount: "འབྲོག་ཁྱིམ་གྲངས།",
+    colYakTotal: "གནས་ཚད་གྲངས།",
+    colBullTotal: "གླང་གནས་ཚད།",
+    colCowTotal: "བ་མོ་གནས་ཚད།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
     formVillageCount: "གྲོང་ཚོ་གྲངས།",
-    formHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
-    formYakTotal: "གཡག་གནས་ཚད།",
-    formBullTotal: "ཕོ་བ་གནས་ཚད།",
-    formCowTotal: "མོ་བ་གནས་ཚད།",
-    formBreedingBullCount: "རྒྱུད་ཕོ་བ།",
-    formBullCastratedCount: "ཕོ/སྤྱི་བ།",
-    formCowUnder1Count: "མོ 1 ལོ་མན།",
-    formCow13Count: "མོ 1-3 ལོ།",
-    formCow312Count: "མོ 3-12 ལོ།",
-    formCowOver12Count: "མོ 12 ལོ་ཡན།",
+    formHerdsmanHouseholdCount: "འབྲོག་ཁྱིམ་གྲངས།",
+    formBreedingBullCount: "ས་བོན་གླང་གནས་ཚད།",
+    formBullCastratedCount: "གླང་/རླིག་ཕྱུགས་གནས་ཚད།",
+    formCowYoungCount: "ལོ་0～1.5 ཕྲུ་གུ་གནས་ཚད།",
+    formCowAdultCount: "ལོ་1.5་ཡན་དར་ཕྱུགས་གནས་ཚད།",
+    formMilkingCowCount: "འོ་མ་བཞོ་བ་མོ་གནས་ཚད།",
+    formFertileCowCount: "འཕེལ་ནུས་བ་མོ་གནས་ཚད།",
+    formSheepTotal: "ལུག་སྤྱི་གནས་ཚད།",
+    formMilkingSheepCount: "འོ་མ་བཞོ་ལུག་གནས་ཚད།",
+    formInsuredYakCount: "འགན་བཅོལ་གཡག་གནས་ཚད།",
+    formBullTotal: "གླང་བསྡོམས།",
+    formCowTotal: "བ་མོ་བསྡོམས།",
+    formDairyTotal: "འོ་མ་བཞོ་བ་བསྡོམས།",
+    formYakTotal: "གཡག་སྤྱི་གནས་ཚད།",
+    formGrandTotal: "སྤྱི་བསྡོམས།",
+    formYakSheepTotal: "སྤྱི་ཚད（གཡག+ལུག）",
     formRemark: "ཟིན་བྲིས།",
-    phRemark: "འདེམས་ཆོག ཡིག་ཆ་500ལས་མི་ཆོག",
-    formVillageDeptId: "གྲོང་ཚོ ID（预留）",
-    formVillageName: "གྲོང་ཚོ（预留）",
-    sectionBasic: "གཞི་རྩའི་ཆ་འཕྲིན།",
-    sectionInventory: "གནས་ཚད་གྲངས་ཀ།",
-    sectionReserved: "预留",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionInventory: "གནས་ཚད་དཔྱད་གཞི།",
     btnImport: "ནང་འདྲེན།",
-    btnDownloadTemplate: "模板下载",
-    exportTitle: "Excel 导出",
-    exportStatYear: "所属年份",
-    exportStatYearPh: "请选择所属年份",
-    exportStatMonth: "所属月份",
-    exportStatMonthPh: "请选择所属月份",
-    exportStatYearRequired: "请选择所属年份",
-    exportStatMonthRequired: "请选择所属月份",
-    exportStatYearInvalid: "年月不在可选范围",
-    exportLoading: "正在导出...",
-    exportFail: "导出失败",
-    importTitle: "Excel 导入",
-    importStatYear: "填报年份",
-    importStatYearPh: "请选择年份",
-    importStatMonth: "填报月份",
-    importStatMonthPh: "请选择月份",
-    importTip: "先选年月再上传 .xlsx",
-    importLoading: "正在导入，请稍候...",
-    importSummary: "导入：新增 {insert} 更新 {update} 失败 {fail}",
-    importWarnTitle: "警告",
-    importFailTitle: "失败明细",
-    dialogAdd: "[新增]牦牛存栏",
-    dialogEdit: "[编辑]牦牛存栏",
-    confirmDelete: "是否删除？",
-    emptyList: "暂无数据",
-    unitGe: "个",
-    unitHousehold: "户",
-    unitHead: "头",
-    ruleStatYearRequired: "请选择年份",
-    ruleStatMonthRequired: "请选择月份",
-    ruleStatMonthFuture: "未来月份不可填",
-    ruleTownRequired: "请选择乡镇",
-    ruleCountRequired: "请填写",
-    ruleCountNonNegative: "≥0 整数",
-    viewCreateBy: "创建人",
-    viewUpdateBy: "修改人",
-    viewUpdateTime: "修改时间"
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearInvalid: "ཕྱིར་འདྲེན་ལོ་ཟླ་འདེམས་ཁོངས་ནང་མེད།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]གཡག་གནས་ཚད་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]གཡག་གནས་ཚད་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitGe: "གྲངས།",
+    unitHousehold: "ཁྱིམ།",
+    unitHead: "ཨ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།",
+    viewCreateBy: "གསར་སྣོན་མཁན།",
+    viewUpdateBy: "རྩོམ་སྒྲིག་མཁན།",
+    viewUpdateTime: "རྩོམ་སྒྲིག་དུས་ཚོད།"
   },
   yakOutboundReport: {
-    queryStatYear: "所属年份",
-    queryStatMonth: "所属月份",
-    queryTown: "所属乡镇",
-    colStatYear: "所属年份",
-    colStatMonth: "所属月份",
-    statMonthLabel: "{month}月",
-    colTownName: "所属乡镇",
-    colFarmerHouseholdCount: "农牧户户数",
-    colFarmerPopulationCount: "农牧户人数",
-    colYakOutboundCount: "牦牛出栏数",
-    colSelfConsumptionCattle: "自食情况（牛）",
-    formStatYear: "所属年份",
-    formStatMonth: "所属月份",
-    formTown: "所属乡镇",
-    formFarmerHouseholdCount: "农牧户户数",
-    formFarmerPopulationCount: "农牧户人数",
-    formYakOutboundCount: "牦牛出栏数",
-    formCattleOutboundCount: "黄牛/奶牛/犏牛出栏数",
-    formSheepOutboundCount: "绵羊出栏数",
-    formGoatOutboundCount: "山羊出栏数",
-    formHorseMuleOutboundCount: "马骡出栏数",
-    formDonkeyOutboundCount: "驴出栏数",
-    formSelfConsumptionCattleCount: "自食牛头数",
-    formSelfConsumptionSheepCount: "自食绵羊只数",
-    formSelfConsumptionGoatCount: "自食山羊只数",
-    formRemark: "备注",
-    phRemark: "选填，不超过 500 字",
-    sectionBasic: "基本信息",
-    sectionFarmer: "农牧户情况",
-    sectionOutbound: "出栏情况",
-    sectionSelfConsumption: "自食情况",
-    btnImport: "导入",
-    btnDownloadTemplate: "模板下载",
-    exportTitle: "Excel 导出",
-    exportStatYear: "所属年份",
-    exportStatYearPh: "请选择所属年份",
-    exportStatMonth: "所属月份",
-    exportStatMonthPh: "请选择所属月份",
-    exportStatYearRequired: "请选择所属年份",
-    exportStatMonthRequired: "请选择所属月份",
-    exportStatYearInvalid: "导出年月不在可选范围",
-    exportLoading: "正在导出...",
-    exportFail: "导出失败",
-    importTitle: "Excel 导入",
-    importStatYear: "填报年份",
-    importStatYearPh: "请选择年份",
-    importStatMonth: "填报月份",
-    importStatMonthPh: "请选择月份",
-    importTip: "请先选择填报年月，再上传 .xlsx 文件",
-    importLoading: "正在导入...",
-    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
-    importWarnTitle: "导入警告",
-    importFailTitle: "失败明细",
-    dialogAdd: "[新增]牦牛出栏",
-    dialogEdit: "[编辑]牦牛出栏",
-    confirmDelete: "是否删除？",
-    emptyList: "暂无数据",
-    unitHousehold: "户",
-    unitPerson: "人",
-    unitHead: "头",
-    unitSheep: "只",
-    unitHorse: "匹",
-    ruleStatYearRequired: "请选择年份",
-    ruleStatMonthRequired: "请选择月份",
-    ruleStatMonthFuture: "不可填报未来月份",
-    ruleTownRequired: "请选择乡镇",
-    ruleCountNonNegative: "≥0 整数"
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colFarmerHouseholdCount: "ཞིང་འབྲོག་ཁྱིམ་གྲངས།",
+    colFarmerPopulationCount: "ཞིང་འབྲོག་མི་གྲངས།",
+    colYakOutboundCount: "གཡག་ཕྱིར་ཐོན་གྲངས།",
+    colOutboundTotal: "ཕྱུགས་སྤྱི་ཕྱིར་ཐོན།",
+    colSelfConsumptionCattle: "རང་ཟ་གླང་གྲངས།",
+    colSelfConsumptionTotal: "རང་ཟ་ཕྱུགས་སྤྱི།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formFarmerHouseholdCount: "ཞིང་འབྲོག་ཁྱིམ་གྲངས།",
+    formFarmerPopulationCount: "ཞིང་འབྲོག་མི་གྲངས།",
+    formYakOutboundCount: "གཡག་ཕྱིར་ཐོན་གྲངས།",
+    formCattleOutboundCount: "གླང་དཀར་/འོ་མ་བཞོ/མཛོ་ཕྱིར་ཐོན།",
+    formSheepOutboundCount: "ལུག་ཕྱིར་ཐོན།",
+    formGoatOutboundCount: "ར་ཕྱིར་ཐོན།",
+    formHorseMuleOutboundCount: "རྟ་དྲེལ་ཕྱིར་ཐོན།",
+    formDonkeyOutboundCount: "བོང་བུ་ཕྱིར་ཐོན།",
+    formSelfConsumptionCattleCount: "རང་ཟ་གླང་གྲངས།",
+    formSelfConsumptionSheepCount: "རང་ཟ་ལུག་གྲངས།",
+    formSelfConsumptionGoatCount: "རང་ཟ་ར་གྲངས།",
+    formOutboundTotal: "ཕྱུགས་སྤྱི་ཕྱིར་ཐོན།",
+    formSelfConsumptionTotal: "རང་ཟ་ཕྱུགས་སྤྱི།",
+    formRemark: "ཟིན་བྲིས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionFarmer: "ཞིང་འབྲོག་ཁྱིམ་གནས་ཚུལ།",
+    sectionOutbound: "ཕྱིར་ཐོན་གནས་ཚུལ།",
+    sectionSelfConsumption: "རང་ཟ་གནས་ཚུལ།",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearInvalid: "ཕྱིར་འདྲེན་ལོ་ཟླ་འདེམས་ཁོངས་ནང་མེད།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]གཡག་ཕྱིར་ཐོན་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]གཡག་ཕྱིར་ཐོན་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitHousehold: "ཁྱིམ།",
+    unitPerson: "མི།",
+    unitHead: "ཨ།",
+    unitSheep: "ཐོག",
+    unitHorse: "རྟ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  cooperativeDevelopment: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    queryCooperativeName: "མཉམ་ལས་ཁང་མིང་།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phCooperativeName: "མཉམ་ལས་ཁང་མིང་འབྲི་རོགས།",
+    phEstablishDate: "དཔེར་ན་ 2020-01-01",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colVillageName: "གྲོང་ཚོ།",
+    colTownName: "ཤང་གྲོང།",
+    colCooperativeName: "མཉམ་ལས་ཁང་མིང་།",
+    colLegalRepresentative: "ཁྲིམས་མིའི་ངོ་ཚབ།",
+    colEstablishDate: "འཛུགས་དུས།",
+    colRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
+    colYearEndTotalAssets: "ལོ་མཇུག་རྒྱུ་ནོར་སྤྱི།",
+    colTotalIncome: "ཡོང་འབབ་སྤྱི།",
+    colLossAmount: "གྱོང་གུད།",
+    colCattleInventoryCount: "གླང་གནས་ཚད།",
+    colCattleOutboundCount: "གླང་ཕྱིར་ཐོན།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formCooperativeName: "མཉམ་ལས་ཁང་མིང་།",
+    formLegalRepresentative: "ཁྲིམས་མིའི་ངོ་ཚབ།",
+    formEstablishDate: "འཛུགས་དུས།",
+    formRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
+    formYearEndTotalAssets: "ལོ་མཇུག་རྒྱུ་ནོར་སྤྱི།",
+    formMemberHouseholdCount: "ཞུགས་ཁྱིམ་གྲངས།",
+    formMemberPopulationCount: "ཞུགས་མི་གྲངས།",
+    formPovertyMonitorCount: "དབུལ་ལོག་སྔོན་འགོག་ལྟ་ཞིབ་མི་གྲངས།",
+    formCattleShareCount: "གླང་ཤ་སྒོར་གྲངས།",
+    formSheepShareCount: "ལུག་ཤ་སྒོར་གྲངས།",
+    formLivestockShareTotal: "ཕྱུགས་ཤ་སྒོར་ཆུང་བསྡོམས།",
+    formGrasslandShareArea: "རྩྭ་ཐང་ཤ་སྒོར།",
+    formLaborShareCount: "ངལ་རྩོལ་ཤ་སྒོར།",
+    formCashShareAmount: "དངུལ་ཤ་སྒོར།",
+    formOtherShareAmount: "གཞན་ཤ་སྒོར།",
+    formTotalIncome: "ཡོང་འབབ་སྤྱི།",
+    formNetIncome: "དག་ཡོང་།",
+    formCashDividend: "དངུལ་བགོ་བཤའ།",
+    formInKindDividend: "དངོས་པོ་བགོ་བཤའ་བརྩིས།",
+    formRevolvingFund: "འཁོར་དངུལ།",
+    formLossAmount: "གྱོང་གུད།",
+    formCollegeGraduateCount: "སློབ་ཆེན་མཐར་ཕྱིན་བསྡུ།",
+    formCollegeGraduateWage: "སློབ་ཆེན་གླ་ཕོགས་ཡོང་འབབ།",
+    formFarmerTransferEmploymentCount: "ཞིང་འབྲོག་པ་ལས་གནས་སྤོ།",
+    formFarmerTransferWage: "ཞིང་འབྲོག་པ་གླ་ཕོགས་ཡོང་འབབ།",
+    formCattleInventoryCount: "གླང་གནས་ཚད།",
+    formCattleOutboundCount: "གླང་ཕྱིར་ཐོན།",
+    formSheepInventoryCount: "ལུག་གནས་ཚད།",
+    formSheepOutboundCount: "ལུག་ཕྱིར་ཐོན།",
+    formTrademarkProductCount: "ཐོ་འགོད་ཐོབ་རྟགས་ཐོན་རྫས་གྲངས།",
+    formQualityCertProductCount: "སྤུས་ཚད་ངོས་འཛིན་ཐོན་རྫས་གྲངས།",
+    formTrainingManageCount: "སློབ་སྦྱོང-དོ་དམ་ནུས་པ།",
+    formTrainingSkillCount: "སློབ་སྦྱོང-ཆེད་ལས་ལག་རྩལ།",
+    formTrainingOtherCount: "སློབ་སྦྱོང-གཞན།",
+    formBusinessScope: "གཙོ་བོ་ཚོང་གཉེར་ཁྱབ་ཁོངས།",
+    formBusinessModel: "ཚོང་གཉེར་རྣམ་པ།",
+    formOperationStatus: "འཁོར་སྐྱོད་གནས་ཚུལ།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionMemberShare: "ཞུགས་པ་དང་ཤ་སྒོར།",
+    sectionBenefit: "ཕན་འབྲས་གནས་ཚུལ།",
+    sectionEmploymentLivestock: "ལས་ཞུགས་དང་གནས་ཕྱིར་ཐོན།",
+    sectionProductTraining: "ཐོན་རྫས་ངོས་འཛིན་དང་སློབ་སྦྱོང།",
+    sectionOperation: "ཚོང་གཉེར་གནས་ཚུལ།",
+    btnImport: "ནང་འདྲེན།",
+    btnChooseFile: "ཡིག་ཆ་འདེམས།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearInvalid: "ཕྱིར་འདྲེན་ལོ་ཟླ་འདེམས་ཁོངས་ནང་མེད།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་མཉམ་ལས་ཁང་མིང་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]མཉམ་ལས་ཁང་འཕེལ་རྒྱས་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]མཉམ་ལས་ཁང་འཕེལ་རྒྱས་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitHousehold: "ཁྱིམ།",
+    unitPerson: "མི།",
+    unitHead: "ཨ།",
+    unitGe: "གྲངས།",
+    unitWanYuan: "ཁྲི་སྒོར།",
+    unitWanMu: "ཁྲི་མུ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleCooperativeNameRequired: "མཉམ་ལས་ཁང་མིང་འབྲི་རོགས།",
+    ruleCooperativeNameLen: "མཉམ་ལས་ཁང་མིང་ཡིག་ཆ་200ལས་མི་ཆོག",
+    ruleLegalRepLen: "ཁྲིམས་མིའི་ངོ་ཚབ་ཡིག་ཆ་64ལས་མི་ཆོག",
+    ruleEstablishDateLen: "འཛུགས་དུས་ཡིག་ཆ་32ལས་མི་ཆོག",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  disposableIncome: {
+    queryStatYear: "གཏོགས་ལོ།",
+    colStatYear: "གཏོགས་ལོ།",
+    colRuralDisposableIncome: "གྲོང་གསེབ་མི་དམངས་མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ།",
+    colIncomeIncrease: "འཕར་ཚད།",
+    colIncomeGrowthRate: "འཕེལ་མྱུར།",
+    colPovertyNetIncome: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་།",
+    formStatYear: "གཏོགས་ལོ།",
+    formRuralDisposableIncome: "གྲོང་གསེབ་མི་དམངས་མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ།",
+    formIncomeIncrease: "འཕར་ཚད།",
+    formIncomeGrowthRate: "འཕེལ་མྱུར།",
+    formPovertyNetIncome: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་།",
+    formRemark: "ཟིན་བྲིས།",
+    phIncomeIncrease: "འདེམས་འབྲི，སྒོར；མ་འབྲི་ན་སྔོན་ལོ་ལྟར་རང་རྩིས།",
+    phIncomeGrowthRate: "འདེམས་འབྲི，ཆ་ཤས་དཔེར་ན་ 0.1228；མ་འབྲི་ན་རང་རྩིས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    dialogAdd: "[གསར་སྣོན]སྤྱོད་ཆོག་ཡོང་འབབ་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]སྤྱོད་ཆོག་ཡོང་འབབ་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitYuan: "སྒོར།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleRuralIncomeRequired: "གྲོང་གསེབ་མི་དམངས་མི་རེའི་སྤྱོད་ཆོག་ཡོང་འབབ་འབྲི་རོགས།",
+    rulePovertyIncomeRequired: "དབུལ་སྐྱོབ་མི་མང་མི་རེའི་དག་ཡོང་འབྲི་རོགས།",
+    ruleMoneyNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    ruleNumberInvalid: "ནུས་ལྡན་གྲངས་འབྲི་རོགས།"
+  },
+  livestockProductOutput: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colMeatOutput: "ཤ་ཐོན་ཚད།",
+    colMilkOutput: "འོ་མ་ཐོན་ཚད།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formMeatOutput: "ཤ་ཐོན་ཚད།",
+    formMilkOutput: "འོ་མ་ཐོན་ཚད།",
+    formRemark: "ཟིན་བྲིས།",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportTown: "ཤང་གྲོང།",
+    exportTownPh: "མ་འདེམས་ན་ལོ་ཟླ་དེའི་ཤང་གྲོང་ཚང་མ་ཕྱིར་འདྲེན།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearInvalid: "ཕྱིར་འདྲེན་ལོ་ཟླ་འདེམས་ཁོངས་ནང་མེད།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]ཕྱུགས་ལས་ཐོན་རྫས་ཐོན་ཚད།",
+    dialogEdit: "[རྩོམ་སྒྲིག]ཕྱུགས་ལས་ཐོན་རྫས་ཐོན་ཚད།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "ཐོ་འགོད་གཞི་གྲངས་མེད།",
+    unitWanTon: "ཁྲི་ཏུན།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
+  },
+  familyRanch: {
+    queryStatYear: "གཏོགས་ལོ།",
+    queryStatMonth: "གཏོགས་ཟླ།",
+    queryTown: "ཤང་གྲོང།",
+    queryEnterpriseName: "ཁེ་ལས་མིང་།",
+    phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
+    phEnterpriseName: "ཁེ་ལས་མིང་འབྲི་རོགས།",
+    phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
+    colStatYear: "གཏོགས་ལོ།",
+    colStatMonth: "གཏོགས་ཟླ།",
+    statMonthLabel: "{month}ཟླ།",
+    colTownName: "ཤང་གྲོང།",
+    colVillageName: "གྲོང་ཚོ།",
+    colEnterpriseName: "ཁེ་ལས་མིང་།",
+    colLegalRepresentative: "ཁྲིམས་མིའི་ངོ་ཚབ།",
+    colEnterpriseType: "ཁེ་ལས་རིགས།",
+    colRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
+    colEstablishDate: "འཛུགས་དུས།",
+    colCattleYearEndStock: "གླང་གནས་ཚད།",
+    colCattleOutbound: "གླང་ཕྱིར་ཐོན།",
+    colGrasslandArea: "རྩྭ་ཐང་རྒྱ་ཁྱོན།",
+    formStatYear: "གཏོགས་ལོ།",
+    formStatMonth: "གཏོགས་ཟླ།",
+    formTown: "ཤང་གྲོང།",
+    formVillage: "གྲོང་ཚོ།",
+    formEnterpriseName: "ཁེ་ལས་མིང་།",
+    formLegalRepresentative: "ཁྲིམས་མིའི་ངོ་ཚབ།",
+    formEnterpriseType: "ཁེ་ལས་རིགས།",
+    formRegisteredCapital: "ཐོ་འགོད་མ་རྩ།",
+    formEstablishDate: "འཛུགས་དུས།",
+    formLivestockLaborCount: "ཕྱུགས་ལས་ངལ་རྩོལ་མི་སྣ།",
+    formCattleYearEndStock: "གླང་ལོ་མཇུག་གནས་ཚད།",
+    formCattleBreedingFemaleStock: "གླང་འཕེལ་ནུས་མོ་ཕྱུགས།",
+    formSheepYearEndStock: "ལུག་ལོ་མཇུག་གནས་ཚད།",
+    formSheepBreedingFemaleStock: "ལུག་འཕེལ་ནུས་མོ་ཕྱུགས།",
+    formCattleOutbound: "གླང་ཕྱིར་ཐོན།",
+    formSheepOutbound: "ལུག་ཕྱིར་ཐོན།",
+    formStockSubtotal: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད་ཆུང་བསྡོམས།",
+    formGrassBalanceArea: "རྩྭ་ཕྱུགས་སྙོམས་རྒྱ་ཁྱོན།",
+    formTransferGrassArea: "བརྗེ་སྤོ་ཚོང་གཉེར་རྩྭ་ས་རྒྱ་ཁྱོན།",
+    formGrasslandAreaSubtotal: "རྩྭ་ཐང་རྒྱ་ཁྱོན་ཆུང་བསྡོམས།",
+    formApprovedCarryingCapacity: "གཏན་འཁེལ་ལོ་མཇུག་རྩྭ་ཕྱུགས་སྙོམས་ཁུར་ཚད།",
+    formYearEndStockSheepUnit: "ལོ་མཇུག་ཕྱུགས་གནས་ཚད།",
+    formIsGrassBalanced: "རྩྭ་ཕྱུགས་སྙོམས་ཁྱིམ་ཡིན་ནམ།",
+    formIncome: "ལོ་རེའི་ཚོང་གཉེར་ཡོང་འབབ་སྤྱི།",
+    formExpense: "ལོ་རེའི་ཚོང་གཉེར་འགྲོ་སོང་སྤྱི།",
+    formProfit: "ཁེ་བཟང་།",
+    formSubsidyYear: "རོགས་དངུལ་ལོ།",
+    formHasSubsidy: "རོགས་དངུལ་ཐོབ་ཡོད་དམ།",
+    formSubsidyAmount: "རོགས་དངུལ།",
+    formHasTrademark: "ཐོ་འགོད་ཐོབ་རྟགས་ཡོད་དམ།",
+    formHasQualityCert: "ཞིང་ཐོན་སྤུས་ཚད་ངོས་འཛིན་བརྒྱུད་ཡོད་དམ།",
+    formSalesChannel: "ཐོན་རྫས་བཙོང་ལམ།",
+    formDrivenPopulation: "སྐུལ་འདེད་མི་གྲངས།",
+    formWagePaid: "གླ་ཕོགས་སྤྲོད།",
+    formRemark: "ཟིན་བྲིས།",
+    sectionBasic: "གཞི་རྩའི་གནས་ཚུལ།",
+    sectionStock: "གནས་ཚད་དང་ཕྱིར་ཐོན།",
+    sectionGrassland: "རྩྭ་ཐང་དང་རྩྭ་ཕྱུགས་སྙོམས།",
+    sectionFinance: "ཚོང་གཉེར་དང་རོགས་དངུལ།",
+    sectionOther: "གཞན།",
+    btnImport: "ནང་འདྲེན།",
+    btnDownloadTemplate: "དཔེ་ཡིག་ཕབ་ལེན།",
+    exportTitle: "Excel ཕྱིར་འདྲེན།",
+    exportStatYear: "གཏོགས་ལོ།",
+    exportStatYearPh: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonth: "གཏོགས་ཟླ།",
+    exportStatMonthPh: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    exportStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    exportStatYearInvalid: "ཕྱིར་འདྲེན་ལོ་ཟླ་འདེམས་ཁོངས་ནང་མེད།",
+    exportLoading: "ཕྱིར་འདྲེན་བཞིན... སྒུག་རོགས།",
+    exportFail: "ཕྱིར་འདྲེན་ཕམ།",
+    importTitle: "Excel ནང་འདྲེན།",
+    importStatYear: "འབྲི་ལོ།",
+    importStatYearPh: "འབྲི་ལོ་འདེམས་རོགས།",
+    importStatMonth: "འབྲི་ཟླ།",
+    importStatMonthPh: "འབྲི་ཟླ་འདེམས་རོགས།",
+    importTip: "སྔོན་ལ་འབྲི་ལོ་ཟླ་འདེམས，དེ་ནས་དཔེ་ཡིག་དང་མཐུན་པའི .xlsx ཡར་འཇུག；ལོ་ཟླ་གྲོང་ཚོ་ཁེ་ལས་མིང་གཅིག་པ་ཡོད་ན་རྩོམ་སྒྲིག",
+    importLoading: "ནང་འདྲེན་བཞིན... སྒུག་རོགས།",
+    importSummary: "ནང་འདྲེན་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    importWarnTitle: "ནང་འདྲེན་ཉེན་བརྡ།",
+    importFailTitle: "ནང་འདྲེན་ཕམ་ཞིབ།",
+    dialogAdd: "[གསར་སྣོན]ཁྱིམ་ཚང་འབྲོག་ར་གཞི་གྲངས།",
+    dialogEdit: "[རྩོམ་སྒྲིག]ཁྱིམ་ཚང་འབྲོག་ར་གཞི་གྲངས།",
+    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
+    emptyList: "འབྲི་གཞི་གྲངས་མེད།",
+    unitPerson: "མི།",
+    unitHead: "ཨ།",
+    unitMu: "མུ།",
+    unitWanYuan: "ཁྲི་སྒོར།",
+    unitSheepUnit: "ལུག་རིམ།",
+    ruleStatYearRequired: "གཏོགས་ལོ་འདེམས་རོགས།",
+    ruleStatMonthRequired: "གཏོགས་ཟླ་འདེམས་རོགས།",
+    ruleStatMonthFuture: "མ་འོངས་ཟླ་འབྲི་མི་ཆོག",
+    ruleVillageRequired: "གྲོང་ཚོ་འདེམས་རོགས།",
+    ruleEnterpriseNameRequired: "ཁེ་ལས་མིང་འབྲི་རོགས།",
+    ruleEnterpriseNameLen: "ཁེ་ལས་མིང་ཡིག་ཆ་200ལས་མི་ཆོག",
+    ruleLegalRepLen: "ཁྲིམས་མིའི་ངོ་ཚབ་ཡིག་ཆ་64ལས་མི་ཆོག",
+    ruleCountNonNegative: "0་ཡན་གྱི་ཧྲིལ་གྲངས་དགོས།",
+    ruleDecimalNonNegative: "0་ཡན་གྱི་གྲངས་དགོས།",
+    villageTreeEmpty: "གྲོང་ཚོའི་སྒྲིག་འཛུགས་མ་ལོན，ལས་ཁུངས་ནང་「ཤང་གྲོང→གྲོང་ཚོ」ཡོད་མེད་ཞིབ་རོགས།"
   }
 }

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

@@ -278,9 +278,11 @@ export default {
     queryStatYear: "所属年份",
     queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
+    queryVillage: "所属村",
     colStatYear: "所属年份",
     colStatMonth: "所属月份",
-    colTownName: "乡镇",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
     statMonthLabel: "{month}月",
     colVillageCount: "村居数",
     colHerdsmanHouseholdCount: "牧户数",
@@ -290,24 +292,28 @@ export default {
     formStatYear: "所属年份",
     formStatMonth: "所属月份",
     formTown: "所属乡镇",
+    formVillage: "所属村",
     formVillageCount: "村居数",
     formHerdsmanHouseholdCount: "牧户数",
-    formYakTotal: "牦牛存栏数",
-    formBullTotal: "公牛存栏数",
-    formCowTotal: "母牛存栏数",
     formBreedingBullCount: "种公牛存栏数",
     formBullCastratedCount: "公牛/阉畜存栏数",
-    formCowUnder1Count: "1岁以下母牛存栏数",
-    formCow13Count: "1～3岁母牛存栏数",
-    formCow312Count: "3～12岁母牛存栏数",
-    formCowOver12Count: "12岁以上母牛存栏数",
+    formCowYoungCount: "0～1.5岁幼畜存栏数",
+    formCowAdultCount: "1.5岁以上成畜存栏数",
+    formMilkingCowCount: "产奶母牛存栏数",
+    formFertileCowCount: "能繁母牛存栏数",
+    formSheepTotal: "羊总存栏数",
+    formMilkingSheepCount: "产奶羊存栏数",
+    formInsuredYakCount: "保险牦牛存栏数",
+    formBullTotal: "公牛合计",
+    formCowTotal: "母牛合计",
+    formDairyTotal: "奶牛合计",
+    formYakTotal: "牦牛总存栏",
+    formGrandTotal: "总合计",
+    formYakSheepTotal: "总量（牦牛+羊）",
     formRemark: "备注",
     phRemark: "选填，不超过 500 字",
-    formVillageDeptId: "所属村居ID（预留）",
-    formVillageName: "所属村居（预留）",
     sectionBasic: "基本信息",
     sectionInventory: "存栏指标",
-    sectionReserved: "预留字段",
     btnImport: "导入",
     btnDownloadTemplate: "下载模板",
     exportTitle: "Excel 导出",
@@ -315,6 +321,8 @@ export default {
     exportStatYearPh: "请选择所属年份",
     exportStatMonth: "所属月份",
     exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
     exportStatYearRequired: "请选择所属年份",
     exportStatMonthRequired: "请选择所属月份",
     exportStatYearInvalid: "导出年月不在可选范围内",
@@ -325,7 +333,7 @@ export default {
     importStatYearPh: "请选择填报年份",
     importStatMonth: "填报月份",
     importStatMonthPh: "请选择填报月份",
-    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村已存在则更新",
     importLoading: "正在导入，请稍候...",
     importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
     importWarnTitle: "导入警告",
@@ -340,9 +348,9 @@ export default {
     ruleStatYearRequired: "请选择所属年份",
     ruleStatMonthRequired: "请选择所属月份",
     ruleStatMonthFuture: "不可填报未来月份",
-    ruleTownRequired: "请选择所属乡镇",
-    ruleCountRequired: "请填写该项",
+    ruleVillageRequired: "请选择所属村",
     ruleCountNonNegative: "须为大于等于 0 的整数",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」",
     viewCreateBy: "创建人",
     viewUpdateBy: "修改人",
     viewUpdateTime: "修改时间"
@@ -351,28 +359,35 @@ export default {
     queryStatYear: "所属年份",
     queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
+    queryVillage: "所属村",
     colStatYear: "所属年份",
     colStatMonth: "所属月份",
     statMonthLabel: "{month}月",
     colTownName: "所属乡镇",
-    colFarmerHouseholdCount: "农牧户户数",
-    colFarmerPopulationCount: "农牧户人数",
+    colVillageName: "所属村",
+    colFarmerHouseholdCount: "农牧户数",
+    colFarmerPopulationCount: "农牧人数",
     colYakOutboundCount: "牦牛出栏数",
-    colSelfConsumptionCattle: "自食情况（牛）",
+    colOutboundTotal: "牲畜总出栏数",
+    colSelfConsumptionCattle: "自食牛数",
+    colSelfConsumptionTotal: "自食牲畜总数",
     formStatYear: "所属年份",
     formStatMonth: "所属月份",
     formTown: "所属乡镇",
-    formFarmerHouseholdCount: "农牧户户数",
-    formFarmerPopulationCount: "农牧户人数",
+    formVillage: "所属村",
+    formFarmerHouseholdCount: "农牧户数",
+    formFarmerPopulationCount: "农牧人数",
     formYakOutboundCount: "牦牛出栏数",
     formCattleOutboundCount: "黄牛/奶牛/犏牛出栏数",
     formSheepOutboundCount: "绵羊出栏数",
     formGoatOutboundCount: "山羊出栏数",
     formHorseMuleOutboundCount: "马骡出栏数",
     formDonkeyOutboundCount: "驴出栏数",
-    formSelfConsumptionCattleCount: "自食牛头数",
-    formSelfConsumptionSheepCount: "自食绵羊只数",
-    formSelfConsumptionGoatCount: "自食山羊只数",
+    formSelfConsumptionCattleCount: "自食牛数",
+    formSelfConsumptionSheepCount: "自食绵羊数",
+    formSelfConsumptionGoatCount: "自食山羊数",
+    formOutboundTotal: "牲畜总出栏数",
+    formSelfConsumptionTotal: "自食牲畜总数",
     formRemark: "备注",
     phRemark: "选填，不超过 500 字",
     sectionBasic: "基本信息",
@@ -386,6 +401,8 @@ export default {
     exportStatYearPh: "请选择所属年份",
     exportStatMonth: "所属月份",
     exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
     exportStatYearRequired: "请选择所属年份",
     exportStatMonthRequired: "请选择所属月份",
     exportStatYearInvalid: "导出年月不在可选范围内",
@@ -396,7 +413,7 @@ export default {
     importStatYearPh: "请选择填报年份",
     importStatMonth: "填报月份",
     importStatMonthPh: "请选择填报月份",
-    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村已存在则更新",
     importLoading: "正在导入，请稍候...",
     importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
     importWarnTitle: "导入警告",
@@ -413,7 +430,314 @@ export default {
     ruleStatYearRequired: "请选择所属年份",
     ruleStatMonthRequired: "请选择所属月份",
     ruleStatMonthFuture: "不可填报未来月份",
-    ruleTownRequired: "请选择所属乡镇",
-    ruleCountNonNegative: "须为大于等于 0 的整数"
+    ruleVillageRequired: "请选择所属村",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  cooperativeDevelopment: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    queryVillage: "所属村",
+    queryCooperativeName: "合作社名称",
+    phVillageSearch: "请选择或输入搜索",
+    phCooperativeName: "请输入合作社名称",
+    phEstablishDate: "如 2020-01-01",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colVillageName: "所属村",
+    colTownName: "所属乡镇",
+    colCooperativeName: "合作社名称",
+    colLegalRepresentative: "法定代表人",
+    colEstablishDate: "成立时间",
+    colRegisteredCapital: "注册资本",
+    colYearEndTotalAssets: "截止年底总资产",
+    colTotalIncome: "总收入",
+    colLossAmount: "亏损",
+    colCattleInventoryCount: "牛存栏",
+    colCattleOutboundCount: "牛出栏",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formCooperativeName: "合作社名称",
+    formLegalRepresentative: "法定代表人",
+    formEstablishDate: "成立时间",
+    formRegisteredCapital: "注册资本",
+    formYearEndTotalAssets: "截止年底总资产",
+    formMemberHouseholdCount: "入社户数",
+    formMemberPopulationCount: "入社人数",
+    formPovertyMonitorCount: "防返贫监测人数",
+    formCattleShareCount: "牛入股数量",
+    formSheepShareCount: "羊入股数量",
+    formLivestockShareTotal: "牲畜入股小计",
+    formGrasslandShareArea: "草场入股",
+    formLaborShareCount: "劳动力入股",
+    formCashShareAmount: "现金入股",
+    formOtherShareAmount: "其他入股",
+    formTotalIncome: "总收入",
+    formNetIncome: "纯收入",
+    formCashDividend: "现金分红",
+    formInKindDividend: "实物分红折算",
+    formRevolvingFund: "周转金",
+    formLossAmount: "亏损",
+    formCollegeGraduateCount: "吸纳大学生",
+    formCollegeGraduateWage: "大学生工资性收入",
+    formFarmerTransferEmploymentCount: "农牧民转移就业",
+    formFarmerTransferWage: "农牧民工资性收入",
+    formCattleInventoryCount: "牛存栏",
+    formCattleOutboundCount: "牛出栏",
+    formSheepInventoryCount: "羊存栏",
+    formSheepOutboundCount: "羊出栏",
+    formTrademarkProductCount: "注册商标产品数量",
+    formQualityCertProductCount: "质量认证产品数量",
+    formTrainingManageCount: "培训-管理能力",
+    formTrainingSkillCount: "培训-专业技能",
+    formTrainingOtherCount: "培训-其他",
+    formBusinessScope: "主要经营范围",
+    formBusinessModel: "经营模式分类",
+    formOperationStatus: "运营情况",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionMemberShare: "入社与入股",
+    sectionBenefit: "效益情况",
+    sectionEmploymentLivestock: "就业与存出栏",
+    sectionProductTraining: "产品认证与培训",
+    sectionOperation: "经营情况",
+    btnImport: "导入",
+    btnChooseFile: "选取文件",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围内",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村同合作社名称已存在则更新",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]合作社发展数据",
+    dialogEdit: "[编辑]合作社发展数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitHousehold: "户",
+    unitPerson: "人",
+    unitHead: "头",
+    unitGe: "个",
+    unitWanYuan: "万元",
+    unitWanMu: "万亩",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleCooperativeNameRequired: "请输入合作社名称",
+    ruleCooperativeNameLen: "合作社名称不能超过 200 字",
+    ruleLegalRepLen: "法定代表人不能超过 64 字",
+    ruleEstablishDateLen: "成立时间不能超过 32 字",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    ruleDecimalNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  disposableIncome: {
+    queryStatYear: "所属年份",
+    colStatYear: "所属年份",
+    colRuralDisposableIncome: "农村居民人均可支配收入",
+    colIncomeIncrease: "增幅",
+    colIncomeGrowthRate: "增速",
+    colPovertyNetIncome: "脱贫人口人均纯收入",
+    formStatYear: "所属年份",
+    formRuralDisposableIncome: "农村居民人均可支配收入",
+    formIncomeIncrease: "增幅",
+    formIncomeGrowthRate: "增速",
+    formPovertyNetIncome: "脱贫人口人均纯收入",
+    formRemark: "备注",
+    phIncomeIncrease: "选填，元；不填则按上年自动计算",
+    phIncomeGrowthRate: "选填，小数如 0.1228；不填则自动计算",
+    phRemark: "选填，不超过 500 字",
+    dialogAdd: "[新增]可支配收入数据",
+    dialogEdit: "[编辑]可支配收入数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitYuan: "元",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleRuralIncomeRequired: "请输入农村居民人均可支配收入",
+    rulePovertyIncomeRequired: "请输入脱贫人口人均纯收入",
+    ruleMoneyNonNegative: "须为大于等于 0 的数字",
+    ruleNumberInvalid: "请输入有效数字"
+  },
+  livestockProductOutput: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    queryVillage: "所属村",
+    phVillageSearch: "请选择或输入搜索",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colMeatOutput: "肉产量",
+    colMilkOutput: "奶产量",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formMeatOutput: "肉产量",
+    formMilkOutput: "奶产量",
+    formRemark: "备注",
+    btnImport: "导入",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
+    exportTown: "所属乡镇",
+    exportTownPh: "不选则导出该年月全部乡镇",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围内",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村已存在则更新",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]畜牧产品产量",
+    dialogEdit: "[编辑]畜牧产品产量",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无登记数据",
+    unitWanTon: "万吨",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleDecimalNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
+  },
+  familyRanch: {
+    queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
+    queryTown: "所属乡镇",
+    queryEnterpriseName: "企业名称",
+    phVillageSearch: "请选择或输入搜索",
+    phEnterpriseName: "请输入企业名称",
+    phRemark: "选填，不超过 500 字",
+    colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
+    colTownName: "所属乡镇",
+    colVillageName: "所属村",
+    colEnterpriseName: "企业名称",
+    colLegalRepresentative: "法定代表人",
+    colEnterpriseType: "企业类型",
+    colRegisteredCapital: "注册资本",
+    colEstablishDate: "成立时间",
+    colCattleYearEndStock: "牛存栏",
+    colCattleOutbound: "牛出栏",
+    colGrasslandArea: "草场面积",
+    formStatYear: "所属年份",
+    formStatMonth: "所属月份",
+    formTown: "所属乡镇",
+    formVillage: "所属村",
+    formEnterpriseName: "企业名称",
+    formLegalRepresentative: "法定代表人",
+    formEnterpriseType: "企业类型",
+    formRegisteredCapital: "注册资本",
+    formEstablishDate: "成立时间",
+    formLivestockLaborCount: "从事畜牧业劳力人员",
+    formCattleYearEndStock: "牛年底存栏",
+    formCattleBreedingFemaleStock: "牛能繁母畜",
+    formSheepYearEndStock: "羊年底存栏",
+    formSheepBreedingFemaleStock: "羊能繁母畜",
+    formCattleOutbound: "牛出栏",
+    formSheepOutbound: "羊出栏",
+    formStockSubtotal: "年底牲畜存栏小计",
+    formGrassBalanceArea: "草畜平衡面积",
+    formTransferGrassArea: "流转经营草地面积",
+    formGrasslandAreaSubtotal: "草场面积小计",
+    formApprovedCarryingCapacity: "核定年末草畜平衡载畜量",
+    formYearEndStockSheepUnit: "年底牲畜存栏",
+    formIsGrassBalanced: "是否草畜平衡户",
+    formIncome: "年度经营总收入",
+    formExpense: "年度经营总支出",
+    formProfit: "利润",
+    formSubsidyYear: "补助资金年份",
+    formHasSubsidy: "是否享受补助",
+    formSubsidyAmount: "补贴资金",
+    formHasTrademark: "是否有注册商标",
+    formHasQualityCert: "是否通过农产品质量认证",
+    formSalesChannel: "产品销售渠道",
+    formDrivenPopulation: "带动人数",
+    formWagePaid: "发放工资",
+    formRemark: "备注",
+    sectionBasic: "基本信息",
+    sectionStock: "存栏与出栏",
+    sectionGrassland: "草场与草畜平衡",
+    sectionFinance: "经营与补助",
+    sectionOther: "其他",
+    btnImport: "导入",
+    btnDownloadTemplate: "下载模板",
+    exportTitle: "Excel 导出",
+    exportStatYear: "所属年份",
+    exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
+    exportStatYearRequired: "请选择所属年份",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围内",
+    exportLoading: "正在导出，请稍候...",
+    exportFail: "导出失败",
+    importTitle: "Excel 导入",
+    importStatYear: "填报年份",
+    importStatYearPh: "请选择填报年份",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件；同年同月同村同企业名称已存在则更新",
+    importLoading: "正在导入，请稍候...",
+    importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    importWarnTitle: "导入警告",
+    importFailTitle: "导入失败明细",
+    dialogAdd: "[新增]家庭牧场数据",
+    dialogEdit: "[编辑]家庭牧场数据",
+    confirmDelete: "是否确认删除这条数据？",
+    emptyList: "暂无填报数据",
+    unitPerson: "人",
+    unitHead: "头",
+    unitMu: "亩",
+    unitWanYuan: "万元",
+    unitSheepUnit: "绵羊单位",
+    ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
+    ruleVillageRequired: "请选择所属村",
+    ruleEnterpriseNameRequired: "请输入企业名称",
+    ruleEnterpriseNameLen: "企业名称不能超过 200 字",
+    ruleLegalRepLen: "法定代表人不能超过 64 字",
+    ruleCountNonNegative: "须为大于等于 0 的整数",
+    ruleDecimalNonNegative: "须为大于等于 0 的数字",
+    villageTreeEmpty: "未加载到村级组织数据，请确认系统部门已维护「乡镇→村」"
   }
 }

ruoyi-ui/src/mixins/dataModelLocaleMixin.js

@@ -1,5 +1,7 @@
 /**
  * 产业数据模型及体系：dmT（data.dmNs）、dmCommon（通用按钮/校验）
+ *
+ * 查看弹窗约定：数值类字段须用 formatWithUnit 展示单位（与表单后缀一致）。
  */
 export default {
   methods: {
@@ -13,6 +15,21 @@ export default {
     dmCommon(key) {
       return this.$t(`dataModel.common.${key}`)
     },
+    /**
+     * 查看弹窗：数值 + 单位。空值仅显示 —，不拼单位。
+     * @param {*} value 已格式化或原始展示值
+     * @param {string} [unitKey] 模块内单位 i18n 键，如 unitHead
+     */
+    formatWithUnit(value, unitKey) {
+      const dash = this.$t("dataModel.status.dash")
+      if (value == null || value === "" || value === dash) {
+        return dash
+      }
+      if (!unitKey) {
+        return value
+      }
+      return `${value} ${this.dmT(unitKey)}`
+    },
     warningTypeText(type) {
       if (type === 1) {
         return this.$t("dataModel.yakDiseaseWarning.warningType1")

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

@@ -0,0 +1,506 @@
+<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: 140px">
+            <el-option v-for="y in yearOptions" :key="y" :label="String(y)" :value="y" />
+          </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:disposableIncome:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</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="120" />
+        <el-table-column :label="dmT('colRuralDisposableIncome')" align="center" min-width="180">
+          <template slot-scope="scope">{{ formatMoney(scope.row.ruralDisposableIncome) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colIncomeIncrease')" align="center" min-width="120">
+          <template slot-scope="scope">{{ formatIncrease(scope.row.incomeIncrease) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colIncomeGrowthRate')" align="center" min-width="120">
+          <template slot-scope="scope">{{ formatGrowthRate(scope.row.incomeGrowthRate) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colPovertyNetIncome')" align="center" min-width="180">
+          <template slot-scope="scope">{{ formatMoney(scope.row.povertyNetIncome) }}</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:disposableIncome:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:disposableIncome:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:disposableIncome: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="640px" append-to-body @close="cancel">
+      <el-form :key="formKey" ref="form" :model="form" label-width="180px" size="small">
+        <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%" @change="onStatYearOrIncomeChange">
+            <el-option v-for="y in yearOptions" :key="'f-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="ruralDisposableIncome" :rules="formRules.ruralDisposableIncome">
+          <template slot="label">{{ dmT("formRuralDisposableIncome") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.ruralDisposableIncome"
+              :min="0"
+              :precision="2"
+              :controls="true"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+              @change="onStatYearOrIncomeChange"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitYuan") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="incomeIncrease" :rules="formRules.optionalNumber">
+          <template slot="label">{{ dmT("formIncomeIncrease") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input
+              v-model="form.incomeIncrease"
+              :placeholder="dmT('phIncomeIncrease')"
+              clearable
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitYuan") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="incomeGrowthRate" :rules="formRules.optionalNumber">
+          <template slot="label">{{ dmT("formIncomeGrowthRate") }}</template>
+          <el-input
+            v-model="form.incomeGrowthRate"
+            :placeholder="dmT('phIncomeGrowthRate')"
+            clearable
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item prop="povertyNetIncome" :rules="formRules.povertyNetIncome">
+          <template slot="label">{{ dmT("formPovertyNetIncome") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.povertyNetIncome"
+              :min="0"
+              :precision="2"
+              :controls="true"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitYuan") }}</span>
+          </div>
+        </el-form-item>
+        <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="640px" append-to-body>
+      <el-form label-width="180px" size="small">
+        <el-form-item :label="dmT('formStatYear')">
+          <span>{{ viewRow.statYear || dash }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formRuralDisposableIncome')">
+          <span>{{ formatWithUnit(formatMoney(viewRow.ruralDisposableIncome), "unitYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formIncomeIncrease')">
+          <span>{{ formatWithUnit(formatIncrease(viewRow.incomeIncrease), "unitYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formIncomeGrowthRate')">
+          <span>{{ formatGrowthRate(viewRow.incomeGrowthRate) }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formPovertyNetIncome')">
+          <span>{{ formatWithUnit(formatMoney(viewRow.povertyNetIncome), "unitYuan") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formRemark')">
+          <span class="di-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-hasPermi="['dataModel:disposableIncome:edit']"
+          type="primary"
+          @click="handleEditFromView"
+        >{{ dmCommon("edit") }}</el-button>
+        <el-button @click="viewOpen = false">{{ dmCommon("close") }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import dataModelLocaleMixin from "@/mixins/dataModelLocaleMixin"
+import {
+  listDisposableIncome,
+  getDisposableIncome,
+  addDisposableIncome,
+  updateDisposableIncome,
+  delDisposableIncome,
+  listDisposableIncomeYearOptions
+} from "@/api/dataModel/disposableIncome"
+
+function createEmptyForm() {
+  return {
+    id: undefined,
+    statYear: undefined,
+    ruralDisposableIncome: undefined,
+    incomeIncrease: undefined,
+    incomeGrowthRate: undefined,
+    povertyNetIncome: undefined,
+    remark: undefined
+  }
+}
+
+function optionalFieldToInput(val) {
+  if (val == null || val === "") {
+    return undefined
+  }
+  return String(val)
+}
+
+function parseOptionalNumber(val) {
+  if (val == null || val === "") {
+    return undefined
+  }
+  const n = Number(val)
+  return Number.isFinite(n) ? n : NaN
+}
+
+function normalizeForm(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  if (row.ruralDisposableIncome != null && row.ruralDisposableIncome !== "") {
+    row.ruralDisposableIncome = Number(row.ruralDisposableIncome)
+  } else {
+    row.ruralDisposableIncome = undefined
+  }
+  if (row.povertyNetIncome != null && row.povertyNetIncome !== "") {
+    row.povertyNetIncome = Number(row.povertyNetIncome)
+  } else {
+    row.povertyNetIncome = undefined
+  }
+  row.incomeIncrease = optionalFieldToInput(row.incomeIncrease)
+  row.incomeGrowthRate = optionalFieldToInput(row.incomeGrowthRate)
+  return row
+}
+
+export default {
+  name: "DisposableIncome",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "disposableIncome",
+      loading: false,
+      open: false,
+      viewOpen: false,
+      dialogEdit: false,
+      formKey: 0,
+      total: 0,
+      tableList: [],
+      yearOptions: [],
+      viewRow: {},
+      /** 编辑时用于判断年份/可支配收入是否变更，以便清空增幅增速 */
+      baselineStatYear: undefined,
+      baselineRuralDisposableIncome: undefined,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        statYear: undefined
+      },
+      form: createEmptyForm()
+    }
+  },
+  computed: {
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    dialogTitle() {
+      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
+    },
+    formRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        ruralDisposableIncome: [
+          { required: true, message: this.dmT("ruleRuralIncomeRequired"), trigger: "change" },
+          { validator: this.validateNonNegativeMoney, trigger: "change" }
+        ],
+        povertyNetIncome: [
+          { required: true, message: this.dmT("rulePovertyIncomeRequired"), trigger: "change" },
+          { validator: this.validateNonNegativeMoney, trigger: "change" }
+        ],
+        optionalNumber: [{ validator: this.validateOptionalNumber, trigger: "blur" }],
+        remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
+      }
+    }
+  },
+  created() {
+    this.loadOptions()
+    this.getList()
+  },
+  methods: {
+    loadOptions() {
+      listDisposableIncomeYearOptions().then((res) => {
+        this.yearOptions = Array.isArray(res.data) ? res.data : []
+      })
+    },
+    formatMoney(val) {
+      if (val == null || val === "") {
+        return this.dash
+      }
+      const n = Number(val)
+      if (!Number.isFinite(n)) {
+        return this.dash
+      }
+      return n.toFixed(2)
+    },
+    /** 列表/详情：库中 null 显示为 0.00 */
+    formatIncrease(val) {
+      if (val == null || val === "") {
+        return "0.00"
+      }
+      const n = Number(val)
+      if (!Number.isFinite(n)) {
+        return "0.00"
+      }
+      return n.toFixed(2)
+    },
+    /** 列表/详情：库中 null 显示为 0.00%；小数转百分比 */
+    formatGrowthRate(val) {
+      if (val == null || val === "") {
+        return "0.00%"
+      }
+      const n = Number(val)
+      if (!Number.isFinite(n)) {
+        return "0.00%"
+      }
+      return (n * 100).toFixed(2) + "%"
+    },
+    validateNonNegativeMoney(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      if (typeof value !== "number" || Number.isNaN(value) || value < 0) {
+        callback(new Error(this.dmT("ruleMoneyNonNegative")))
+        return
+      }
+      callback()
+    },
+    validateOptionalNumber(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      const n = Number(value)
+      if (!Number.isFinite(n)) {
+        callback(new Error(this.dmT("ruleNumberInvalid")))
+        return
+      }
+      callback()
+    },
+    clearGrowthFields() {
+      this.form.incomeIncrease = undefined
+      this.form.incomeGrowthRate = undefined
+    },
+    onStatYearOrIncomeChange() {
+      if (!this.dialogEdit || !this.open) {
+        return
+      }
+      const yearChanged = this.form.statYear !== this.baselineStatYear
+      const incomeChanged = !this.sameDecimal(this.form.ruralDisposableIncome, this.baselineRuralDisposableIncome)
+      if (yearChanged || incomeChanged) {
+        this.clearGrowthFields()
+      }
+    },
+    sameDecimal(a, b) {
+      if (a == null && b == null) {
+        return true
+      }
+      if (a == null || b == null) {
+        return false
+      }
+      return Number(a) === Number(b)
+    },
+    buildListQuery() {
+      const q = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize
+      }
+      if (this.queryParams.statYear != null) {
+        q.statYear = this.queryParams.statYear
+      }
+      return q
+    },
+    buildPayload() {
+      const remarkText = this.form.remark != null ? String(this.form.remark).trim() : ""
+      const incomeIncrease = parseOptionalNumber(this.form.incomeIncrease)
+      const incomeGrowthRate = parseOptionalNumber(this.form.incomeGrowthRate)
+      return {
+        statYear: this.form.statYear,
+        ruralDisposableIncome: this.form.ruralDisposableIncome,
+        povertyNetIncome: this.form.povertyNetIncome,
+        incomeIncrease: incomeIncrease === undefined ? undefined : incomeIncrease,
+        incomeGrowthRate: incomeGrowthRate === undefined ? undefined : incomeGrowthRate,
+        remark: remarkText !== "" ? remarkText : undefined
+      }
+    },
+    getList() {
+      this.loading = true
+      listDisposableIncome(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.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleAdd() {
+      this.formKey += 1
+      this.form = createEmptyForm()
+      this.form.statYear = new Date().getFullYear()
+      this.baselineStatYear = undefined
+      this.baselineRuralDisposableIncome = undefined
+      this.dialogEdit = false
+      this.open = true
+      this.$nextTick(() => {
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
+    },
+    handleEdit(row) {
+      getDisposableIncome(row.id).then((res) => {
+        this.formKey += 1
+        this.dialogEdit = true
+        this.form = normalizeForm(res.data || {})
+        this.baselineStatYear = this.form.statYear
+        this.baselineRuralDisposableIncome = this.form.ruralDisposableIncome
+        this.open = true
+        this.viewOpen = false
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      })
+    },
+    handleEditFromView() {
+      this.handleEdit(this.viewRow)
+    },
+    handleView(row) {
+      getDisposableIncome(row.id).then((res) => {
+        this.viewRow = res.data || {}
+        this.viewOpen = true
+      })
+    },
+    handleDelete(row) {
+      this.$modal
+        .confirm(this.dmT("confirmDelete"))
+        .then(() => delDisposableIncome(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 (Number.isNaN(payload.incomeIncrease) || Number.isNaN(payload.incomeGrowthRate)) {
+          this.$modal.msgError(this.dmT("ruleNumberInvalid"))
+          return
+        }
+        if (this.dialogEdit) {
+          payload.id = this.form.id
+          updateDisposableIncome(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgModOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addDisposableIncome(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.form = createEmptyForm()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.di-view-text {
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+.dm-input-with-unit {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.dm-input-with-unit__input {
+  flex: 1;
+  width: 100%;
+}
+.dm-input-with-unit__suffix {
+  margin-left: 8px;
+  color: #909399;
+  white-space: nowrap;
+}
+.dm-input-with-unit >>> .el-input-number {
+  width: 100%;
+}
+</style>

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

@@ -0,0 +1,840 @@
+<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="statMonth">
+          <template slot="label">{{ dmT("queryStatMonth") }}</template>
+          <el-select v-model="queryParams.statMonth" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
+            <el-option v-for="m in monthOptions" :key="'q-' + m" :label="formatStatMonth(m)" :value="m" />
+          </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 prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmT('phVillageSearch')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :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:livestockProductOutput:add']"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >{{ dmCommon("add") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:livestockProductOutput:import']"
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImportOpen"
+          >{{ dmT("btnImport") }}</el-button>
+          <el-button
+            v-hasPermi="['dataModel:livestockProductOutput: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('colStatMonth')" align="center" width="90">
+          <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="110" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colVillageName')" prop="villageName" align="center" min-width="110" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colMeatOutput')" align="center" min-width="120">
+          <template slot-scope="scope">{{ formatOutput(scope.row.meatOutput) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colMilkOutput')" align="center" min-width="120">
+          <template slot-scope="scope">{{ formatOutput(scope.row.milkOutput) }}</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:livestockProductOutput:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
+            <el-button v-hasPermi="['dataModel:livestockProductOutput:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
+            <el-button v-hasPermi="['dataModel:livestockProductOutput: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="640px" append-to-body @close="cancel">
+      <el-form :key="formKey" ref="form" :model="form" label-width="120px" size="small">
+        <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-form-item prop="statMonth" :rules="formRules.statMonth">
+          <template slot="label">{{ dmT("formStatMonth") }}</template>
+          <el-select v-model="form.statMonth" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'fm-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="villageDeptId" :rules="formRules.villageDeptId">
+          <template slot="label">{{ dmT("formVillage") }}</template>
+          <el-select
+            v-model="form.villageDeptId"
+            :placeholder="dmT('phVillageSearch')"
+            filterable
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'f-v-' + item.deptId"
+              :label="item.label"
+              :value="item.deptId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="meatOutput" :rules="formRules.decimal">
+          <template slot="label">{{ dmT("formMeatOutput") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.meatOutput"
+              :min="0"
+              :precision="4"
+              :controls="true"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitWanTon") }}</span>
+          </div>
+        </el-form-item>
+        <el-form-item prop="milkOutput" :rules="formRules.decimal">
+          <template slot="label">{{ dmT("formMilkOutput") }}</template>
+          <div class="dm-input-with-unit">
+            <el-input-number
+              v-model="form.milkOutput"
+              :min="0"
+              :precision="4"
+              :controls="true"
+              controls-position="right"
+              class="dm-input-with-unit__input"
+            />
+            <span class="dm-input-with-unit__suffix">{{ dmT("unitWanTon") }}</span>
+          </div>
+        </el-form-item>
+        <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="640px" append-to-body>
+      <el-form label-width="120px" size="small">
+        <el-form-item :label="dmT('formStatYear')">
+          <span>{{ viewRow.statYear || dash }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formStatMonth')">
+          <span>{{ formatStatMonth(viewRow.statMonth) }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formTown')">
+          <span>{{ viewRow.townName || dash }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formVillage')">
+          <span>{{ viewRow.villageName || dash }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formMeatOutput')">
+          <span>{{ formatWithUnit(formatOutput(viewRow.meatOutput), "unitWanTon") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formMilkOutput')">
+          <span>{{ formatWithUnit(formatOutput(viewRow.milkOutput), "unitWanTon") }}</span>
+        </el-form-item>
+        <el-form-item :label="dmT('formRemark')">
+          <span class="lpo-view-text">{{ viewRow.remark || dash }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-hasPermi="['dataModel:livestockProductOutput: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="'iy-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="statMonth" :rules="importRules.statMonth">
+          <template slot="label">{{ dmT("importStatMonth") }}</template>
+          <el-select v-model="importForm.statMonth" :placeholder="dmT('importStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'im-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
+        <p class="lpo-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="'ey-' + y" :label="String(y)" :value="y" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="statMonth" :rules="exportRules.statMonth">
+          <template slot="label">{{ dmT("exportStatMonth") }}</template>
+          <el-select v-model="exportForm.statMonth" :placeholder="dmT('exportStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'em-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <template slot="label">{{ dmT("exportTown") }}</template>
+          <el-select
+            v-model="exportForm.townDeptId"
+            :placeholder="dmT('exportTownPh')"
+            clearable
+            filterable
+            style="width: 100%"
+          >
+            <el-option v-for="item in townOptions" :key="'et-' + item.deptId" :label="item.deptName" :value="item.deptId" />
+          </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 {
+  listLivestockProductOutput,
+  getLivestockProductOutput,
+  addLivestockProductOutput,
+  updateLivestockProductOutput,
+  delLivestockProductOutput,
+  listLivestockProductOutputYearOptions,
+  listLivestockProductOutputMonthOptions,
+  listLivestockProductOutputTownOptions,
+  listLivestockProductOutputVillageTree,
+  importLivestockProductOutput,
+  downloadLivestockProductOutputTemplate,
+  exportLivestockProductOutput
+} from "@/api/dataModel/livestockProductOutput"
+import { blobValidate } from "@/utils/ruoyi"
+import { saveAs } from "file-saver"
+
+function getCurrentYearMonth() {
+  const now = new Date()
+  return {
+    statYear: now.getFullYear(),
+    statMonth: now.getMonth() + 1
+  }
+}
+
+function createEmptyForm() {
+  return {
+    id: undefined,
+    statYear: undefined,
+    statMonth: undefined,
+    villageDeptId: undefined,
+    meatOutput: undefined,
+    milkOutput: undefined,
+    remark: undefined
+  }
+}
+
+function normalizeForm(data) {
+  const row = Object.assign(createEmptyForm(), data || {})
+  ;["meatOutput", "milkOutput"].forEach((prop) => {
+    const val = row[prop]
+    row[prop] = val == null || val === "" ? undefined : Number(val)
+  })
+  return row
+}
+
+function flattenVillageOptions(tree) {
+  const list = []
+  ;(tree || []).forEach((county) => {
+    ;(county.children || []).forEach((town) => {
+      ;(town.children || []).forEach((village) => {
+        if (village == null || village.id == null) {
+          return
+        }
+        const townName = town.label || ""
+        const villageName = village.label || ""
+        list.push({
+          deptId: village.id,
+          deptName: villageName,
+          townName,
+          label: townName ? `${townName} / ${villageName}` : villageName
+        })
+      })
+    })
+  })
+  return list
+}
+
+export default {
+  name: "LivestockProductOutput",
+  mixins: [dataModelLocaleMixin],
+  data() {
+    return {
+      dmNs: "livestockProductOutput",
+      loading: false,
+      importing: false,
+      exporting: false,
+      open: false,
+      viewOpen: false,
+      importOpen: false,
+      exportOpen: false,
+      dialogEdit: false,
+      formKey: 0,
+      total: 0,
+      tableList: [],
+      yearOptions: [],
+      monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+      townOptions: [],
+      villageOptions: [],
+      viewRow: {},
+      importForm: {
+        statYear: undefined,
+        statMonth: undefined
+      },
+      exportForm: {
+        statYear: undefined,
+        statMonth: undefined,
+        townDeptId: undefined
+      },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        statYear: undefined,
+        statMonth: undefined,
+        townDeptId: undefined,
+        villageDeptId: undefined
+      },
+      form: createEmptyForm()
+    }
+  },
+  computed: {
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    dialogTitle() {
+      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
+    },
+    formRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateFormStatMonth, trigger: "change" }
+        ],
+        villageDeptId: [{ required: true, message: this.dmT("ruleVillageRequired"), trigger: "change" }],
+        decimal: [{ validator: this.validateOptionalDecimal, trigger: "change" }],
+        remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
+      }
+    },
+    importRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateImportStatMonth, trigger: "change" }
+        ]
+      }
+    },
+    exportRules() {
+      return {
+        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("exportStatMonthRequired"), trigger: "change" },
+          { validator: this.validateExportStatMonth, trigger: "change" }
+        ]
+      }
+    }
+  },
+  created() {
+    this.loadOptions()
+    this.getList()
+  },
+  methods: {
+    loadOptions() {
+      listLivestockProductOutputYearOptions().then((res) => {
+        this.yearOptions = Array.isArray(res.data) ? res.data : []
+      })
+      listLivestockProductOutputMonthOptions().then((res) => {
+        if (Array.isArray(res.data) && res.data.length) {
+          this.monthOptions = res.data
+        }
+      })
+      listLivestockProductOutputTownOptions().then((res) => {
+        this.townOptions = Array.isArray(res.data) ? res.data : []
+      })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listLivestockProductOutputVillageTree()
+        .then((res) => {
+          const raw = res && res.data !== undefined ? res.data : res
+          const tree = Array.isArray(raw) ? raw : []
+          this.villageOptions = flattenVillageOptions(tree)
+          if (!this.villageOptions.length) {
+            this.$modal.msgWarning(this.dmT("villageTreeEmpty"))
+          }
+        })
+        .catch(() => {
+          this.villageOptions = []
+        })
+    },
+    formatStatMonth(month) {
+      if (month == null || month === "") {
+        return this.dash
+      }
+      return this.dmT("statMonthLabel", { month })
+    },
+    formatOutput(val) {
+      if (val == null || val === "") {
+        return this.dash
+      }
+      const n = Number(val)
+      if (!Number.isFinite(n)) {
+        return this.dash
+      }
+      return n
+    },
+    isFutureStatPeriod(statYear, statMonth) {
+      if (statYear == null || statMonth == null) {
+        return false
+      }
+      const now = new Date()
+      const currentYear = now.getFullYear()
+      const currentMonth = now.getMonth() + 1
+      if (statYear > currentYear) {
+        return true
+      }
+      return statYear === currentYear && statMonth > currentMonth
+    },
+    validateFormStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.form.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateImportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.importForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateExportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.exportForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateOptionalDecimal(rule, value, callback) {
+      if (value == null || value === "") {
+        callback()
+        return
+      }
+      if (typeof value !== "number" || Number.isNaN(value) || value < 0) {
+        callback(new Error(this.dmT("ruleDecimalNonNegative")))
+        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.statMonth != null) {
+        q.statMonth = this.queryParams.statMonth
+      }
+      if (this.queryParams.townDeptId != null) {
+        q.townDeptId = this.queryParams.townDeptId
+      }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
+      return q
+    },
+    buildPayload() {
+      const remarkText = this.form.remark != null ? String(this.form.remark).trim() : ""
+      return {
+        statYear: this.form.statYear,
+        statMonth: this.form.statMonth,
+        villageDeptId: this.form.villageDeptId,
+        meatOutput: this.form.meatOutput == null || this.form.meatOutput === "" ? undefined : this.form.meatOutput,
+        milkOutput: this.form.milkOutput == null || this.form.milkOutput === "" ? undefined : this.form.milkOutput,
+        remark: remarkText !== "" ? remarkText : undefined
+      }
+    },
+    getList() {
+      this.loading = true
+      listLivestockProductOutput(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.statMonth = undefined
+      this.queryParams.townDeptId = undefined
+      this.queryParams.villageDeptId = undefined
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleAdd() {
+      const openDialog = () => {
+        this.formKey += 1
+        const current = getCurrentYearMonth()
+        this.form = createEmptyForm()
+        this.form.statYear = current.statYear
+        this.form.statMonth = current.statMonth
+        this.dialogEdit = false
+        this.open = true
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      }
+      if (!this.villageOptions.length) {
+        this.loadVillageTree().finally(openDialog)
+      } else {
+        openDialog()
+      }
+    },
+    handleEdit(row) {
+      const openWithData = (data) => {
+        this.formKey += 1
+        this.dialogEdit = true
+        this.form = normalizeForm(data)
+        this.open = true
+        this.viewOpen = false
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      }
+      getLivestockProductOutput(row.id).then((res) => {
+        const data = res.data || {}
+        if (!this.villageOptions.length) {
+          this.loadVillageTree().finally(() => openWithData(data))
+        } else {
+          openWithData(data)
+        }
+      })
+    },
+    handleEditFromView() {
+      this.handleEdit(this.viewRow)
+    },
+    handleView(row) {
+      getLivestockProductOutput(row.id).then((res) => {
+        this.viewRow = res.data || {}
+        this.viewOpen = true
+      })
+    },
+    handleDelete(row) {
+      this.$modal
+        .confirm(this.dmT("confirmDelete"))
+        .then(() => delLivestockProductOutput(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
+          updateLivestockProductOutput(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgModOk"))
+            this.open = false
+            this.getList()
+          })
+        } else {
+          addLivestockProductOutput(payload).then(() => {
+            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.form = createEmptyForm()
+    },
+    handleImportOpen() {
+      const current = getCurrentYearMonth()
+      this.importForm.statYear = current.statYear
+      this.importForm.statMonth = current.statMonth
+      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.importForm.statMonth = undefined
+      this.resetImportFiles()
+    },
+    handleDownloadTemplate() {
+      const filename = `livestock_product_output_template_${new Date().getTime()}.xlsx`
+      this.$modal.loading("正在下载模板，请稍候")
+      downloadLivestockProductOutputTemplate()
+        .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() {
+      const current = getCurrentYearMonth()
+      this.exportForm.statYear = current.statYear
+      this.exportForm.statMonth = current.statMonth
+      this.exportForm.townDeptId = undefined
+      this.exportOpen = true
+      this.$nextTick(() => {
+        if (this.$refs.exportFormRef) {
+          this.$refs.exportFormRef.clearValidate()
+        }
+      })
+    },
+    resetExport() {
+      this.exporting = false
+      this.exportForm.statYear = undefined
+      this.exportForm.statMonth = undefined
+      this.exportForm.townDeptId = undefined
+    },
+    handleExportSubmit() {
+      this.$refs.exportFormRef.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        const statYear = this.exportForm.statYear
+        const statMonth = this.exportForm.statMonth
+        if (!this.yearOptions.includes(statYear) || !this.monthOptions.includes(statMonth)) {
+          this.$modal.msgError(this.dmT("exportStatYearInvalid"))
+          return
+        }
+        const filename = `${statYear}年${statMonth}月畜牧产品产量数据.xlsx`
+        this.exporting = true
+        this.$modal.loading(this.dmT("exportLoading"))
+        exportLivestockProductOutput(statYear, statMonth, this.exportForm.townDeptId)
+          .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"))
+        importLivestockProductOutput(raw, this.importForm.statYear, this.importForm.statMonth)
+          .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>
+.lpo-import-tip {
+  margin: 0 0 12px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.lpo-view-text {
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+.dm-input-with-unit {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.dm-input-with-unit__input {
+  flex: 1;
+  width: 100%;
+}
+.dm-input-with-unit__suffix {
+  margin-left: 8px;
+  color: #909399;
+  white-space: nowrap;
+}
+.dm-input-with-unit >>> .el-input-number {
+  width: 100%;
+}
+</style>

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

@@ -20,6 +20,23 @@
             <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmCommon('pleaseSelect')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :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>
@@ -62,7 +79,8 @@
         <el-table-column :label="dmT('colStatMonth')" align="center" width="90">
           <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
         </el-table-column>
-        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="110" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colVillageName')" prop="villageName" align="center" min-width="110" :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>
@@ -96,10 +114,10 @@
     </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">
+      <el-form :key="formKey" ref="form" :model="form" label-width="168px" size="small">
         <div class="yhi-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
-          <el-col :span="8">
+          <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%">
@@ -107,7 +125,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item prop="statMonth" :rules="formRules.statMonth">
               <template slot="label">{{ dmT("formStatMonth") }}</template>
               <el-select v-model="form.statMonth" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
@@ -115,18 +133,31 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <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-row>
+        <el-row :gutter="16">
+          <el-col :span="24">
+            <el-form-item prop="villageDeptId" :rules="formRules.villageDeptId">
+              <template slot="label">{{ dmT("formVillage") }}</template>
+              <el-select
+                v-model="form.villageDeptId"
+                :placeholder="dmCommon('pleaseSelect')"
+                filterable
+                clearable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in villageOptions"
+                  :key="'f-v-' + item.deptId"
+                  :label="item.label"
+                  :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-col v-for="field in inputCountFields" :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">
@@ -155,7 +186,7 @@
     </el-dialog>
 
     <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="920px" append-to-body>
-      <el-form label-width="150px" size="small">
+      <el-form label-width="168px" size="small">
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="dmT('formStatYear')">
@@ -173,18 +204,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formVillageDeptId')">
-              <span>{{ viewRow.villageDeptId || dash }}</span>
+            <el-form-item :label="dmT('formVillage')">
+              <span>{{ viewRow.villageName || dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="dmT('formVillageName')">
-              <span>{{ viewRow.villageName || dash }}</span>
+          <el-col v-for="field in inputCountFields" :key="'vi-' + field.prop" :span="12">
+            <el-form-item :label="dmT(field.labelKey)">
+              <span>{{ formatWithUnit(formatCount(viewRow[field.prop]), field.unitKey) }}</span>
             </el-form-item>
           </el-col>
-          <el-col v-for="field in countFields" :key="'v-' + field.prop" :span="12">
+          <el-col v-for="field in derivedCountFields" :key="'vd-' + field.prop" :span="12">
             <el-form-item :label="dmT(field.labelKey)">
-              <span>{{ formatCount(viewRow[field.prop]) }}</span>
+              <span>{{ formatWithUnit(formatCount(viewRow[field.prop]), field.unitKey) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -274,6 +305,18 @@
             <el-option v-for="m in monthOptions" :key="'em-' + m" :label="formatStatMonth(m)" :value="m" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="townDeptId">
+          <template slot="label">{{ dmT("exportTown") }}</template>
+          <el-select
+            v-model="exportForm.townDeptId"
+            :placeholder="dmT('exportTownPh')"
+            clearable
+            filterable
+            style="width: 100%"
+          >
+            <el-option v-for="item in townOptions" :key="'et-' + item.deptId" :label="item.deptName" :value="item.deptId" />
+          </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>
@@ -294,6 +337,7 @@ import {
   listYakHerdInventoryYearOptions,
   listYakHerdInventoryMonthOptions,
   listYakHerdInventoryTownOptions,
+  listYakHerdInventoryVillageTree,
   importYakHerdInventory,
   downloadYakHerdInventoryTemplate,
   exportYakHerdInventory
@@ -301,18 +345,29 @@ import {
 import { blobValidate } from "@/utils/ruoyi"
 import { saveAs } from "file-saver"
 
-const COUNT_FIELDS = [
+/** 手工录入明细（表单可编辑；选填） */
+const INPUT_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" }
+  { prop: "cowYoungCount", labelKey: "formCowYoungCount", unitKey: "unitHead" },
+  { prop: "cowAdultCount", labelKey: "formCowAdultCount", unitKey: "unitHead" },
+  { prop: "milkingCowCount", labelKey: "formMilkingCowCount", unitKey: "unitHead" },
+  { prop: "fertileCowCount", labelKey: "formFertileCowCount", unitKey: "unitHead" },
+  { prop: "sheepTotal", labelKey: "formSheepTotal", unitKey: "unitHead" },
+  { prop: "milkingSheepCount", labelKey: "formMilkingSheepCount", unitKey: "unitHead" },
+  { prop: "insuredYakCount", labelKey: "formInsuredYakCount", unitKey: "unitHead" }
+]
+
+/** 系统计算字段（仅详情展示） */
+const DERIVED_COUNT_FIELDS = [
+  { prop: "bullTotal", labelKey: "formBullTotal", unitKey: "unitHead" },
+  { prop: "cowTotal", labelKey: "formCowTotal", unitKey: "unitHead" },
+  { prop: "dairyTotal", labelKey: "formDairyTotal", unitKey: "unitHead" },
+  { prop: "yakTotal", labelKey: "formYakTotal", unitKey: "unitHead" },
+  { prop: "grandTotal", labelKey: "formGrandTotal", unitKey: "unitHead" },
+  { prop: "yakSheepTotal", labelKey: "formYakSheepTotal", unitKey: "unitHead" }
 ]
 
 function getCurrentYearMonth() {
@@ -328,24 +383,50 @@ function createEmptyForm() {
     id: undefined,
     statYear: undefined,
     statMonth: undefined,
-    townDeptId: undefined,
+    villageDeptId: undefined,
     remark: undefined
   }
-  COUNT_FIELDS.forEach((field) => {
-    form[field.prop] = 0
+  INPUT_COUNT_FIELDS.forEach((field) => {
+    form[field.prop] = undefined
   })
   return form
 }
 
-function normalizeCountFields(data) {
+function normalizeInputFields(data) {
   const row = Object.assign(createEmptyForm(), data || {})
-  COUNT_FIELDS.forEach((field) => {
+  INPUT_COUNT_FIELDS.forEach((field) => {
     const val = row[field.prop]
-    row[field.prop] = val == null || val === "" ? 0 : val
+    row[field.prop] = val == null || val === "" ? undefined : val
   })
   return row
 }
 
+/** 县→乡镇→村 树拍平为村下拉（搜索与新增共用） */
+function flattenVillageOptions(tree) {
+  const list = []
+  ;(tree || []).forEach((county) => {
+    ;(county.children || []).forEach((town) => {
+      const villages = town.children || []
+      if (villages.length) {
+        villages.forEach((village) => {
+          if (village == null || village.id == null) {
+            return
+          }
+          const townName = town.label || ""
+          const villageName = village.label || ""
+          list.push({
+            deptId: village.id,
+            deptName: villageName,
+            townName,
+            label: townName ? `${townName} / ${villageName}` : villageName
+          })
+        })
+      }
+    })
+  })
+  return list
+}
+
 export default {
   name: "YakHerdInventory",
   mixins: [dataModelLocaleMixin],
@@ -366,6 +447,7 @@ export default {
       yearOptions: [],
       monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       townOptions: [],
+      villageOptions: [],
       viewRow: {},
       importForm: {
         statYear: undefined,
@@ -373,14 +455,16 @@ export default {
       },
       exportForm: {
         statYear: undefined,
-        statMonth: undefined
+        statMonth: undefined,
+        townDeptId: undefined
       },
       queryParams: {
         pageNum: 1,
         pageSize: 20,
         statYear: undefined,
         statMonth: undefined,
-        townDeptId: undefined
+        townDeptId: undefined,
+        villageDeptId: undefined
       },
       form: createEmptyForm()
     }
@@ -389,8 +473,11 @@ export default {
     dash() {
       return this.$t("dataModel.status.dash")
     },
-    countFields() {
-      return COUNT_FIELDS
+    inputCountFields() {
+      return INPUT_COUNT_FIELDS
+    },
+    derivedCountFields() {
+      return DERIVED_COUNT_FIELDS
     },
     dialogTitle() {
       return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
@@ -402,11 +489,8 @@ export default {
           { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
           { validator: this.validateFormStatMonth, 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" }
-        ],
+        villageDeptId: [{ required: true, message: this.dmT("ruleVillageRequired"), trigger: "change" }],
+        count: [{ validator: this.validateOptionalCount, trigger: "change" }],
         remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
       }
     },
@@ -446,6 +530,21 @@ export default {
       listYakHerdInventoryTownOptions().then((res) => {
         this.townOptions = Array.isArray(res.data) ? res.data : []
       })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listYakHerdInventoryVillageTree()
+        .then((res) => {
+          const raw = res && res.data !== undefined ? res.data : res
+          const tree = Array.isArray(raw) ? raw : []
+          this.villageOptions = flattenVillageOptions(tree)
+          if (!this.villageOptions.length) {
+            this.$modal.msgWarning(this.dmT("villageTreeEmpty"))
+          }
+        })
+        .catch(() => {
+          this.villageOptions = []
+        })
     },
     formatStatMonth(month) {
       if (month == null || month === "") {
@@ -492,9 +591,9 @@ export default {
       }
       return val
     },
-    validateRequiredCount(rule, value, callback) {
+    validateOptionalCount(rule, value, callback) {
       if (value == null || value === "") {
-        callback(new Error(this.dmT("ruleCountRequired")))
+        callback()
         return
       }
       if (!Number.isInteger(value) || value < 0) {
@@ -517,6 +616,9 @@ export default {
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
       return q
     },
     buildPayload() {
@@ -524,11 +626,12 @@ export default {
       const payload = {
         statYear: this.form.statYear,
         statMonth: this.form.statMonth,
-        townDeptId: this.form.townDeptId,
+        villageDeptId: this.form.villageDeptId,
         remark: remarkText !== "" ? remarkText : undefined
       }
-      COUNT_FIELDS.forEach((field) => {
-        payload[field.prop] = this.form[field.prop]
+      INPUT_COUNT_FIELDS.forEach((field) => {
+        const val = this.form[field.prop]
+        payload[field.prop] = val == null || val === "" ? undefined : val
       })
       return payload
     },
@@ -551,29 +654,36 @@ export default {
       this.queryParams.statYear = undefined
       this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
+      this.queryParams.villageDeptId = undefined
       this.resetForm("queryForm")
       this.handleQuery()
     },
     handleAdd() {
-      this.formKey += 1
-      const current = getCurrentYearMonth()
-      this.form = createEmptyForm()
-      this.form.statYear = current.statYear
-      this.form.statMonth = current.statMonth
-      this.dialogEdit = false
-      this.open = true
-      this.$nextTick(() => {
-        if (this.$refs.form) {
-          this.$refs.form.clearValidate()
-        }
-      })
+      const openDialog = () => {
+        this.formKey += 1
+        const current = getCurrentYearMonth()
+        this.form = createEmptyForm()
+        this.form.statYear = current.statYear
+        this.form.statMonth = current.statMonth
+        this.dialogEdit = false
+        this.open = true
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      }
+      if (!this.villageOptions.length) {
+        this.loadVillageTree().finally(openDialog)
+      } else {
+        openDialog()
+      }
     },
     handleEdit(row) {
-      getYakHerdInventory(row.id).then((res) => {
-        const data = res.data || {}
+      const openWithData = (data) => {
         this.formKey += 1
         this.dialogEdit = true
-        this.form = normalizeCountFields(data)
+        this.form = normalizeInputFields(data)
         this.open = true
         this.viewOpen = false
         this.$nextTick(() => {
@@ -581,6 +691,14 @@ export default {
             this.$refs.form.clearValidate()
           }
         })
+      }
+      getYakHerdInventory(row.id).then((res) => {
+        const data = res.data || {}
+        if (!this.villageOptions.length) {
+          this.loadVillageTree().finally(() => openWithData(data))
+        } else {
+          openWithData(data)
+        }
       })
     },
     handleEditFromView() {
@@ -673,6 +791,7 @@ export default {
       const current = getCurrentYearMonth()
       this.exportForm.statYear = current.statYear
       this.exportForm.statMonth = current.statMonth
+      this.exportForm.townDeptId = undefined
       this.exportOpen = true
       this.$nextTick(() => {
         if (this.$refs.exportFormRef) {
@@ -684,6 +803,7 @@ export default {
       this.exporting = false
       this.exportForm.statYear = undefined
       this.exportForm.statMonth = undefined
+      this.exportForm.townDeptId = undefined
     },
     handleExportSubmit() {
       this.$refs.exportFormRef.validate((valid) => {
@@ -699,7 +819,7 @@ export default {
         const filename = `${statYear}年${statMonth}月牦牛存栏数据.xlsx`
         this.exporting = true
         this.$modal.loading(this.dmT("exportLoading"))
-        exportYakHerdInventory(statYear, statMonth)
+        exportYakHerdInventory(statYear, statMonth, this.exportForm.townDeptId)
           .then(async (data) => {
             if (blobValidate(data)) {
               saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)

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

@@ -20,6 +20,23 @@
             <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmCommon('pleaseSelect')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :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>
@@ -62,7 +79,8 @@
         <el-table-column :label="dmT('colStatMonth')" align="center" width="90">
           <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
         </el-table-column>
-        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="110" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colVillageName')" prop="villageName" align="center" min-width="110" :show-overflow-tooltip="true" />
         <el-table-column :label="dmT('colFarmerHouseholdCount')" align="center" width="100">
           <template slot-scope="scope">{{ formatCount(scope.row.farmerHouseholdCount) }}</template>
         </el-table-column>
@@ -72,9 +90,15 @@
         <el-table-column :label="dmT('colYakOutboundCount')" align="center" width="110">
           <template slot-scope="scope">{{ formatCount(scope.row.yakOutboundCount) }}</template>
         </el-table-column>
-        <el-table-column :label="dmT('colSelfConsumptionCattle')" align="center" width="120">
+        <el-table-column :label="dmT('colOutboundTotal')" align="center" width="120">
+          <template slot-scope="scope">{{ formatCount(sumOutboundTotal(scope.row)) }}</template>
+        </el-table-column>
+        <el-table-column :label="dmT('colSelfConsumptionCattle')" align="center" width="100">
           <template slot-scope="scope">{{ formatCount(scope.row.selfConsumptionCattleCount) }}</template>
         </el-table-column>
+        <el-table-column :label="dmT('colSelfConsumptionTotal')" align="center" width="120">
+          <template slot-scope="scope">{{ formatCount(sumSelfConsumptionTotal(scope.row)) }}</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:yakOutboundReport:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
@@ -96,7 +120,7 @@
       <el-form :key="formKey" ref="form" :model="form" label-width="168px" size="small">
         <div class="yor-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
-          <el-col :span="8">
+          <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%">
@@ -104,7 +128,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item prop="statMonth" :rules="formRules.statMonth">
               <template slot="label">{{ dmT("formStatMonth") }}</template>
               <el-select v-model="form.statMonth" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
@@ -112,11 +136,24 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <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-row>
+        <el-row :gutter="16">
+          <el-col :span="24">
+            <el-form-item prop="villageDeptId" :rules="formRules.villageDeptId">
+              <template slot="label">{{ dmT("formVillage") }}</template>
+              <el-select
+                v-model="form.villageDeptId"
+                :placeholder="dmCommon('pleaseSelect')"
+                filterable
+                clearable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in villageOptions"
+                  :key="'f-v-' + item.deptId"
+                  :label="item.label"
+                  :value="item.deptId"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -189,7 +226,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="720px" append-to-body>
+    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="920px" append-to-body>
       <el-form label-width="168px" size="small">
         <el-row :gutter="16">
           <el-col :span="12">
@@ -207,9 +244,29 @@
               <span>{{ viewRow.townName || dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col v-for="field in viewFields" :key="'v-' + field.prop" :span="12">
+          <el-col :span="12">
+            <el-form-item :label="dmT('formVillage')">
+              <span>{{ viewRow.villageName || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-for="field in inputCountFields" :key="'v-' + field.prop" :span="12">
             <el-form-item :label="dmT(field.labelKey)">
-              <span>{{ formatCount(viewRow[field.prop]) }}</span>
+              <span>{{ formatWithUnit(formatCount(viewRow[field.prop]), field.unitKey) }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formOutboundTotal')">
+              <span>{{ formatWithUnit(formatCount(sumOutboundTotal(viewRow)), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formSelfConsumptionTotal')">
+              <span>{{ formatWithUnit(formatCount(sumSelfConsumptionTotal(viewRow)), "unitHead") }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="dmT('formRemark')">
+              <span class="yor-view-text">{{ viewRow.remark || dash }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -274,6 +331,18 @@
             <el-option v-for="m in monthOptions" :key="'em-' + m" :label="formatStatMonth(m)" :value="m" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="townDeptId">
+          <template slot="label">{{ dmT("exportTown") }}</template>
+          <el-select
+            v-model="exportForm.townDeptId"
+            :placeholder="dmT('exportTownPh')"
+            clearable
+            filterable
+            style="width: 100%"
+          >
+            <el-option v-for="item in townOptions" :key="'et-' + item.deptId" :label="item.deptName" :value="item.deptId" />
+          </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>
@@ -294,6 +363,7 @@ import {
   listYakOutboundReportYearOptions,
   listYakOutboundReportMonthOptions,
   listYakOutboundReportTownOptions,
+  listYakOutboundReportVillageTree,
   importYakOutboundReport,
   downloadYakOutboundReportTemplate,
   exportYakOutboundReport
@@ -315,11 +385,19 @@ const COUNT_FIELDS = [
   { prop: "selfConsumptionGoatCount", labelKey: "formSelfConsumptionGoatCount", unitKey: "unitSheep", section: "selfConsumption" }
 ]
 
-const VIEW_FIELDS = [
-  { prop: "farmerHouseholdCount", labelKey: "formFarmerHouseholdCount" },
-  { prop: "farmerPopulationCount", labelKey: "formFarmerPopulationCount" },
-  { prop: "yakOutboundCount", labelKey: "formYakOutboundCount" },
-  { prop: "selfConsumptionCattleCount", labelKey: "formSelfConsumptionCattleCount" }
+const OUTBOUND_TOTAL_PROPS = [
+  "yakOutboundCount",
+  "cattleOutboundCount",
+  "sheepOutboundCount",
+  "goatOutboundCount",
+  "horseMuleOutboundCount",
+  "donkeyOutboundCount"
+]
+
+const SELF_CONSUMPTION_TOTAL_PROPS = [
+  "selfConsumptionCattleCount",
+  "selfConsumptionSheepCount",
+  "selfConsumptionGoatCount"
 ]
 
 function getCurrentYearMonth() {
@@ -335,11 +413,11 @@ function createEmptyForm() {
     id: undefined,
     statYear: undefined,
     statMonth: undefined,
-    townDeptId: undefined,
+    villageDeptId: undefined,
     remark: undefined
   }
   COUNT_FIELDS.forEach((field) => {
-    form[field.prop] = 0
+    form[field.prop] = undefined
   })
   return form
 }
@@ -348,11 +426,43 @@ 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
+    row[field.prop] = val == null || val === "" ? undefined : val
   })
   return row
 }
 
+function flattenVillageOptions(tree) {
+  const list = []
+  ;(tree || []).forEach((county) => {
+    ;(county.children || []).forEach((town) => {
+      ;(town.children || []).forEach((village) => {
+        if (village == null || village.id == null) {
+          return
+        }
+        const townName = town.label || ""
+        const villageName = village.label || ""
+        list.push({
+          deptId: village.id,
+          deptName: villageName,
+          townName,
+          label: townName ? `${townName} / ${villageName}` : villageName
+        })
+      })
+    })
+  })
+  return list
+}
+
+function sumProps(row, props) {
+  if (!row) {
+    return 0
+  }
+  return props.reduce((sum, prop) => {
+    const n = Number(row[prop])
+    return sum + (Number.isFinite(n) ? n : 0)
+  }, 0)
+}
+
 export default {
   name: "YakOutboundReport",
   mixins: [dataModelLocaleMixin],
@@ -373,6 +483,7 @@ export default {
       yearOptions: [],
       monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       townOptions: [],
+      villageOptions: [],
       viewRow: {},
       importForm: {
         statYear: undefined,
@@ -380,14 +491,16 @@ export default {
       },
       exportForm: {
         statYear: undefined,
-        statMonth: undefined
+        statMonth: undefined,
+        townDeptId: undefined
       },
       queryParams: {
         pageNum: 1,
         pageSize: 20,
         statYear: undefined,
         statMonth: undefined,
-        townDeptId: undefined
+        townDeptId: undefined,
+        villageDeptId: undefined
       },
       form: createEmptyForm()
     }
@@ -396,6 +509,9 @@ export default {
     dash() {
       return this.$t("dataModel.status.dash")
     },
+    inputCountFields() {
+      return COUNT_FIELDS
+    },
     farmerCountFields() {
       return COUNT_FIELDS.filter((field) => field.section === "farmer")
     },
@@ -405,9 +521,6 @@ export default {
     selfConsumptionCountFields() {
       return COUNT_FIELDS.filter((field) => field.section === "selfConsumption")
     },
-    viewFields() {
-      return VIEW_FIELDS
-    },
     dialogTitle() {
       return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
     },
@@ -418,7 +531,7 @@ export default {
           { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
           { validator: this.validateFormStatMonth, trigger: "change" }
         ],
-        townDeptId: [{ required: true, message: this.dmT("ruleTownRequired"), trigger: "change" }],
+        villageDeptId: [{ required: true, message: this.dmT("ruleVillageRequired"), trigger: "change" }],
         count: [{ validator: this.validateOptionalCount, trigger: "change" }],
         remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
       }
@@ -459,6 +572,27 @@ export default {
       listYakOutboundReportTownOptions().then((res) => {
         this.townOptions = Array.isArray(res.data) ? res.data : []
       })
+      this.loadVillageTree()
+    },
+    loadVillageTree() {
+      return listYakOutboundReportVillageTree()
+        .then((res) => {
+          const raw = res && res.data !== undefined ? res.data : res
+          const tree = Array.isArray(raw) ? raw : []
+          this.villageOptions = flattenVillageOptions(tree)
+          if (!this.villageOptions.length) {
+            this.$modal.msgWarning(this.dmT("villageTreeEmpty"))
+          }
+        })
+        .catch(() => {
+          this.villageOptions = []
+        })
+    },
+    sumOutboundTotal(row) {
+      return sumProps(row, OUTBOUND_TOTAL_PROPS)
+    },
+    sumSelfConsumptionTotal(row) {
+      return sumProps(row, SELF_CONSUMPTION_TOTAL_PROPS)
     },
     formatStatMonth(month) {
       if (month == null || month === "") {
@@ -530,6 +664,9 @@ export default {
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
       return q
     },
     buildPayload() {
@@ -537,11 +674,12 @@ export default {
       const payload = {
         statYear: this.form.statYear,
         statMonth: this.form.statMonth,
-        townDeptId: this.form.townDeptId,
+        villageDeptId: this.form.villageDeptId,
         remark: remarkText !== "" ? remarkText : undefined
       }
       COUNT_FIELDS.forEach((field) => {
-        payload[field.prop] = this.form[field.prop]
+        const val = this.form[field.prop]
+        payload[field.prop] = val == null || val === "" ? undefined : val
       })
       return payload
     },
@@ -564,26 +702,33 @@ export default {
       this.queryParams.statYear = undefined
       this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
+      this.queryParams.villageDeptId = undefined
       this.resetForm("queryForm")
       this.handleQuery()
     },
     handleAdd() {
-      this.formKey += 1
-      const current = getCurrentYearMonth()
-      this.form = createEmptyForm()
-      this.form.statYear = current.statYear
-      this.form.statMonth = current.statMonth
-      this.dialogEdit = false
-      this.open = true
-      this.$nextTick(() => {
-        if (this.$refs.form) {
-          this.$refs.form.clearValidate()
-        }
-      })
+      const openDialog = () => {
+        this.formKey += 1
+        const current = getCurrentYearMonth()
+        this.form = createEmptyForm()
+        this.form.statYear = current.statYear
+        this.form.statMonth = current.statMonth
+        this.dialogEdit = false
+        this.open = true
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate()
+          }
+        })
+      }
+      if (!this.villageOptions.length) {
+        this.loadVillageTree().finally(openDialog)
+      } else {
+        openDialog()
+      }
     },
     handleEdit(row) {
-      getYakOutboundReport(row.id).then((res) => {
-        const data = res.data || {}
+      const openWithData = (data) => {
         this.formKey += 1
         this.dialogEdit = true
         this.form = normalizeCountFields(data)
@@ -594,6 +739,14 @@ export default {
             this.$refs.form.clearValidate()
           }
         })
+      }
+      getYakOutboundReport(row.id).then((res) => {
+        const data = res.data || {}
+        if (!this.villageOptions.length) {
+          this.loadVillageTree().finally(() => openWithData(data))
+        } else {
+          openWithData(data)
+        }
       })
     },
     handleEditFromView() {
@@ -686,6 +839,7 @@ export default {
       const current = getCurrentYearMonth()
       this.exportForm.statYear = current.statYear
       this.exportForm.statMonth = current.statMonth
+      this.exportForm.townDeptId = undefined
       this.exportOpen = true
       this.$nextTick(() => {
         if (this.$refs.exportFormRef) {
@@ -697,6 +851,7 @@ export default {
       this.exporting = false
       this.exportForm.statYear = undefined
       this.exportForm.statMonth = undefined
+      this.exportForm.townDeptId = undefined
     },
     handleExportSubmit() {
       this.$refs.exportFormRef.validate((valid) => {
@@ -712,7 +867,7 @@ export default {
         const filename = `${statYear}年${statMonth}月牦牛出栏数据.xlsx`
         this.exporting = true
         this.$modal.loading(this.dmT("exportLoading"))
-        exportYakOutboundReport(statYear, statMonth)
+        exportYakOutboundReport(statYear, statMonth, this.exportForm.townDeptId)
           .then(async (data) => {
             if (blobValidate(data)) {
               saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)
@@ -795,6 +950,11 @@ export default {
   border-left: 3px solid #409eff;
 }
 
+.yor-view-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
 .yor-import-tip {
   margin: 0 0 12px;
   font-size: 12px;